Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/bindings/v8/custom/V8MessageEventCustom.cpp b/src/third_party/WebKit/Source/bindings/v8/custom/V8MessageEventCustom.cpp
index c41449b..d00967f 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/v8/custom/V8MessageEventCustom.cpp
+++ b/src/third_party/WebKit/Source/bindings/v8/custom/V8MessageEventCustom.cpp
@@ -136,12 +136,12 @@ void V8MessageEvent::dataAttributeGetterCustom(const v8::PropertyCallbackInfo<v8
 void V8MessageEvent::initMessageEventMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     MessageEvent* event = V8MessageEvent::toNative(info.Holder());
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, info[0]);
-    V8TRYCATCH_VOID(bool, canBubbleArg, info[1]->BooleanValue());
-    V8TRYCATCH_VOID(bool, cancelableArg, info[2]->BooleanValue());
+    TOSTRING_VOID(V8StringResource<>, typeArg, info[0]);
+    TONATIVE_VOID(bool, canBubbleArg, info[1]->BooleanValue());
+    TONATIVE_VOID(bool, cancelableArg, info[2]->BooleanValue());
     v8::Handle<v8::Value> dataArg = info[3];
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, originArg, info[4]);
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, lastEventIdArg, info[5]);
+    TOSTRING_VOID(V8StringResource<>, originArg, info[4]);
+    TOSTRING_VOID(V8StringResource<>, lastEventIdArg, info[5]);
     DOMWindow* sourceArg = toDOMWindow(info[6], info.GetIsolate());
     OwnPtr<MessagePortArray> portArray;
     const int portArrayIndex = 7;
@@ -156,7 +156,7 @@ void V8MessageEvent::initMessageEventMethodCustom(const v8::FunctionCallbackInfo
 
     if (!dataArg.IsEmpty()) {
         V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::data(info.GetIsolate()), dataArg);
-        if (DOMWrapperWorld::current(info.GetIsolate())->isIsolatedWorld())
+        if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld())
             event->setSerializedData(SerializedScriptValue::createAndSwallowExceptions(dataArg, info.GetIsolate()));
     }
 }