Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / core / v8 / V8PerIsolateData.cpp

diff --git a/src/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp b/src/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
index d5aa45c..82cfbf7 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
+++ b/src/third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp
@@ -54,10 +54,14 @@ static void useCounterCallback(v8::Isolate* isolate, v8::Isolate::UseCounterFeat
 {
     switch (feature) {
     case v8::Isolate::kUseAsm:
-        UseCounter::count(currentExecutionContext(isolate), UseCounter::UseAsm);
+        UseCounter::count(callingExecutionContext(isolate), UseCounter::UseAsm);
+        break;
+    case v8::Isolate::kBreakIterator:
+        UseCounter::count(callingExecutionContext(isolate), UseCounter::BreakIterator);
         break;
     default:
         ASSERT_NOT_REACHED();
+        break;
     }
 }
 
@@ -69,6 +73,7 @@ V8PerIsolateData::V8PerIsolateData()
     , m_constructorMode(ConstructorMode::CreateNewObject)
     , m_recursionLevel(0)
     , m_isHandlingRecursionLevelError(false)
+    , m_isReportingException(false)
 #if ENABLE(ASSERT)
     , m_internalScriptRecursionLevel(0)
 #endif