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/InspectorFrontendClientImpl.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/InspectorFrontendClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp b/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp index 0338d3f2d..4f257c77c 100644 --- a/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp +++ b/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp @@ -36,8 +36,8 @@ #include "InspectorFrontendHost.h" #include "Page.h" #include "PlatformString.h" +#include "ScriptController.h" #include "V8InspectorFrontendHost.h" -#include "V8Proxy.h" #include "WebDevToolsFrontendClient.h" #include "WebDevToolsFrontendImpl.h" #include "platform/WebFloatPoint.h" @@ -63,7 +63,7 @@ InspectorFrontendClientImpl::~InspectorFrontendClientImpl() void InspectorFrontendClientImpl::windowObjectCleared() { v8::HandleScope handleScope; - v8::Handle<v8::Context> frameContext = V8Proxy::context(m_frontendPage->mainFrame()); + v8::Handle<v8::Context> frameContext = m_frontendPage->mainFrame() ? m_frontendPage->mainFrame()->script()->currentWorldContext() : v8::Local<v8::Context>(); v8::Context::Scope contextScope(frameContext); ASSERT(!m_frontendHost); |