[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 11:52:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 94dd16686d81d60e20d48af66c111816e8b1cdc5
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 06:59:11 2010 +0000
2010-08-09 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
https://bugs.webkit.org/show_bug.cgi?id=43726
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::close):
(WebCore::InspectorController::disconnectFrontend):
* inspector/InspectorController.h:
* inspector/InspectorFrontend.cpp: Removed.
* inspector/InspectorFrontend.h: Removed.
2010-08-09 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
https://bugs.webkit.org/show_bug.cgi?id=43726
* http/tests/inspector/inspector-test.js:
(notifyDone):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65053 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9dda84e..b5f54ed 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-09 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
+ https://bugs.webkit.org/show_bug.cgi?id=43726
+
+ * http/tests/inspector/inspector-test.js:
+ (notifyDone):
+
2010-08-09 Sam Weinig <sam at webkit.org>
Reviewed by Geoffrey Garen.
diff --git a/LayoutTests/http/tests/inspector/inspector-test.js b/LayoutTests/http/tests/inspector/inspector-test.js
index 19b301c..f3028fb 100755
--- a/LayoutTests/http/tests/inspector/inspector-test.js
+++ b/LayoutTests/http/tests/inspector/inspector-test.js
@@ -34,8 +34,11 @@ function notifyDone()
{
evaluateInWebInspector("true", function() {
if (window.layoutTestController) {
- layoutTestController.notifyDone();
layoutTestController.closeWebInspector();
+ // Wait until Web Inspector actually closes before calling notifyDone.
+ setTimeout(function() {
+ layoutTestController.notifyDone();
+ }, 0);
}
});
}
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 5a7b99b..6ec933a 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1058,7 +1058,6 @@ SET(WebCore_SOURCES
inspector/InspectorDOMStorageResource.cpp
inspector/InspectorDatabaseResource.cpp
inspector/InspectorDebuggerAgent.cpp
- inspector/InspectorFrontend.cpp
inspector/InspectorFrontendClientLocal.cpp
inspector/InspectorFrontendHost.cpp
inspector/InspectorResource.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 518c7f8..9e9b6d3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-09 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
+ https://bugs.webkit.org/show_bug.cgi?id=43726
+
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::connectFrontend):
+ (WebCore::InspectorController::close):
+ (WebCore::InspectorController::disconnectFrontend):
+ * inspector/InspectorController.h:
+ * inspector/InspectorFrontend.cpp: Removed.
+ * inspector/InspectorFrontend.h: Removed.
+
2010-08-09 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index f41ab3b..3c338a0 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1615,8 +1615,6 @@ webcore_sources += \
WebCore/inspector/InspectorClient.h \
WebCore/inspector/InspectorController.cpp \
WebCore/inspector/InspectorController.h \
- WebCore/inspector/InspectorFrontend.cpp \
- WebCore/inspector/InspectorFrontend.h \
WebCore/inspector/InspectorFrontendClient.h \
WebCore/inspector/InspectorFrontendClientLocal.cpp \
WebCore/inspector/InspectorFrontendClientLocal.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 76479e3..d4cc79f 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1756,8 +1756,6 @@
'inspector/InspectorDOMAgent.h',
'inspector/InspectorDOMStorageResource.cpp',
'inspector/InspectorDOMStorageResource.h',
- 'inspector/InspectorFrontend.cpp',
- 'inspector/InspectorFrontend.h',
'inspector/InspectorFrontendClient.h',
'inspector/InspectorFrontendHost.cpp',
'inspector/InspectorFrontendHost.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 513db3b..e9cfa4a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -750,7 +750,6 @@ SOURCES += \
inspector/InspectorDebuggerAgent.cpp \
inspector/InspectorDOMAgent.cpp \
inspector/InspectorDOMStorageResource.cpp \
- inspector/InspectorFrontend.cpp \
inspector/InspectorFrontendClientLocal.cpp \
inspector/InspectorFrontendHost.cpp \
inspector/InspectorResource.cpp \
@@ -1510,7 +1509,6 @@ HEADERS += \
inspector/InspectorDatabaseResource.h \
inspector/InspectorDebuggerAgent.h \
inspector/InspectorDOMStorageResource.h \
- inspector/InspectorFrontend.h \
inspector/InspectorFrontendClient.h \
inspector/InspectorFrontendClientLocal.h \
inspector/InspectorFrontendHost.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index bcb9689..4f02f7a 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -50957,14 +50957,6 @@
>
</File>
<File
- RelativePath="..\inspector\InspectorFrontend.cpp"
- >
- </File>
- <File
- RelativePath="..\inspector\InspectorFrontend.h"
- >
- </File>
- <File
RelativePath="..\inspector\InspectorFrontendClient.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index a43528d..748c285 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1421,8 +1421,6 @@
7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorBackend.h */; };
7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; };
7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; };
- 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; };
- 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; };
7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
81A7325E1210189B00FC0D9E /* IDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A7325D1210189B00FC0D9E /* IDBCursor.h */; };
@@ -7257,8 +7255,6 @@
7A74ECB9101839A600BF939E /* InspectorBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackend.h; sourceTree = "<group>"; };
7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; };
7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; };
- 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
- 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; };
7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; };
81A7325D1210189B00FC0D9E /* IDBCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursor.h; sourceTree = "<group>"; };
@@ -11654,8 +11650,6 @@
7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */,
41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
- 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */,
- 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */,
F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */,
@@ -18784,7 +18778,6 @@
F33F053E120B0DA500E5743A /* InspectorDebuggerAgent.h in Headers */,
7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
- 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */,
F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */,
@@ -21227,7 +21220,6 @@
F33F053D120B0DA500E5743A /* InspectorDebuggerAgent.cpp in Sources */,
7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
- 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */,
F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */,
diff --git a/WebCore/inspector/InjectedScriptHost.h b/WebCore/inspector/InjectedScriptHost.h
index 3bd3311..78e00d4 100644
--- a/WebCore/inspector/InjectedScriptHost.h
+++ b/WebCore/inspector/InjectedScriptHost.h
@@ -45,6 +45,7 @@ class InjectedScript;
class InspectorDOMAgent;
class Node;
class RemoteInspectorFrontend;
+class ScriptObject;
class Storage;
class InjectedScriptHost : public RefCounted<InjectedScriptHost>
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 5b59bb0..e1aeff9 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -62,7 +62,6 @@
#include "InspectorDOMStorageResource.h"
#include "InspectorDatabaseResource.h"
#include "InspectorDebuggerAgent.h"
-#include "InspectorFrontend.h"
#include "InspectorResource.h"
#include "InspectorValues.h"
#include "InspectorWorkerResource.h"
@@ -127,7 +126,7 @@ const char* const InspectorController::ProfilesPanel = "profiles";
static const char* const monitoringXHRSettingName = "xhrMonitor";
-int connectedFrontendCount = 0;
+static int connectedFrontendCount = 0;
const String& InspectorController::frontendSettingsSettingName()
{
@@ -472,11 +471,10 @@ void InspectorController::setMonitoringXHR(bool enabled)
}
}
-void InspectorController::connectFrontend(const ScriptObject& webInspector)
+void InspectorController::connectFrontend()
{
m_openingFrontend = false;
releaseFrontendLifetimeAgents();
- m_frontend = new InspectorFrontend(webInspector, m_client);
m_remoteFrontend = new RemoteInspectorFrontend(m_client);
m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_remoteFrontend.get());
if (m_timelineAgent)
@@ -556,14 +554,13 @@ void InspectorController::close()
{
if (!m_remoteFrontend)
return;
- m_frontend->close();
+ m_remoteFrontend->close();
}
void InspectorController::disconnectFrontend()
{
if (!m_remoteFrontend)
return;
- m_frontend.clear();
m_remoteFrontend.clear();
connectedFrontendCount--;
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index dd201e7..e3569cc 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -63,7 +63,6 @@ class InspectorCSSStore;
class InspectorDOMStorageResource;
class InspectorDatabaseResource;
class InspectorDebuggerAgent;
-class InspectorFrontend;
class InspectorFrontendClient;
class InspectorResource;
class InspectorTimelineAgent;
@@ -77,7 +76,6 @@ class ResourceRequest;
class ResourceResponse;
class ResourceError;
class ScriptCallStack;
-class ScriptObject;
class ScriptString;
class SharedBuffer;
class Storage;
@@ -133,7 +131,7 @@ public:
// We are in transition from JS transport via webInspector to native
// transport via InspectorClient. After migration, webInspector parameter should
// be removed.
- void connectFrontend(const ScriptObject& webInspector);
+ void connectFrontend();
void disconnectFrontend();
void addMessageToConsole(MessageSource, MessageType, MessageLevel, ScriptCallStack*, const String& message = String());
@@ -209,7 +207,6 @@ public:
const ResourcesMap& resources() const { return m_resources; }
InspectorResource* resourceForURL(const String& url);
- InspectorFrontend* inspectorFrontend() { return m_frontend.get(); }
RemoteInspectorFrontend* remoteInspectorFrontend() { return m_remoteFrontend.get(); }
void drawNodeHighlight(GraphicsContext&) const;
@@ -329,7 +326,6 @@ private:
InspectorClient* m_client;
OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
bool m_openingFrontend;
- OwnPtr<InspectorFrontend> m_frontend;
OwnPtr<RemoteInspectorFrontend> m_remoteFrontend;
RefPtr<InspectorDOMAgent> m_domAgent;
OwnPtr<InspectorCSSStore> m_cssStore;
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
deleted file mode 100644
index 186a289..0000000
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InspectorFrontend.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorClient.h"
-#include "InspectorController.h"
-#include "InspectorWorkerResource.h"
-#include "ScriptFunctionCall.h"
-#include "ScriptState.h"
-
-namespace WebCore {
-
-InspectorFrontend::InspectorFrontend(ScriptObject webInspector, InspectorClient* inspectorClient)
- : m_webInspector(webInspector)
- , m_inspectorClient(inspectorClient)
-{
-}
-
-InspectorFrontend::~InspectorFrontend()
-{
- m_webInspector = ScriptObject();
-}
-
-void InspectorFrontend::close()
-{
- ScriptFunctionCall function(m_webInspector, "close");
- function.call();
-}
-
-void InspectorFrontend::callSimpleFunction(const String& functionName)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument(functionName);
- function.call();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
deleted file mode 100644
index 2f04ac2..0000000
--- a/WebCore/inspector/InspectorFrontend.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorFrontend_h
-#define InspectorFrontend_h
-
-#include "ScriptObject.h"
-#include "ScriptState.h"
-#include <wtf/PassOwnPtr.h>
-
-namespace WebCore {
- class InspectorClient;
- class InspectorWorkerResource;
-
- class InspectorFrontend : public Noncopyable {
- public:
- // We are in transition from JS transport via webInspector to native
- // transport via inspectorClient. After migration, webInspector parameter should
- // be removed.
- InspectorFrontend(ScriptObject webInspector, InspectorClient* inspectorClient);
- ~InspectorFrontend();
-
- void close();
- ScriptState* scriptState() const { return m_webInspector.scriptState(); }
- private:
- void callSimpleFunction(const String& functionName);
- ScriptObject m_webInspector;
- InspectorClient* m_inspectorClient;
- };
-
-} // namespace WebCore
-
-#endif // !defined(InspectorFrontend_h)
diff --git a/WebCore/inspector/InspectorFrontendClientLocal.cpp b/WebCore/inspector/InspectorFrontendClientLocal.cpp
index baa9c8e..b45dd34 100644
--- a/WebCore/inspector/InspectorFrontendClientLocal.cpp
+++ b/WebCore/inspector/InspectorFrontendClientLocal.cpp
@@ -79,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()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list