diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/inspector/InspectorFrontendClientLocal.cpp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/inspector/InspectorFrontendClientLocal.cpp')
| -rw-r--r-- | WebCore/inspector/InspectorFrontendClientLocal.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/WebCore/inspector/InspectorFrontendClientLocal.cpp b/WebCore/inspector/InspectorFrontendClientLocal.cpp index f6f7811..b45dd34 100644 --- a/WebCore/inspector/InspectorFrontendClientLocal.cpp +++ b/WebCore/inspector/InspectorFrontendClientLocal.cpp @@ -39,7 +39,6 @@ #include "FrameView.h" #include "InspectorBackendDispatcher.h" #include "InspectorController.h" -#include "InspectorFrontend.h" #include "InspectorFrontendHost.h" #include "Page.h" #include "PlatformString.h" @@ -80,14 +79,7 @@ void InspectorFrontendClientLocal::windowObjectCleared() void InspectorFrontendClientLocal::frontendLoaded() { bringToFront(); - // Create InspectorFrontend and set it to InspectorController. - ASSERT(m_frontendScriptState); - ScriptObject webInspectorObj; - if (!ScriptGlobalObject::get(m_frontendScriptState, "WebInspector", webInspectorObj)) { - ASSERT_NOT_REACHED(); - return; - } - m_inspectorController->connectFrontend(webInspectorObj); + m_inspectorController->connectFrontend(); } void InspectorFrontendClientLocal::requestAttachWindow() |