diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
| commit | a73d1c176f2f3e0458861de8590dc20321a501ae (patch) | |
| tree | d897fc5974797c3cb300d7f5916f258df765401f /Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp | |
| parent | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (diff) | |
| download | qtwebkit-a73d1c176f2f3e0458861de8590dc20321a501ae.tar.gz | |
Imported WebKit commit a5ae8a56a48e44ebfb9b81aaa5488affaffdb175 (http://svn.webkit.org/repository/webkit/trunk@126420)
New snapshot with OS X 10.6 build fix
Diffstat (limited to 'Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp b/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp index 9418c0dc0..800568a61 100644 --- a/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp +++ b/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp @@ -44,6 +44,7 @@ #include "Page.h" #include "Pasteboard.h" #include "PlatformString.h" +#include "ScriptController.h" #include "SecurityOrigin.h" #include "Settings.h" #include "V8Binding.h" @@ -51,7 +52,6 @@ #include "V8InspectorFrontendHost.h" #include "V8MouseEvent.h" #include "V8Node.h" -#include "V8Proxy.h" #include "V8Utilities.h" #include "WebDevToolsFrontendClient.h" #include "WebFrameImpl.h" @@ -107,7 +107,7 @@ void WebDevToolsFrontendImpl::dispatchOnInspectorFrontend(const WebString& messa { WebFrameImpl* frame = m_webViewImpl->mainFrameImpl(); v8::HandleScope scope; - v8::Handle<v8::Context> frameContext = V8Proxy::context(frame->frame()); + v8::Handle<v8::Context> frameContext = frame->frame() ? frame->frame()->script()->currentWorldContext() : v8::Local<v8::Context>(); v8::Context::Scope contextScope(frameContext); v8::Handle<v8::Value> inspectorBackendValue = frameContext->Global()->Get(v8::String::New("InspectorBackend")); if (!inspectorBackendValue->IsObject()) |