Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebDevToolsFrontendImpl.cpp

diff --git a/src/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp b/src/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp
index 63bc1a3..dde86a7 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp
+++ b/src/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp
@@ -43,9 +43,9 @@
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8DOMWrapper.h"
 #include "bindings/v8/V8Utilities.h"
+#include "core/clipboard/Pasteboard.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
-#include "core/dom/Pasteboard.h"
 #include "core/events/Event.h"
 #include "core/inspector/InspectorController.h"
 #include "core/inspector/InspectorFrontendHost.h"
@@ -139,7 +139,9 @@ void WebDevToolsFrontendImpl::doDispatchOnInspectorFrontend(const WebString& mes
         return;
     v8::Isolate* isolate = toIsolate(frame->frame());
     v8::HandleScope scope(isolate);
-    v8::Handle<v8::Context> frameContext = frame->frame()->script().currentWorldContextOrMainWorldContext();
+    v8::Handle<v8::Context> frameContext = toV8Context(isolate, frame->frame(), DOMWrapperWorld::mainWorld());
+    if (frameContext.IsEmpty())
+        return;
     v8::Context::Scope contextScope(frameContext);
     v8::Handle<v8::Value> inspectorFrontendApiValue = frameContext->Global()->Get(v8::String::NewFromUtf8(isolate, "InspectorFrontendAPI"));
     if (!inspectorFrontendApiValue->IsObject())