diff options
Diffstat (limited to 'Source/web/WebDevToolsFrontendImpl.cpp')
| -rw-r--r-- | Source/web/WebDevToolsFrontendImpl.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/web/WebDevToolsFrontendImpl.cpp b/Source/web/WebDevToolsFrontendImpl.cpp index 611d4db49..3e1241a2a 100644 --- a/Source/web/WebDevToolsFrontendImpl.cpp +++ b/Source/web/WebDevToolsFrontendImpl.cpp @@ -49,8 +49,8 @@ #include "core/inspector/InspectorController.h" #include "core/inspector/InspectorFrontendHost.h" #include "core/page/ContextMenuController.h" -#include "core/page/DOMWindow.h" -#include "core/page/Frame.h" +#include "core/frame/DOMWindow.h" +#include "core/frame/Frame.h" #include "core/page/Page.h" #include "core/page/Settings.h" #include "core/platform/ContextMenuItem.h" @@ -75,11 +75,6 @@ public: } private: - virtual bool canSuspend() const OVERRIDE - { - return true; - } - virtual void resume() OVERRIDE { m_webDevToolsFrontendImpl->resume(); @@ -125,7 +120,7 @@ void WebDevToolsFrontendImpl::dispatchOnInspectorFrontend(const WebString& messa void WebDevToolsFrontendImpl::resume() { // We should call maybeDispatch asynchronously here because we are not allowed to update activeDOMObjects list in - // resume (See ScriptExecutionContext::resumeActiveDOMObjects). + // resume (See ExecutionContext::resumeActiveDOMObjects). if (!m_inspectorFrontendDispatchTimer.isActive()) m_inspectorFrontendDispatchTimer.startOneShot(0); } @@ -174,7 +169,7 @@ void WebDevToolsFrontendImpl::doDispatchOnInspectorFrontend(const WebString& mes args.append(v8String(message, isolate)); v8::TryCatch tryCatch; tryCatch.SetVerbose(true); - ScriptController::callFunctionWithInstrumentation(frame->frame() ? frame->frame()->document() : 0, function, dispatcherObject, args.size(), args.data(), isolate); + ScriptController::callFunction(frame->frame()->document(), function, dispatcherObject, args.size(), args.data(), isolate); } } // namespace WebKit |