[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit b3d4ff4c0681a22b19fbd7e3f349b860201a09a9
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 12:26:55 2010 +0000

    2010-08-24  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            WebInspector: RemoteInspectorFrontend can be renamed to InspectorFrontend.
            The old version of InspectorFrontend was removed some time ago and now
            it is possible to rename the new version of inspector frontend class to its
            original name.
            https://bugs.webkit.org/show_bug.cgi?id=44499
    
            * GNUmakefile.am:
            * WebCore.gyp/WebCore.gyp:
            * WebCore.pri:
            * WebCore.vcproj/WebCore.vcproj:
            * WebCore.xcodeproj/project.pbxproj:
            * inspector/CodeGeneratorInspector.pm:
            * inspector/ConsoleMessage.cpp:
            * inspector/ConsoleMessage.h:
            * inspector/InjectedScriptHost.cpp:
            * inspector/InjectedScriptHost.h:
            * inspector/InspectorApplicationCacheAgent.cpp:
            * inspector/InspectorApplicationCacheAgent.h:
            * inspector/InspectorBackend.cpp:
            * inspector/InspectorBackend.h:
            * inspector/InspectorCSSStore.cpp:
            * inspector/InspectorCSSStore.h:
            * inspector/InspectorController.cpp:
            * inspector/InspectorController.h:
            * inspector/InspectorDOMAgent.cpp:
            * inspector/InspectorDOMAgent.h:
            * inspector/InspectorDOMStorageResource.cpp:
            * inspector/InspectorDOMStorageResource.h:
            * inspector/InspectorDatabaseResource.cpp:
            * inspector/InspectorDatabaseResource.h:
            * inspector/InspectorDebuggerAgent.cpp:
            * inspector/InspectorDebuggerAgent.h:
            * inspector/InspectorProfilerAgent.cpp:
            * inspector/InspectorProfilerAgent.h:
            * inspector/InspectorResource.cpp:
            * inspector/InspectorResource.h:
            * inspector/InspectorStorageAgent.cpp:
            * inspector/InspectorStorageAgent.h:
            * inspector/InspectorTimelineAgent.cpp:
            * inspector/InspectorTimelineAgent.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65891 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c19755f..efe750c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,124 @@
+2010-08-24  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        WebInspector: RemoteInspectorFrontend can be renamed to InspectorFrontend.
+        The old version of InspectorFrontend was removed some time ago and now
+        it is possible to rename the new version of inspector frontend class to its
+        original name.
+        https://bugs.webkit.org/show_bug.cgi?id=44499
+
+        * GNUmakefile.am:
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.pri:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/ConsoleMessage.cpp:
+        (WebCore::ConsoleMessage::addToFrontend):
+        (WebCore::ConsoleMessage::updateRepeatCountInConsole):
+        * inspector/ConsoleMessage.h:
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::pushNodePathToFrontend):
+        (WebCore::InjectedScriptHost::frontend):
+        * inspector/InjectedScriptHost.h:
+        * inspector/InspectorApplicationCacheAgent.cpp:
+        (WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
+        * inspector/InspectorApplicationCacheAgent.h:
+        * inspector/InspectorBackend.cpp:
+        (WebCore::InspectorBackend::dispatchOnInjectedScript):
+        (WebCore::InspectorBackend::frontend):
+        * inspector/InspectorBackend.h:
+        * inspector/InspectorCSSStore.cpp:
+        * inspector/InspectorCSSStore.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::inspectedPageDestroyed):
+        (WebCore::InspectorController::inspect):
+        (WebCore::InspectorController::focusNode):
+        (WebCore::InspectorController::windowVisible):
+        (WebCore::InspectorController::addConsoleMessage):
+        (WebCore::InspectorController::clearConsoleMessages):
+        (WebCore::InspectorController::inspectedWindowScriptObjectCleared):
+        (WebCore::InspectorController::setSearchingForNode):
+        (WebCore::InspectorController::setMonitoringXHR):
+        (WebCore::InspectorController::connectFrontend):
+        (WebCore::InspectorController::show):
+        (WebCore::InspectorController::showPanel):
+        (WebCore::InspectorController::close):
+        (WebCore::InspectorController::disconnectFrontend):
+        (WebCore::InspectorController::populateScriptObjects):
+        (WebCore::InspectorController::pruneResources):
+        (WebCore::InspectorController::didCommitLoad):
+        (WebCore::InspectorController::didLoadResourceFromMemoryCache):
+        (WebCore::InspectorController::identifierForInitialRequest):
+        (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
+        (WebCore::InspectorController::mainResourceFiredLoadEvent):
+        (WebCore::InspectorController::willSendRequest):
+        (WebCore::InspectorController::didReceiveResponse):
+        (WebCore::InspectorController::didReceiveContentLength):
+        (WebCore::InspectorController::didFinishLoading):
+        (WebCore::InspectorController::didFailLoading):
+        (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
+        (WebCore::InspectorController::scriptImported):
+        (WebCore::InspectorController::enableResourceTracking):
+        (WebCore::InspectorController::disableResourceTracking):
+        (WebCore::InspectorController::startTimelineProfiler):
+        (WebCore::InspectorController::stopTimelineProfiler):
+        (WebCore::InspectorController::postWorkerNotificationToFrontend):
+        (WebCore::InspectorController::didCreateWorker):
+        (WebCore::InspectorController::didDestroyWorker):
+        (WebCore::InspectorController::selectDatabase):
+        (WebCore::InspectorController::didOpenDatabase):
+        (WebCore::InspectorController::didUseDOMStorage):
+        (WebCore::InspectorController::selectDOMStorage):
+        (WebCore::InspectorController::enableDebuggerFromFrontend):
+        (WebCore::InspectorController::enableDebugger):
+        (WebCore::InspectorController::disableDebugger):
+        (WebCore::InspectorController::evaluateForTestInFrontend):
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::hasFrontend):
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::InspectorDOMAgent):
+        * inspector/InspectorDOMAgent.h:
+        (WebCore::InspectorDOMAgent::create):
+        * inspector/InspectorDOMStorageResource.cpp:
+        (WebCore::InspectorDOMStorageResource::bind):
+        * inspector/InspectorDOMStorageResource.h:
+        * inspector/InspectorDatabaseResource.cpp:
+        (WebCore::InspectorDatabaseResource::bind):
+        * inspector/InspectorDatabaseResource.h:
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::create):
+        (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+        (WebCore::InspectorDebuggerAgent::setPauseOnExceptionsState):
+        (WebCore::InspectorDebuggerAgent::didParseSource):
+        (WebCore::InspectorDebuggerAgent::failedToParseSource):
+        (WebCore::InspectorDebuggerAgent::didPause):
+        (WebCore::InspectorDebuggerAgent::didContinue):
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
+        (WebCore::InspectorProfilerAgent::addProfile):
+        (WebCore::InspectorProfilerAgent::disable):
+        (WebCore::InspectorProfilerAgent::enable):
+        (WebCore::InspectorProfilerAgent::resetState):
+        (WebCore::InspectorProfilerAgent::toggleRecordButton):
+        * inspector/InspectorProfilerAgent.h:
+        (WebCore::InspectorProfilerAgent::setFrontend):
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::updateScriptObject):
+        (WebCore::InspectorResource::releaseScriptObject):
+        * inspector/InspectorResource.h:
+        * inspector/InspectorStorageAgent.cpp:
+        (WebCore::InspectorStorageAgent::InspectorStorageAgent):
+        * inspector/InspectorStorageAgent.h:
+        (WebCore::InspectorStorageAgent::create):
+        (WebCore::InspectorStorageAgent::frontend):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+        (WebCore::InspectorTimelineAgent::resetFrontendProxyObject):
+        * inspector/InspectorTimelineAgent.h:
+
 2010-08-24  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 82fc19e..6b7d31d 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -98,6 +98,8 @@ webcore_built_sources += \
 	DerivedSources/WebCore/HTMLNames.h \
 	DerivedSources/WebCore/InspectorBackendDispatcher.cpp \
 	DerivedSources/WebCore/InspectorBackendDispatcher.h \
+	DerivedSources/WebCore/InspectorFrontend.cpp \
+	DerivedSources/WebCore/InspectorFrontend.h \
 	DerivedSources/WebCore/JSAbstractWorker.cpp \
 	DerivedSources/WebCore/JSAbstractWorker.h \
 	DerivedSources/WebCore/JSArrayBuffer.cpp \
@@ -551,8 +553,6 @@ webcore_built_sources += \
 	DerivedSources/WebCore/JSXMLSerializer.h \
 	DerivedSources/WebCore/JSXSLTProcessor.cpp \
 	DerivedSources/WebCore/JSXSLTProcessor.h \
-	DerivedSources/WebCore/RemoteInspectorFrontend.cpp \
-	DerivedSources/WebCore/RemoteInspectorFrontend.h \
 	DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
 	DerivedSources/WebCore/UserAgentStyleSheets.h \
 	DerivedSources/WebCore/XMLNames.cpp \
@@ -4538,7 +4538,7 @@ DerivedSources/WebCore/XMLNames.cpp DerivedSources/WebCore/XMLNames.h: $(WebCore
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
 
 # All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
-DerivedSources/WebCore/RemoteInspectorFrontend.cpp DerivedSources/WebCore/RemoteInspectorFrontend.h DerivedSources/WebCore/InspectorBackendDispatcher.cpp DerivedSources/WebCore/InspectorBackendDispatcher.h DerivedSources/WebCore/InspectorBackendStub.js: $(WebCore)/inspector/Inspector.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
+DerivedSources/WebCore/InspectorFrontend.cpp DerivedSources/WebCore/InspectorFrontend.h DerivedSources/WebCore/InspectorBackendDispatcher.cpp DerivedSources/WebCore/InspectorBackendDispatcher.h DerivedSources/WebCore/InspectorBackendStub.js: $(WebCore)/inspector/Inspector.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts -I$(WebCore)/inspector $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator Inspector $<
 
 IDL_PATH := \
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index fed9c0d..178e459 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -287,8 +287,8 @@
             '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorBackendDispatcher.h',
-            '<(SHARED_INTERMEDIATE_DIR)/webcore/RemoteInspectorFrontend.cpp',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/RemoteInspectorFrontend.h',
+            '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorFrontend.h',
           ],
           'variables': {
             'generator_include_dirs': [
@@ -757,7 +757,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/webkit/XPathGrammar.cpp',
 
         # Additional .cpp files from the webcore_inspector_sources list.
-        '<(SHARED_INTERMEDIATE_DIR)/webcore/RemoteInspectorFrontend.cpp',
+        '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
       ],
       'conditions': [
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 3294ecd..477e1ba 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -555,7 +555,7 @@ idl.depends = $$PWD/bindings/scripts/CodeGenerator.pm \
 addExtraCompiler(idl)
 
 # GENERATOR 2: inspector idl compiler
-inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/Remote${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp
+inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp
 inspectorIDL.input = INSPECTOR_INTERFACES
 inspectorIDL.wkScript = $$PWD/bindings/scripts/generate-bindings.pl
 inspectorIDL.commands = perl -I$$PWD/bindings/scripts -I$$PWD/inspector $$inspectorIDL.wkScript --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" --generator Inspector --outputDir $$WC_GENERATED_SOURCES_DIR --preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME}
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 5ae3927..0799750 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -553,6 +553,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorFrontend.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorFrontend.h"
+				>
+			</File>
+			<File
 				RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSAbstractWorker.cpp"
 				>
 				<FileConfiguration
@@ -21477,14 +21485,6 @@
 				>
 			</File>
 			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RemoteInspectorFrontend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RemoteInspectorFrontend.h"
-				>
-			</File>
-			<File
 				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\SVGElementFactory.cpp"
 				>
 			</File>
@@ -51881,14 +51881,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\inspector\InspectorProfilerAgent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\inspector\InspectorProfilerAgent.h"
-				>
-			</File>
-			<File
+				RelativePath="..\inspector\InspectorProfilerAgent.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\inspector\InspectorProfilerAgent.h"
+				>
+			</File>
+			<File
 				RelativePath="..\inspector\InspectorResource.cpp"
 				>
 			</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index e2532a9..c27a8b5 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1071,7 +1071,7 @@
 		4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */; };
 		4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F3289B411A42AAB005ABE7E /* InspectorValues.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		4F4F5FFB11CBD2E100A186BF /* RemoteInspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* RemoteInspectorFrontend.cpp */; };
+		4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */; };
 		4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */; };
 		4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */; };
 		4FD8D0F2119C718B002FA825 /* ScriptGCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */; };
@@ -6950,8 +6950,8 @@
 		4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehaviorTypes.h; sourceTree = "<group>"; };
 		4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorValues.cpp; sourceTree = "<group>"; };
 		4F3289B411A42AAB005ABE7E /* InspectorValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorValues.h; sourceTree = "<group>"; };
-		4F4F5FFA11CBD2D200A186BF /* RemoteInspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteInspectorFrontend.cpp; sourceTree = "<group>"; };
-		4F4F5FFC11CBD30100A186BF /* RemoteInspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorFrontend.h; sourceTree = "<group>"; };
+		4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
+		4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
 		4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackendDispatcher.cpp; sourceTree = "<group>"; };
 		4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackendDispatcher.h; sourceTree = "<group>"; };
 		4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptGCEvent.cpp; sourceTree = "<group>"; };
@@ -11757,6 +11757,8 @@
 			children = (
 				4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */,
 				4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */,
+				4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */,
+				4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */,
 				7A0E76D810BF059800A0276E /* JSInjectedScriptHost.cpp */,
 				7A0E76D910BF059800A0276E /* JSInjectedScriptHost.h */,
 				7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */,
@@ -11767,8 +11769,6 @@
 				9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */,
 				9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */,
 				9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */,
-				4F4F5FFA11CBD2D200A186BF /* RemoteInspectorFrontend.cpp */,
-				4F4F5FFC11CBD30100A186BF /* RemoteInspectorFrontend.h */,
 			);
 			name = Inspector;
 			sourceTree = "<group>";
@@ -21457,6 +21457,7 @@
 				F33F053D120B0DA500E5743A /* InspectorDebuggerAgent.cpp in Sources */,
 				7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
 				41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
+				4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
 				F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
 				7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
 				41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */,
@@ -22151,7 +22152,6 @@
 				979F43D31075E44A0000F83B /* RedirectScheduler.cpp in Sources */,
 				85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
 				B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */,
-				4F4F5FFB11CBD2E100A186BF /* RemoteInspectorFrontend.cpp in Sources */,
 				93309E00099E64920056E581 /* RemoveCSSPropertyCommand.cpp in Sources */,
 				D06C0D900CFD11460065F43F /* RemoveFormatCommand.cpp in Sources */,
 				93309E04099E64920056E581 /* RemoveNodeCommand.cpp in Sources */,
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index 5ecbfca..be0948b 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -44,8 +44,8 @@ $typeTransform{"Profiler"} = {
     "domainAccessor" => "m_inspectorController->profilerAgent()",
 };
 $typeTransform{"Frontend"} = {
-    "forward" => "RemoteInspectorFrontend",
-    "header" => "RemoteInspectorFrontend.h",
+    "forward" => "InspectorFrontend",
+    "header" => "InspectorFrontend.h",
 };
 $typeTransform{"PassRefPtr"} = {
     "forwardHeader" => "wtf/PassRefPtr.h",
@@ -200,7 +200,7 @@ sub GenerateInterface
 
     my $className = $interface->name;
 
-    $frontendClassName = "Remote" . $className . "Frontend";
+    $frontendClassName = $className . "Frontend";
     $frontendConstructor = "    ${frontendClassName}(InspectorClient* inspectorClient) : m_inspectorClient(inspectorClient) { }";
     $frontendFooter = "    InspectorClient* m_inspectorClient;";
     $frontendTypes{"String"} = 1;
diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index 6f19d2a..f3bd6bc 100644
--- a/WebCore/inspector/ConsoleMessage.cpp
+++ b/WebCore/inspector/ConsoleMessage.cpp
@@ -38,7 +38,7 @@
 #include "ScriptValue.h"
 
 #if ENABLE(INSPECTOR)
-#include "RemoteInspectorFrontend.h"
+#include "InspectorFrontend.h"
 #endif
 
 namespace WebCore {
@@ -114,7 +114,7 @@ ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, c
 }
 
 #if ENABLE(INSPECTOR)
-void ConsoleMessage::addToFrontend(RemoteInspectorFrontend* frontend, InjectedScriptHost* injectedScriptHost)
+void ConsoleMessage::addToFrontend(InspectorFrontend* frontend, InjectedScriptHost* injectedScriptHost)
 {
     RefPtr<InspectorObject> jsonObj = InspectorObject::create();
     jsonObj->setNumber("source", static_cast<int>(m_source));
@@ -149,7 +149,7 @@ void ConsoleMessage::addToFrontend(RemoteInspectorFrontend* frontend, InjectedSc
     frontend->addConsoleMessage(jsonObj);
 }
 
-void ConsoleMessage::updateRepeatCountInConsole(RemoteInspectorFrontend* frontend)
+void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend* frontend)
 {
     frontend->updateConsoleMessageRepeatCount(m_repeatCount);
 }
diff --git a/WebCore/inspector/ConsoleMessage.h b/WebCore/inspector/ConsoleMessage.h
index e286f0a..d10fa3d 100644
--- a/WebCore/inspector/ConsoleMessage.h
+++ b/WebCore/inspector/ConsoleMessage.h
@@ -39,8 +39,8 @@
 
 namespace WebCore {
 class InjectedScriptHost;
+class InspectorFrontend;
 class InspectorObject;
-class RemoteInspectorFrontend;
 class ScriptCallFrame;
 class ScriptCallStack;
 class ScriptValue;
@@ -51,8 +51,8 @@ public:
     ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, ScriptCallStack*, unsigned g, bool storeTrace = false);
 
 #if ENABLE(INSPECTOR)
-    void addToFrontend(RemoteInspectorFrontend*, InjectedScriptHost*);
-    void updateRepeatCountInConsole(RemoteInspectorFrontend* frontend);
+    void addToFrontend(InspectorFrontend*, InjectedScriptHost*);
+    void updateRepeatCountInConsole(InspectorFrontend* frontend);
 #endif
     void incrementCount() { ++m_repeatCount; }
     bool isEqual(ScriptState*, ConsoleMessage* msg) const;
diff --git a/WebCore/inspector/InjectedScriptHost.cpp b/WebCore/inspector/InjectedScriptHost.cpp
index 9833c03..06b25fe 100644
--- a/WebCore/inspector/InjectedScriptHost.cpp
+++ b/WebCore/inspector/InjectedScriptHost.cpp
@@ -42,9 +42,9 @@
 #include "InspectorClient.h"
 #include "InspectorController.h"
 #include "InspectorDOMAgent.h"
+#include "InspectorFrontend.h"
 #include "InspectorResource.h"
 #include "Pasteboard.h"
-#include "RemoteInspectorFrontend.h"
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 #include "ScriptDebugServer.h"
@@ -98,15 +98,14 @@ Node* InjectedScriptHost::nodeForId(long nodeId)
 
 long InjectedScriptHost::pushNodePathToFrontend(Node* node, bool withChildren, bool selectInUI)
 {
-    RemoteInspectorFrontend* frontend = remoteFrontend();
     InspectorDOMAgent* domAgent = inspectorDOMAgent();
-    if (!domAgent || !frontend)
+    if (!domAgent || !frontend())
         return 0;
     long id = domAgent->pushNodePathToFrontend(node);
     if (withChildren)
         domAgent->pushChildNodesToFrontend(id);
     if (selectInUI)
-        frontend->updateFocusedNode(id);
+        frontend()->updateFocusedNode(id);
     return id;
 }
 
@@ -175,11 +174,11 @@ InspectorDOMAgent* InjectedScriptHost::inspectorDOMAgent()
     return m_inspectorController->domAgent();
 }
 
-RemoteInspectorFrontend* InjectedScriptHost::remoteFrontend()
+InspectorFrontend* InjectedScriptHost::frontend()
 {
     if (!m_inspectorController)
         return 0;
-    return m_inspectorController->m_remoteFrontend.get();
+    return m_inspectorController->m_frontend.get();
 }
 
 pair<long, ScriptObject> InjectedScriptHost::injectScript(const String& source, ScriptState* scriptState)
diff --git a/WebCore/inspector/InjectedScriptHost.h b/WebCore/inspector/InjectedScriptHost.h
index 32797d1..6b70f62 100644
--- a/WebCore/inspector/InjectedScriptHost.h
+++ b/WebCore/inspector/InjectedScriptHost.h
@@ -43,8 +43,8 @@ namespace WebCore {
 class Database;
 class InjectedScript;
 class InspectorDOMAgent;
+class InspectorFrontend;
 class Node;
-class RemoteInspectorFrontend;
 class ScriptObject;
 class Storage;
 
@@ -95,7 +95,7 @@ public:
 private:
     InjectedScriptHost(InspectorController* inspectorController);
     InspectorDOMAgent* inspectorDOMAgent();
-    RemoteInspectorFrontend* remoteFrontend();
+    InspectorFrontend* frontend();
     ScriptObject createInjectedScript(const String& source, ScriptState* scriptState, long id);
     void discardInjectedScript(ScriptState*);
 
diff --git a/WebCore/inspector/InspectorApplicationCacheAgent.cpp b/WebCore/inspector/InspectorApplicationCacheAgent.cpp
index 1206184..918643b 100644
--- a/WebCore/inspector/InspectorApplicationCacheAgent.cpp
+++ b/WebCore/inspector/InspectorApplicationCacheAgent.cpp
@@ -33,14 +33,14 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "InspectorController.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
 #include "Page.h"
-#include "RemoteInspectorFrontend.h"
 #include "ResourceResponse.h"
 
 namespace WebCore {
 
-InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorController* inspectorController, RemoteInspectorFrontend* frontend)
+InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorController* inspectorController, InspectorFrontend* frontend)
     : m_inspectorController(inspectorController)
     , m_frontend(frontend)
 {
diff --git a/WebCore/inspector/InspectorApplicationCacheAgent.h b/WebCore/inspector/InspectorApplicationCacheAgent.h
index 3338f84..11f10ce 100644
--- a/WebCore/inspector/InspectorApplicationCacheAgent.h
+++ b/WebCore/inspector/InspectorApplicationCacheAgent.h
@@ -35,14 +35,14 @@ namespace WebCore {
 
 class InspectorArray;
 class InspectorController;
+class InspectorFrontend;
 class InspectorObject;
 class InspectorValue;
-class RemoteInspectorFrontend;
 class ResourceResponse;
 
 class InspectorApplicationCacheAgent : public Noncopyable {
 public:
-    InspectorApplicationCacheAgent(InspectorController* inspectorController, RemoteInspectorFrontend* frontend);
+    InspectorApplicationCacheAgent(InspectorController* inspectorController, InspectorFrontend* frontend);
     ~InspectorApplicationCacheAgent() { }
 
     // Backend to Frontend
@@ -59,7 +59,7 @@ private:
     PassRefPtr<InspectorObject> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
 
     InspectorController* m_inspectorController;
-    RemoteInspectorFrontend* m_frontend;
+    InspectorFrontend* m_frontend;
 };
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index f0ed94b..99f40a9 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -40,8 +40,8 @@
 #include "InjectedScriptHost.h"
 #include "InspectorController.h"
 #include "InspectorDOMAgent.h"
+#include "InspectorFrontend.h"
 #include "InspectorStorageAgent.h"
-#include "RemoteInspectorFrontend.h"
 #include "ScriptBreakpoint.h"
 #include "ScriptProfiler.h"
 #include "SerializedScriptValue.h"
@@ -88,7 +88,7 @@ void InspectorBackend::setInjectedScriptSource(const String& source)
 
 void InspectorBackend::dispatchOnInjectedScript(long injectedScriptId, const String& methodName, const String& arguments, RefPtr<InspectorValue>* result, bool* hadException)
 {
-    if (!remoteFrontend())
+    if (!frontend())
         return;
 
     // FIXME: explicitly pass injectedScriptId along with node id to the frontend.
@@ -137,9 +137,9 @@ void InspectorBackend::executeSQL(long databaseId, const String& query, bool* su
 
 #endif
 
-RemoteInspectorFrontend* InspectorBackend::remoteFrontend()
+InspectorFrontend* InspectorBackend::frontend()
 {
-    return m_inspectorController->m_remoteFrontend.get();
+    return m_inspectorController->m_frontend.get();
 }
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index 27a93eb..23b31a3 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -40,7 +40,6 @@ namespace WebCore {
 class InspectorApplicationCacheAgent;
 class InspectorDOMAgent;
 class InspectorFrontend;
-class RemoteInspectorFrontend;
 
 class InspectorBackend : public RefCounted<InspectorBackend>
 {
@@ -78,7 +77,7 @@ public:
 
 private:
     InspectorBackend(InspectorController* inspectorController);
-    RemoteInspectorFrontend* remoteFrontend();
+    InspectorFrontend* frontend();
 
     InspectorController* m_inspectorController;
 };
diff --git a/WebCore/inspector/InspectorCSSStore.cpp b/WebCore/inspector/InspectorCSSStore.cpp
index 16d2508..c2dc4f1 100644
--- a/WebCore/inspector/InspectorCSSStore.cpp
+++ b/WebCore/inspector/InspectorCSSStore.cpp
@@ -41,7 +41,6 @@
 #include "InspectorController.h"
 #include "InspectorResource.h"
 #include "PlatformString.h"
-#include "RemoteInspectorFrontend.h"
 #include "StyleSheetList.h"
 
 namespace WebCore {
diff --git a/WebCore/inspector/InspectorCSSStore.h b/WebCore/inspector/InspectorCSSStore.h
index ee435e5..82de622 100644
--- a/WebCore/inspector/InspectorCSSStore.h
+++ b/WebCore/inspector/InspectorCSSStore.h
@@ -38,7 +38,6 @@ namespace WebCore {
 
 class Document;
 class InspectorController;
-class InspectorFrontend;
 class CSSMutableStyleDeclaration;
 class CSSStyleDeclaration;
 class CSSRuleList;
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 89c9132..9002d53 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -59,6 +59,7 @@
 #include "InspectorBackendDispatcher.h"
 #include "InspectorCSSStore.h"
 #include "InspectorClient.h"
+#include "InspectorFrontend.h"
 #include "InspectorFrontendClient.h"
 #include "InspectorDOMStorageResource.h"
 #include "InspectorDatabaseResource.h"
@@ -72,7 +73,6 @@
 #include "Page.h"
 #include "ProgressTracker.h"
 #include "Range.h"
-#include "RemoteInspectorFrontend.h"
 #include "RenderInline.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
@@ -197,8 +197,8 @@ InspectorController::~InspectorController()
 
 void InspectorController::inspectedPageDestroyed()
 {
-    if (m_remoteFrontend)
-        m_remoteFrontend->inspectedPageDestroyed();
+    if (m_frontend)
+        m_frontend->inspectedPageDestroyed();
 
     hideHighlight();
 
@@ -258,7 +258,7 @@ void InspectorController::inspect(Node* node)
         node = node->parentNode();
     m_nodeToFocus = node;
 
-    if (!m_remoteFrontend) {
+    if (!m_frontend) {
         m_showAfterVisible = ElementsPanel;
         return;
     }
@@ -271,11 +271,11 @@ void InspectorController::focusNode()
     if (!enabled())
         return;
 
-    ASSERT(m_remoteFrontend);
+    ASSERT(m_frontend);
     ASSERT(m_nodeToFocus);
 
     long id = m_domAgent->pushNodePathToFrontend(m_nodeToFocus.get());
-    m_remoteFrontend->updateFocusedNode(id);
+    m_frontend->updateFocusedNode(id);
     m_nodeToFocus = 0;
 }
 
@@ -305,7 +305,7 @@ void InspectorController::hideHighlight()
 
 bool InspectorController::windowVisible()
 {
-    return m_remoteFrontend;
+    return m_frontend;
 }
 
 void InspectorController::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, ScriptCallStack* callStack, const String& message)
@@ -332,16 +332,16 @@ void InspectorController::addConsoleMessage(ScriptState* scriptState, PassOwnPtr
 
     if (m_previousMessage && m_previousMessage->isEqual(scriptState, consoleMessage.get())) {
         m_previousMessage->incrementCount();
-        if (m_remoteFrontend)
-            m_previousMessage->updateRepeatCountInConsole(m_remoteFrontend.get());
+        if (m_frontend)
+            m_previousMessage->updateRepeatCountInConsole(m_frontend.get());
     } else {
         m_previousMessage = consoleMessage.get();
         m_consoleMessages.append(consoleMessage);
-        if (m_remoteFrontend)
-            m_previousMessage->addToFrontend(m_remoteFrontend.get(), m_injectedScriptHost.get());
+        if (m_frontend)
+            m_previousMessage->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
     }
 
-    if (!m_remoteFrontend && m_consoleMessages.size() >= maximumConsoleMessages) {
+    if (!m_frontend && m_consoleMessages.size() >= maximumConsoleMessages) {
         m_expiredConsoleMessageCount += expireConsoleMessagesStep;
         m_consoleMessages.remove(0, expireConsoleMessagesStep);
     }
@@ -356,8 +356,8 @@ void InspectorController::clearConsoleMessages()
     m_injectedScriptHost->releaseWrapperObjectGroup(0 /* release the group in all scripts */, "console");
     if (m_domAgent)
         m_domAgent->releaseDanglingNodes();
-    if (m_remoteFrontend)
-        m_remoteFrontend->consoleMessagesCleared();
+    if (m_frontend)
+        m_frontend->consoleMessagesCleared();
 }
 
 void InspectorController::startGroup(MessageSource source, ScriptCallStack* callStack, bool collapsed)
@@ -428,7 +428,7 @@ void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame)
         m_inspectorFrontendClient->windowObjectCleared();
 
     if (enabled()) {
-        if (m_remoteFrontend && frame == m_inspectedPage->mainFrame())
+        if (m_frontend && frame == m_inspectedPage->mainFrame())
             m_injectedScriptHost->discardInjectedScripts();
         if (m_scriptsToEvaluateOnLoad.size()) {
             ScriptState* scriptState = mainWorldScriptState(frame);
@@ -449,11 +449,11 @@ void InspectorController::setSearchingForNode(bool enabled)
     m_searchingForNode = enabled;
     if (!m_searchingForNode)
         hideHighlight();
-    if (m_remoteFrontend) {
+    if (m_frontend) {
         if (enabled)
-            m_remoteFrontend->searchingForNodeWasEnabled();
+            m_frontend->searchingForNodeWasEnabled();
         else
-            m_remoteFrontend->searchingForNodeWasDisabled();
+            m_frontend->searchingForNodeWasDisabled();
     }
 }
 
@@ -463,11 +463,11 @@ void InspectorController::setMonitoringXHR(bool enabled)
         return;
     m_monitoringXHR = enabled;
     setSetting(monitoringXHRSettingName, enabled ? "true" : "false");
-    if (m_remoteFrontend) {
+    if (m_frontend) {
         if (enabled)
-            m_remoteFrontend->monitoringXHRWasEnabled();
+            m_frontend->monitoringXHRWasEnabled();
         else
-            m_remoteFrontend->monitoringXHRWasDisabled();
+            m_frontend->monitoringXHRWasDisabled();
     }
 }
 
@@ -475,18 +475,18 @@ void InspectorController::connectFrontend()
 {
     m_openingFrontend = false;
     releaseFrontendLifetimeAgents();
-    m_remoteFrontend = new RemoteInspectorFrontend(m_client);
-    m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_remoteFrontend.get());
+    m_frontend = new InspectorFrontend(m_client);
+    m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_frontend.get());
 
 #if ENABLE(DATABASE)
-    m_storageAgent = InspectorStorageAgent::create(m_remoteFrontend.get());
+    m_storageAgent = InspectorStorageAgent::create(m_frontend.get());
 #endif
 
     if (m_timelineAgent)
-        m_timelineAgent->resetFrontendProxyObject(m_remoteFrontend.get());
+        m_timelineAgent->resetFrontendProxyObject(m_frontend.get());
 
     // Initialize Web Inspector title.
-    m_remoteFrontend->inspectedURLChanged(m_inspectedPage->mainFrame()->loader()->url().string());
+    m_frontend->inspectedURLChanged(m_inspectedPage->mainFrame()->loader()->url().string());
 
     populateScriptObjects();
 
@@ -500,7 +500,7 @@ void InspectorController::connectFrontend()
         if (debuggerEnabled == "true" || m_attachDebuggerWhenShown)
             enableDebugger();
     }
-    m_profilerAgent->setRemoteFrontend(m_remoteFrontend.get());
+    m_profilerAgent->setFrontend(m_frontend.get());
     if (!ScriptProfiler::isProfilerAlwaysEnabled()) {
         String profilerEnabledSetting = setting(profilerEnabledSettingName);
         if (profilerEnabledSetting == "true")
@@ -516,7 +516,7 @@ void InspectorController::connectFrontend()
     showPanel(m_showAfterVisible);
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_remoteFrontend.get());
+    m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend.get());
 #endif
 
     if (!connectedFrontendCount)
@@ -532,8 +532,8 @@ void InspectorController::show()
     if (m_openingFrontend)
         return;
 
-    if (m_remoteFrontend)
-        m_remoteFrontend->bringToFront();
+    if (m_frontend)
+        m_frontend->bringToFront();
     else {
         m_openingFrontend = true;
         m_client->openInspectorFrontend(this);
@@ -547,7 +547,7 @@ void InspectorController::showPanel(const String& panel)
 
     show();
 
-    if (!m_remoteFrontend) {
+    if (!m_frontend) {
         m_showAfterVisible = panel;
         return;
     }
@@ -555,21 +555,21 @@ void InspectorController::showPanel(const String& panel)
     if (panel == lastActivePanel)
         return;
 
-    m_remoteFrontend->showPanel(panel);
+    m_frontend->showPanel(panel);
 }
 
 void InspectorController::close()
 {
-    if (!m_remoteFrontend)
+    if (!m_frontend)
         return;
-    m_remoteFrontend->close();
+    m_frontend->close();
 }
 
 void InspectorController::disconnectFrontend()
 {
-    if (!m_remoteFrontend)
+    if (!m_frontend)
         return;
-    m_remoteFrontend.clear();
+    m_frontend.clear();
 
     connectedFrontendCount--;
     if (!connectedFrontendCount)
@@ -592,7 +592,7 @@ void InspectorController::disconnectFrontend()
     hideHighlight();
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    m_profilerAgent->setRemoteFrontend(0);
+    m_profilerAgent->setFrontend(0);
     m_profilerAgent->stopUserInitiatedProfiling();
 #endif
 
@@ -621,66 +621,66 @@ void InspectorController::releaseFrontendLifetimeAgents()
 
 void InspectorController::populateScriptObjects()
 {
-    ASSERT(m_remoteFrontend);
-    if (!m_remoteFrontend)
+    ASSERT(m_frontend);
+    if (!m_frontend)
         return;
 
-    m_remoteFrontend->populateApplicationSettings(setting(frontendSettingsSettingName()));
+    m_frontend->populateApplicationSettings(setting(frontendSettingsSettingName()));
 
     if (m_resourceTrackingEnabled)
-        m_remoteFrontend->resourceTrackingWasEnabled();
+        m_frontend->resourceTrackingWasEnabled();
 
     if (m_searchingForNode)
-        m_remoteFrontend->searchingForNodeWasEnabled();
+        m_frontend->searchingForNodeWasEnabled();
 
     if (m_monitoringXHR)
-        m_remoteFrontend->monitoringXHRWasEnabled();
+        m_frontend->monitoringXHRWasEnabled();
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     if (m_profilerAgent->enabled())
-        m_remoteFrontend->profilerWasEnabled();
+        m_frontend->profilerWasEnabled();
 #endif
 
     ResourcesMap::iterator resourcesEnd = m_resources.end();
     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
-        it->second->updateScriptObject(m_remoteFrontend.get());
+        it->second->updateScriptObject(m_frontend.get());
 
     m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
 
     if (m_expiredConsoleMessageCount)
-        m_remoteFrontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
+        m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();
     for (unsigned i = 0; i < messageCount; ++i)
-        m_consoleMessages[i]->addToFrontend(m_remoteFrontend.get(), m_injectedScriptHost.get());
+        m_consoleMessages[i]->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     if (debuggerEnabled())
-        m_remoteFrontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
+        m_frontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
 #endif
 #if ENABLE(DATABASE)
     DatabaseResourcesMap::iterator databasesEnd = m_databaseResources.end();
     for (DatabaseResourcesMap::iterator it = m_databaseResources.begin(); it != databasesEnd; ++it)
-        it->second->bind(m_remoteFrontend.get());
+        it->second->bind(m_frontend.get());
 #endif
 #if ENABLE(DOM_STORAGE)
     DOMStorageResourcesMap::iterator domStorageEnd = m_domStorageResources.end();
     for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it)
-        it->second->bind(m_remoteFrontend.get());
+        it->second->bind(m_frontend.get());
 #endif
 #if ENABLE(WORKERS)
     WorkersMap::iterator workersEnd = m_workers.end();
     for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it) {
         InspectorWorkerResource* worker = it->second.get();
-        m_remoteFrontend->didCreateWorker(worker->id(), worker->url(), worker->isSharedWorker());
+        m_frontend->didCreateWorker(worker->id(), worker->url(), worker->isSharedWorker());
     }
 #endif
 
-    m_remoteFrontend->populateSessionSettings(m_sessionSettings->toJSONString());
-    m_remoteFrontend->populateInterface();
+    m_frontend->populateSessionSettings(m_sessionSettings->toJSONString());
+    m_frontend->populateInterface();
 
     // Dispatch pending frontend commands
     for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); it != m_pendingEvaluateTestCommands.end(); ++it)
-        m_remoteFrontend->evaluateForTestInFrontend((*it).first, (*it).second);
+        m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
     m_pendingEvaluateTestCommands.clear();
 }
 
@@ -717,8 +717,8 @@ void InspectorController::pruneResources(ResourcesMap* resourceMap, DocumentLoad
 
         if (!loaderToKeep || !resource->isSameLoader(loaderToKeep)) {
             removeResource(resource);
-            if (m_remoteFrontend)
-                resource->releaseScriptObject(m_remoteFrontend.get());
+            if (m_frontend)
+                resource->releaseScriptObject(m_frontend.get());
         }
     }
 }
@@ -731,8 +731,8 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
     ASSERT(m_inspectedPage);
 
     if (loader->frame() == m_inspectedPage->mainFrame()) {
-        if (m_remoteFrontend)
-            m_remoteFrontend->inspectedURLChanged(loader->url().string());
+        if (m_frontend)
+            m_frontend->inspectedURLChanged(loader->url().string());
 
         m_injectedScriptHost->discardInjectedScripts();
         clearConsoleMessages();
@@ -752,8 +752,8 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
 
         m_cssStore->reset();
         m_sessionSettings = InspectorObject::create();
-        if (m_remoteFrontend) {
-            m_remoteFrontend->reset();
+        if (m_frontend) {
+            m_frontend->reset();
             m_domAgent->reset();
         }
 #if ENABLE(WORKERS)
@@ -766,13 +766,13 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
         m_domStorageResources.clear();
 #endif
 
-        if (m_remoteFrontend) {
+        if (m_frontend) {
             if (!loader->frameLoader()->isLoadingFromCachedPage()) {
                 ASSERT(m_mainResource && m_mainResource->isSameLoader(loader));
                 // We don't add the main resource until its load is committed. This is
                 // needed to keep the load for a user-entered URL from showing up in the
                 // list of resources for the page they are navigating away from.
-                m_mainResource->updateScriptObject(m_remoteFrontend.get());
+                m_mainResource->updateScriptObject(m_frontend.get());
             } else {
                 // Pages loaded from the page cache are committed before
                 // m_mainResource is the right resource for this load, so we
@@ -780,7 +780,7 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
                 // identifierForInitialRequest.
                 m_mainResource = 0;
             }
-            m_remoteFrontend->didCommitLoad();
+            m_frontend->didCommitLoad();
             m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
         }
     }
@@ -883,8 +883,8 @@ void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader* loader,
 
     addResource(resource.get());
 
-    if (m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::identifierForInitialRequest(unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
@@ -907,8 +907,8 @@ void InspectorController::identifierForInitialRequest(unsigned long identifier,
 
     addResource(resource.get());
 
-    if (m_remoteFrontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (m_frontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loader, const KURL& url)
@@ -920,8 +920,8 @@ void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loade
         m_mainResource->markDOMContentEventTime();
         if (m_timelineAgent)
             m_timelineAgent->didMarkDOMContentEvent();
-        if (m_remoteFrontend)
-            m_mainResource->updateScriptObject(m_remoteFrontend.get());
+        if (m_frontend)
+            m_mainResource->updateScriptObject(m_frontend.get());
     }
 }
 
@@ -934,8 +934,8 @@ void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, con
         m_mainResource->markLoadEventTime();
         if (m_timelineAgent)
             m_timelineAgent->didMarkLoadEvent();
-        if (m_remoteFrontend)
-            m_mainResource->updateScriptObject(m_remoteFrontend.get());
+        if (m_frontend)
+            m_mainResource->updateScriptObject(m_frontend.get());
     }
 }
 
@@ -982,8 +982,8 @@ void InspectorController::willSendRequest(unsigned long identifier, ResourceRequ
     resource->startTiming();
     resource->updateRequest(request);
 
-    if (resource != m_mainResource && m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (resource != m_mainResource && m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
@@ -994,8 +994,8 @@ void InspectorController::didReceiveResponse(unsigned long identifier, const Res
     if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
         resource->updateResponse(response);
 
-        if (resource != m_mainResource && m_remoteFrontend)
-            resource->updateScriptObject(m_remoteFrontend.get());
+        if (resource != m_mainResource && m_frontend)
+            resource->updateScriptObject(m_frontend.get());
     }
     if (response.httpStatusCode() >= 400) {
         // The ugly code below is due to that String::format() is not utf8-safe at the moment.
@@ -1016,8 +1016,8 @@ void InspectorController::didReceiveContentLength(unsigned long identifier, int
 
     resource->addLength(lengthReceived);
 
-    if (resource != m_mainResource && m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (resource != m_mainResource && m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::didFinishLoading(unsigned long identifier)
@@ -1035,8 +1035,8 @@ void InspectorController::didFinishLoading(unsigned long identifier)
     resource->endTiming();
 
     // No need to mute this event for main resource since it happens after did commit load.
-    if (m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& error)
@@ -1060,8 +1060,8 @@ void InspectorController::didFailLoading(unsigned long identifier, const Resourc
     resource->endTiming();
 
     // No need to mute this event for main resource since it happens after did commit load.
-    if (m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber)
@@ -1081,8 +1081,8 @@ void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identi
 
     resource->setOverrideContent(sourceString, InspectorResource::XHR);
 
-    if (m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::scriptImported(unsigned long identifier, const String& sourceString)
@@ -1096,8 +1096,8 @@ void InspectorController::scriptImported(unsigned long identifier, const String&
 
     resource->setOverrideContent(ScriptString(sourceString), InspectorResource::Script);
 
-    if (m_remoteFrontend)
-        resource->updateScriptObject(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->updateScriptObject(m_frontend.get());
 }
 
 void InspectorController::enableResourceTracking(bool always, bool reload)
@@ -1113,8 +1113,8 @@ void InspectorController::enableResourceTracking(bool always, bool reload)
 
     ASSERT(m_inspectedPage);
     m_resourceTrackingEnabled = true;
-    if (m_remoteFrontend)
-        m_remoteFrontend->resourceTrackingWasEnabled();
+    if (m_frontend)
+        m_frontend->resourceTrackingWasEnabled();
     m_client->resourceTrackingWasEnabled();
 
     if (reload)
@@ -1131,8 +1131,8 @@ void InspectorController::disableResourceTracking(bool always)
 
     ASSERT(m_inspectedPage);
     m_resourceTrackingEnabled = false;
-    if (m_remoteFrontend)
-        m_remoteFrontend->resourceTrackingWasDisabled();
+    if (m_frontend)
+        m_frontend->resourceTrackingWasDisabled();
     m_client->resourceTrackingWasDisabled();
 }
 
@@ -1160,9 +1160,9 @@ void InspectorController::startTimelineProfiler()
     if (m_timelineAgent)
         return;
 
-    m_timelineAgent = new InspectorTimelineAgent(m_remoteFrontend.get());
-    if (m_remoteFrontend)
-        m_remoteFrontend->timelineProfilerWasStarted();
+    m_timelineAgent = new InspectorTimelineAgent(m_frontend.get());
+    if (m_frontend)
+        m_frontend->timelineProfilerWasStarted();
     m_client->timelineProfilerWasStarted();
 }
 
@@ -1175,8 +1175,8 @@ void InspectorController::stopTimelineProfiler()
         return;
 
     m_timelineAgent = 0;
-    if (m_remoteFrontend)
-        m_remoteFrontend->timelineProfilerWasStopped();
+    if (m_frontend)
+        m_frontend->timelineProfilerWasStopped();
     m_client->timelineProfilerWasStopped();
 }
 
@@ -1208,14 +1208,14 @@ private:
 
 void InspectorController::postWorkerNotificationToFrontend(const InspectorWorkerResource& worker, InspectorController::WorkerAction action)
 {
-    if (!m_remoteFrontend)
+    if (!m_frontend)
         return;
     switch (action) {
     case InspectorController::WorkerCreated:
-        m_remoteFrontend->didCreateWorker(worker.id(), worker.url(), worker.isSharedWorker());
+        m_frontend->didCreateWorker(worker.id(), worker.url(), worker.isSharedWorker());
         break;
     case InspectorController::WorkerDestroyed:
-        m_remoteFrontend->didDestroyWorker(worker.id());
+        m_frontend->didDestroyWorker(worker.id());
         break;
     }
 }
@@ -1227,7 +1227,7 @@ void InspectorController::didCreateWorker(intptr_t id, const String& url, bool i
 
     RefPtr<InspectorWorkerResource> workerResource(InspectorWorkerResource::create(id, url, isSharedWorker));
     m_workers.set(id, workerResource);
-    if (m_inspectedPage && m_remoteFrontend)
+    if (m_inspectedPage && m_frontend)
         m_inspectedPage->mainFrame()->document()->postTask(PostWorkerNotificationToFrontendTask::create(workerResource, InspectorController::WorkerCreated));
 }
 
@@ -1239,7 +1239,7 @@ void InspectorController::didDestroyWorker(intptr_t id)
     WorkersMap::iterator workerResource = m_workers.find(id);
     if (workerResource == m_workers.end())
         return;
-    if (m_inspectedPage && m_remoteFrontend)
+    if (m_inspectedPage && m_frontend)
         m_inspectedPage->mainFrame()->document()->postTask(PostWorkerNotificationToFrontendTask::create(workerResource->second, InspectorController::WorkerDestroyed));
     m_workers.remove(workerResource);
 }
@@ -1248,12 +1248,12 @@ void InspectorController::didDestroyWorker(intptr_t id)
 #if ENABLE(DATABASE)
 void InspectorController::selectDatabase(Database* database)
 {
-    if (!m_remoteFrontend)
+    if (!m_frontend)
         return;
 
     for (DatabaseResourcesMap::iterator it = m_databaseResources.begin(); it != m_databaseResources.end(); ++it) {
         if (it->second->database() == database) {
-            m_remoteFrontend->selectDatabase(it->first);
+            m_frontend->selectDatabase(it->first);
             break;
         }
     }
@@ -1277,8 +1277,8 @@ void InspectorController::didOpenDatabase(PassRefPtr<Database> database, const S
     m_databaseResources.set(resource->id(), resource);
 
     // Resources are only bound while visible.
-    if (m_remoteFrontend)
-        resource->bind(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->bind(m_frontend.get());
 }
 #endif
 
@@ -1378,14 +1378,14 @@ void InspectorController::didUseDOMStorage(StorageArea* storageArea, bool isLoca
     m_domStorageResources.set(resource->id(), resource);
 
     // Resources are only bound while visible.
-    if (m_remoteFrontend)
-        resource->bind(m_remoteFrontend.get());
+    if (m_frontend)
+        resource->bind(m_frontend.get());
 }
 
 void InspectorController::selectDOMStorage(Storage* storage)
 {
     ASSERT(storage);
-    if (!m_remoteFrontend)
+    if (!m_frontend)
         return;
 
     Frame* frame = storage->frame();
@@ -1400,7 +1400,7 @@ void InspectorController::selectDOMStorage(Storage* storage)
         }
     }
     if (storageResourceId)
-        m_remoteFrontend->selectDOMStorage(storageResourceId);
+        m_frontend->selectDOMStorage(storageResourceId);
 }
 
 void InspectorController::getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries)
@@ -1520,9 +1520,9 @@ void InspectorController::enableDebuggerFromFrontend(bool always)
 
     ASSERT(m_inspectedPage);
 
-    m_debuggerAgent = InspectorDebuggerAgent::create(this, m_remoteFrontend.get());
+    m_debuggerAgent = InspectorDebuggerAgent::create(this, m_frontend.get());
 
-    m_remoteFrontend->debuggerWasEnabled();
+    m_frontend->debuggerWasEnabled();
 }
 
 void InspectorController::enableDebugger()
@@ -1533,10 +1533,10 @@ void InspectorController::enableDebugger()
     if (debuggerEnabled())
         return;
 
-    if (!m_remoteFrontend)
+    if (!m_frontend)
         m_attachDebuggerWhenShown = true;
     else {
-        m_remoteFrontend->attachDebuggerWhenShown();
+        m_frontend->attachDebuggerWhenShown();
         m_attachDebuggerWhenShown = false;
     }
 }
@@ -1555,8 +1555,8 @@ void InspectorController::disableDebugger(bool always)
 
     m_attachDebuggerWhenShown = false;
 
-    if (m_remoteFrontend)
-        m_remoteFrontend->debuggerWasDisabled();
+    if (m_frontend)
+        m_frontend->debuggerWasDisabled();
 }
 
 void InspectorController::resume()
@@ -1570,8 +1570,8 @@ void InspectorController::resume()
 
 void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
 {
-    if (m_remoteFrontend)
-        m_remoteFrontend->evaluateForTestInFrontend(callId, script);
+    if (m_frontend)
+        m_frontend->evaluateForTestInFrontend(callId, script);
     else
         m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
 }
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 4fe67ce..7cd189b 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -61,6 +61,7 @@ class InspectorCSSStore;
 class InspectorDOMStorageResource;
 class InspectorDatabaseResource;
 class InspectorDebuggerAgent;
+class InspectorFrontend;
 class InspectorFrontendClient;
 class InspectorObject;
 class InspectorProfilerAgent;
@@ -72,7 +73,6 @@ class InspectorWorkerResource;
 class KURL;
 class Node;
 class Page;
-class RemoteInspectorFrontend;
 class ResourceRequest;
 class ResourceResponse;
 class ResourceError;
@@ -209,7 +209,7 @@ public:
 
     const ResourcesMap& resources() const { return m_resources; }
     InspectorResource* resourceForURL(const String& url);
-    bool hasFrontend() const { return m_remoteFrontend; }
+    bool hasFrontend() const { return m_frontend; }
 
     void drawNodeHighlight(GraphicsContext&) const;
     void openInInspectedWindow(const String& url);
@@ -319,7 +319,7 @@ private:
     InspectorClient* m_client;
     OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
     bool m_openingFrontend;
-    OwnPtr<RemoteInspectorFrontend> m_remoteFrontend;
+    OwnPtr<InspectorFrontend> m_frontend;
     RefPtr<InspectorDOMAgent> m_domAgent;
     RefPtr<InspectorStorageAgent> m_storageAgent;
     OwnPtr<InspectorCSSStore> m_cssStore;
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 00c8bad..df2e7dc 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -54,12 +54,12 @@
 #include "FrameTree.h"
 #include "HTMLElement.h"
 #include "HTMLFrameOwnerElement.h"
+#include "InspectorFrontend.h"
 #include "MutationEvent.h"
 #include "Node.h"
 #include "NodeList.h"
 #include "Pasteboard.h"
 #include "PlatformString.h"
-#include "RemoteInspectorFrontend.h"
 #include "RenderStyle.h"
 #include "RenderStyleConstants.h"
 #include "ScriptDebugServer.h"
@@ -207,7 +207,7 @@ const int domBreakpointDerivedTypeShift = 16;
 
 InspectorDOMAgent* InspectorDOMAgent::s_domAgentOnBreakpoint = 0;
 
-InspectorDOMAgent::InspectorDOMAgent(InspectorCSSStore* cssStore, RemoteInspectorFrontend* frontend)
+InspectorDOMAgent::InspectorDOMAgent(InspectorCSSStore* cssStore, InspectorFrontend* frontend)
     : EventListener(InspectorDOMAgentType)
     , m_cssStore(cssStore)
     , m_frontend(frontend)
diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index fd8452f..c3bc0a0 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -57,7 +57,7 @@ namespace WebCore {
     class Element;
     class Event;
     class InspectorDOMAgent;
-    class RemoteInspectorFrontend;
+    class InspectorFrontend;
     class MatchJob;
     class NameNodeMap;
     class Node;
@@ -80,7 +80,7 @@ namespace WebCore {
 
     class InspectorDOMAgent : public EventListener {
     public:
-        static PassRefPtr<InspectorDOMAgent> create(InspectorCSSStore* cssStore, RemoteInspectorFrontend* frontend)
+        static PassRefPtr<InspectorDOMAgent> create(InspectorCSSStore* cssStore, InspectorFrontend* frontend)
         {
             return adoptRef(new InspectorDOMAgent(cssStore, frontend));
         }
@@ -92,7 +92,7 @@ namespace WebCore {
                 : 0;
         }
 
-        InspectorDOMAgent(InspectorCSSStore* cssStore, RemoteInspectorFrontend* frontend);
+        InspectorDOMAgent(InspectorCSSStore* cssStore, InspectorFrontend* frontend);
         ~InspectorDOMAgent();
 
         void reset();
@@ -202,7 +202,7 @@ namespace WebCore {
         void discardBindings();
 
         InspectorCSSStore* m_cssStore;
-        RemoteInspectorFrontend* m_frontend;
+        InspectorFrontend* m_frontend;
         NodeToIdMap m_documentNodeToIdMap;
         // Owns node mappings for dangling nodes.
         Vector<NodeToIdMap*> m_danglingNodeToIdMaps;
diff --git a/WebCore/inspector/InspectorDOMStorageResource.cpp b/WebCore/inspector/InspectorDOMStorageResource.cpp
index 61095a0..72b4e10 100644
--- a/WebCore/inspector/InspectorDOMStorageResource.cpp
+++ b/WebCore/inspector/InspectorDOMStorageResource.cpp
@@ -37,8 +37,8 @@
 #include "DOMWindow.h"
 #include "EventNames.h"
 #include "Frame.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
-#include "RemoteInspectorFrontend.h"
 #include "Storage.h"
 #include "StorageEvent.h"
 
@@ -64,7 +64,7 @@ bool InspectorDOMStorageResource::isSameHostAndType(Frame* frame, bool isLocalSt
     return equalIgnoringCase(m_frame->document()->securityOrigin()->host(), frame->document()->securityOrigin()->host()) && m_isLocalStorage == isLocalStorage;
 }
 
-void InspectorDOMStorageResource::bind(RemoteInspectorFrontend* frontend)
+void InspectorDOMStorageResource::bind(InspectorFrontend* frontend)
 {
     ASSERT(!m_frontend);
     m_frontend = frontend;
diff --git a/WebCore/inspector/InspectorDOMStorageResource.h b/WebCore/inspector/InspectorDOMStorageResource.h
index a47e74c..ee09974 100644
--- a/WebCore/inspector/InspectorDOMStorageResource.h
+++ b/WebCore/inspector/InspectorDOMStorageResource.h
@@ -43,7 +43,7 @@ namespace WebCore {
 
     class Storage;
     class Frame;
-    class RemoteInspectorFrontend;
+    class InspectorFrontend;
 
     class InspectorDOMStorageResource : public EventListener {
     public:
@@ -56,7 +56,7 @@ namespace WebCore {
             return listener->type() == InspectorDOMStorageResourceType ? static_cast<const InspectorDOMStorageResource*>(listener) : 0;
         }
 
-        void bind(RemoteInspectorFrontend* frontend);
+        void bind(InspectorFrontend* frontend);
         void unbind();
         void startReportingChangesToFrontend();
 
@@ -74,7 +74,7 @@ namespace WebCore {
         RefPtr<Storage> m_domStorage;
         bool m_isLocalStorage;
         RefPtr<Frame> m_frame;
-        RemoteInspectorFrontend* m_frontend;
+        InspectorFrontend* m_frontend;
         int m_id;
         bool m_reportingChangesToFrontend;
 
diff --git a/WebCore/inspector/InspectorDatabaseResource.cpp b/WebCore/inspector/InspectorDatabaseResource.cpp
index 036148f..ba67818 100644
--- a/WebCore/inspector/InspectorDatabaseResource.cpp
+++ b/WebCore/inspector/InspectorDatabaseResource.cpp
@@ -33,8 +33,8 @@
 
 #if ENABLE(DATABASE) && ENABLE(INSPECTOR)
 #include "Database.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
-#include "RemoteInspectorFrontend.h"
 
 namespace WebCore {
 
@@ -55,7 +55,7 @@ InspectorDatabaseResource::InspectorDatabaseResource(PassRefPtr<Database> databa
 {
 }
 
-void InspectorDatabaseResource::bind(RemoteInspectorFrontend* frontend)
+void InspectorDatabaseResource::bind(InspectorFrontend* frontend)
 {
     if (m_scriptObjectCreated)
         return;
diff --git a/WebCore/inspector/InspectorDatabaseResource.h b/WebCore/inspector/InspectorDatabaseResource.h
index 8e0e1b3..203995b 100644
--- a/WebCore/inspector/InspectorDatabaseResource.h
+++ b/WebCore/inspector/InspectorDatabaseResource.h
@@ -39,13 +39,13 @@
 
 namespace WebCore {
 class Database;
-class RemoteInspectorFrontend;
+class InspectorFrontend;
 
 class InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
 public:
     static PassRefPtr<InspectorDatabaseResource> create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version);
 
-    void bind(RemoteInspectorFrontend* frontend);
+    void bind(InspectorFrontend* frontend);
     void unbind();
     Database* database() { return m_database.get(); }
     long id() const { return m_id; }
diff --git a/WebCore/inspector/InspectorDebuggerAgent.cpp b/WebCore/inspector/InspectorDebuggerAgent.cpp
index e1c0dc0..43f2596 100644
--- a/WebCore/inspector/InspectorDebuggerAgent.cpp
+++ b/WebCore/inspector/InspectorDebuggerAgent.cpp
@@ -33,9 +33,9 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 #include "InjectedScript.h"
 #include "InjectedScriptHost.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
 #include "PlatformString.h"
-#include "RemoteInspectorFrontend.h"
 #include "ScriptDebugServer.h"
 #include <wtf/MD5.h>
 
@@ -46,17 +46,17 @@ static String formatBreakpointId(const String& sourceID, unsigned lineNumber)
     return String::format("%s:%d", sourceID.utf8().data(), lineNumber);
 }
 
-PassOwnPtr<InspectorDebuggerAgent> InspectorDebuggerAgent::create(InspectorController* inspectorController, RemoteInspectorFrontend* remoteFrontend)
+PassOwnPtr<InspectorDebuggerAgent> InspectorDebuggerAgent::create(InspectorController* inspectorController, InspectorFrontend* frontend)
 {
-    OwnPtr<InspectorDebuggerAgent> agent = adoptPtr(new InspectorDebuggerAgent(inspectorController, remoteFrontend));
+    OwnPtr<InspectorDebuggerAgent> agent = adoptPtr(new InspectorDebuggerAgent(inspectorController, frontend));
     ScriptDebugServer::shared().clearBreakpoints();
     ScriptDebugServer::shared().addListener(agent.get(), inspectorController->inspectedPage());
     return agent.release();
 }
 
-InspectorDebuggerAgent::InspectorDebuggerAgent(InspectorController* inspectorController, RemoteInspectorFrontend* remoteFrontend)
+InspectorDebuggerAgent::InspectorDebuggerAgent(InspectorController* inspectorController, InspectorFrontend* frontend)
     : m_inspectorController(inspectorController)
-    , m_remoteFrontend(remoteFrontend)
+    , m_frontend(frontend)
     , m_pausedScriptState(0)
     , m_breakpointsLoaded(false)
 {
@@ -167,7 +167,7 @@ void InspectorDebuggerAgent::stepOutOfFunction()
 void InspectorDebuggerAgent::setPauseOnExceptionsState(long pauseState)
 {
     ScriptDebugServer::shared().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
-    m_remoteFrontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
+    m_frontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
 }
 
 void InspectorDebuggerAgent::clearForPageNavigation()
@@ -246,7 +246,7 @@ void InspectorDebuggerAgent::saveBreakpoints()
 void InspectorDebuggerAgent::didParseSource(const String& sourceID, const String& url, const String& data, int firstLine, ScriptWorldType worldType)
 {
     // Don't send script content to the front end until it's really needed.
-    m_remoteFrontend->parsedScriptSource(sourceID, url, "", firstLine, worldType);
+    m_frontend->parsedScriptSource(sourceID, url, "", firstLine, worldType);
 
     m_scriptIDToContent.set(sourceID, data);
 
@@ -264,7 +264,7 @@ void InspectorDebuggerAgent::didParseSource(const String& sourceID, const String
             bool success = ScriptDebugServer::shared().setBreakpoint(sourceID, breakpointIt->second, lineNumber, &actualLineNumber);
             if (!success)
                 continue;
-            m_remoteFrontend->restoredBreakpoint(sourceID, url, actualLineNumber, breakpointIt->second.enabled, breakpointIt->second.condition);
+            m_frontend->restoredBreakpoint(sourceID, url, actualLineNumber, breakpointIt->second.enabled, breakpointIt->second.condition);
             String breakpointId = formatBreakpointId(sourceID, actualLineNumber);
             m_breakpointsMapping.set(breakpointId, lineNumber);
         }
@@ -274,7 +274,7 @@ void InspectorDebuggerAgent::didParseSource(const String& sourceID, const String
 
 void InspectorDebuggerAgent::failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage)
 {
-    m_remoteFrontend->failedToParseScriptSource(url, data, firstLine, errorLine, errorMessage);
+    m_frontend->failedToParseScriptSource(url, data, firstLine, errorLine, errorMessage);
 }
 
 void InspectorDebuggerAgent::didPause(ScriptState* scriptState)
@@ -282,13 +282,13 @@ void InspectorDebuggerAgent::didPause(ScriptState* scriptState)
     ASSERT(scriptState && !m_pausedScriptState);
     m_pausedScriptState = scriptState;
     RefPtr<InspectorValue> callFrames = currentCallFrames();
-    m_remoteFrontend->pausedScript(callFrames.get());
+    m_frontend->pausedScript(callFrames.get());
 }
 
 void InspectorDebuggerAgent::didContinue()
 {
     m_pausedScriptState = 0;
-    m_remoteFrontend->resumedScript();
+    m_frontend->resumedScript();
 }
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorDebuggerAgent.h b/WebCore/inspector/InspectorDebuggerAgent.h
index 2cfbf55..91bcd49 100644
--- a/WebCore/inspector/InspectorDebuggerAgent.h
+++ b/WebCore/inspector/InspectorDebuggerAgent.h
@@ -42,12 +42,12 @@
 namespace WebCore {
 class InjectedScriptHost;
 class InspectorController;
+class InspectorFrontend;
 class InspectorValue;
-class RemoteInspectorFrontend;
 
 class InspectorDebuggerAgent : public ScriptDebugListener, public Noncopyable {
 public:
-    static PassOwnPtr<InspectorDebuggerAgent> create(InspectorController*, RemoteInspectorFrontend*);
+    static PassOwnPtr<InspectorDebuggerAgent> create(InspectorController*, InspectorFrontend*);
     virtual ~InspectorDebuggerAgent();
 
     static bool isDebuggerAlwaysEnabled();
@@ -73,7 +73,7 @@ public:
     static String md5Base16(const String& string);
 
 private:
-    InspectorDebuggerAgent(InspectorController*, RemoteInspectorFrontend*);
+    InspectorDebuggerAgent(InspectorController*, InspectorFrontend*);
 
     PassRefPtr<InspectorValue> currentCallFrames();
 
@@ -86,7 +86,7 @@ private:
     virtual void didContinue();
 
     InspectorController* m_inspectorController;
-    RemoteInspectorFrontend* m_remoteFrontend;
+    InspectorFrontend* m_frontend;
     ScriptState* m_pausedScriptState;
     HashMap<String, String> m_sourceIDToURL;
     HashMap<String, String> m_scriptIDToContent;
diff --git a/WebCore/inspector/InspectorProfilerAgent.cpp b/WebCore/inspector/InspectorProfilerAgent.cpp
index 5db3caa..a73469a 100644
--- a/WebCore/inspector/InspectorProfilerAgent.cpp
+++ b/WebCore/inspector/InspectorProfilerAgent.cpp
@@ -34,10 +34,10 @@
 
 #include "Console.h"
 #include "InspectorController.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
 #include "KURL.h"
 #include "Page.h"
-#include "RemoteInspectorFrontend.h"
 #include "ScriptDebugServer.h"
 #include "ScriptProfile.h"
 #include "ScriptProfiler.h"
@@ -60,7 +60,7 @@ PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InspectorContr
 
 InspectorProfilerAgent::InspectorProfilerAgent(InspectorController* inspectorController)
     : m_inspectorController(inspectorController)
-    , m_remoteFrontend(0)
+    , m_frontend(0)
     , m_enabled(ScriptProfiler::isProfilerAlwaysEnabled())
     , m_recordingUserInitiatedProfile(false)
     , m_currentUserInitiatedProfileNumber(-1)
@@ -76,8 +76,8 @@ void InspectorProfilerAgent::addProfile(PassRefPtr<ScriptProfile> prpProfile, un
 {
     RefPtr<ScriptProfile> profile = prpProfile;
     m_profiles.add(profile->uid(), profile);
-    if (m_remoteFrontend)
-        m_remoteFrontend->addProfileHeader(createProfileHeader(*profile));
+    if (m_frontend)
+        m_frontend->addProfileHeader(createProfileHeader(*profile));
     addProfileFinishedMessageToConsole(profile, lineNumber, sourceURL);
 }
 
@@ -110,8 +110,8 @@ void InspectorProfilerAgent::disable()
         return;
     m_enabled = false;
     ScriptDebugServer::shared().recompileAllJSFunctionsSoon();
-    if (m_remoteFrontend)
-        m_remoteFrontend->profilerWasDisabled();
+    if (m_frontend)
+        m_frontend->profilerWasDisabled();
 }
 
 void InspectorProfilerAgent::enable(bool skipRecompile)
@@ -121,8 +121,8 @@ void InspectorProfilerAgent::enable(bool skipRecompile)
     m_enabled = true;
     if (!skipRecompile)
         ScriptDebugServer::shared().recompileAllJSFunctionsSoon();
-    if (m_remoteFrontend)
-        m_remoteFrontend->profilerWasEnabled();
+    if (m_frontend)
+        m_frontend->profilerWasEnabled();
 }
 
 String InspectorProfilerAgent::getCurrentUserInitiatedProfileName(bool incrementProfileNumber)
@@ -160,8 +160,8 @@ void InspectorProfilerAgent::resetState()
     m_profiles.clear();
     m_currentUserInitiatedProfileNumber = 1;
     m_nextUserInitiatedProfileNumber = 1;
-    if (m_remoteFrontend)
-        m_remoteFrontend->resetProfilesPanel();
+    if (m_frontend)
+        m_frontend->resetProfilesPanel();
 }
 
 void InspectorProfilerAgent::startUserInitiatedProfiling()
@@ -201,8 +201,8 @@ void InspectorProfilerAgent::stopUserInitiatedProfiling()
 
 void InspectorProfilerAgent::toggleRecordButton(bool isProfiling)
 {
-    if (m_remoteFrontend)
-        m_remoteFrontend->setRecordingProfile(isProfiling);
+    if (m_frontend)
+        m_frontend->setRecordingProfile(isProfiling);
 }
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorProfilerAgent.h b/WebCore/inspector/InspectorProfilerAgent.h
index 818377e..9593eba 100644
--- a/WebCore/inspector/InspectorProfilerAgent.h
+++ b/WebCore/inspector/InspectorProfilerAgent.h
@@ -42,9 +42,9 @@ namespace WebCore {
 
 class InspectorArray;
 class InspectorController;
+class InspectorFrontend;
 class InspectorObject;
 class ScriptProfile;
-class RemoteInspectorFrontend;
 
 class InspectorProfilerAgent : public Noncopyable {
 public:
@@ -64,7 +64,7 @@ public:
     bool isRecordingUserInitiatedProfile() { return m_recordingUserInitiatedProfile; }
     void removeProfile(unsigned uid);
     void resetState();
-    void setRemoteFrontend(RemoteInspectorFrontend* frontend) { m_remoteFrontend = frontend; }
+    void setFrontend(InspectorFrontend* frontend) { m_frontend = frontend; }
     void startProfiling() { startUserInitiatedProfiling(); }
     void startUserInitiatedProfiling();
     void stopProfiling() { stopUserInitiatedProfiling(); }
@@ -78,7 +78,7 @@ private:
     PassRefPtr<InspectorObject> createProfileHeader(const ScriptProfile& profile);
 
     InspectorController* m_inspectorController;
-    RemoteInspectorFrontend* m_remoteFrontend;
+    InspectorFrontend* m_frontend;
     bool m_enabled;
     bool m_recordingUserInitiatedProfile;
     int m_currentUserInitiatedProfileNumber;
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index a2b55b0..ed07339 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -38,8 +38,8 @@
 #include "DocLoader.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
-#include "RemoteInspectorFrontend.h"
 #include "ResourceLoadTiming.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
@@ -175,7 +175,7 @@ static PassRefPtr<InspectorObject> buildObjectForTiming(ResourceLoadTiming* timi
 }
 
 
-void InspectorResource::updateScriptObject(RemoteInspectorFrontend* frontend)
+void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
 {
     if (m_changes.hasChange(NoChange))
         return;
@@ -251,7 +251,7 @@ void InspectorResource::updateScriptObject(RemoteInspectorFrontend* frontend)
     m_changes.clearAll();
 }
 
-void InspectorResource::releaseScriptObject(RemoteInspectorFrontend* frontend)
+void InspectorResource::releaseScriptObject(InspectorFrontend* frontend)
 {
     m_changes.setAll();
 
diff --git a/WebCore/inspector/InspectorResource.h b/WebCore/inspector/InspectorResource.h
index 4c12ea0..4004142 100644
--- a/WebCore/inspector/InspectorResource.h
+++ b/WebCore/inspector/InspectorResource.h
@@ -46,7 +46,7 @@ namespace WebCore {
     class CachedResource;
     class DocumentLoader;
     class Frame;
-    class RemoteInspectorFrontend;
+    class InspectorFrontend;
     class ResourceLoadTiming;
     class ResourceRequest;
     class ResourceResponse;
@@ -76,8 +76,8 @@ namespace WebCore {
         ~InspectorResource();
 
         PassRefPtr<InspectorResource> appendRedirect(unsigned long identifier, const KURL& redirectURL);
-        void updateScriptObject(RemoteInspectorFrontend* frontend);
-        void releaseScriptObject(RemoteInspectorFrontend* frontend);
+        void updateScriptObject(InspectorFrontend* frontend);
+        void releaseScriptObject(InspectorFrontend* frontend);
 
         void updateRequest(const ResourceRequest&);
         void updateResponse(const ResourceResponse&);
diff --git a/WebCore/inspector/InspectorStorageAgent.cpp b/WebCore/inspector/InspectorStorageAgent.cpp
index 66d3372..1f565fa 100644
--- a/WebCore/inspector/InspectorStorageAgent.cpp
+++ b/WebCore/inspector/InspectorStorageAgent.cpp
@@ -34,6 +34,7 @@
 
 #include "Database.h"
 #include "ExceptionCode.h"
+#include "InspectorFrontend.h"
 #include "InspectorValues.h"
 #include "SQLError.h"
 #include "SQLStatementCallback.h"
@@ -43,7 +44,6 @@
 #include "SQLTransactionCallback.h"
 #include "SQLTransactionErrorCallback.h"
 #include "SQLValue.h"
-#include "RemoteInspectorFrontend.h"
 #include "VoidCallback.h"
 
 #include <wtf/Vector.h>
@@ -200,7 +200,7 @@ private:
 
 } // namespace
 
-InspectorStorageAgent::InspectorStorageAgent(RemoteInspectorFrontend* frontend)
+InspectorStorageAgent::InspectorStorageAgent(InspectorFrontend* frontend)
     : m_frontend(frontend)
 {
 }
diff --git a/WebCore/inspector/InspectorStorageAgent.h b/WebCore/inspector/InspectorStorageAgent.h
index b47e0d3..b1ceee4 100644
--- a/WebCore/inspector/InspectorStorageAgent.h
+++ b/WebCore/inspector/InspectorStorageAgent.h
@@ -35,11 +35,11 @@
 namespace WebCore {
 
 class Database;
-class RemoteInspectorFrontend;
+class InspectorFrontend;
 
 class InspectorStorageAgent : public RefCounted<InspectorStorageAgent> {
 public:
-    static PassRefPtr<InspectorStorageAgent> create(RemoteInspectorFrontend* frontend)
+    static PassRefPtr<InspectorStorageAgent> create(InspectorFrontend* frontend)
     {
         return adoptRef(new InspectorStorageAgent(frontend));
     }
@@ -48,13 +48,13 @@ public:
 
     long executeSQL(Database*, const String& query);
 
-    RemoteInspectorFrontend* frontend() { return m_frontend; }
+    InspectorFrontend* frontend() { return m_frontend; }
     void clearFrontend();
 
 private:
-    InspectorStorageAgent(RemoteInspectorFrontend*);
+    InspectorStorageAgent(InspectorFrontend*);
 
-    RemoteInspectorFrontend* m_frontend;
+    InspectorFrontend* m_frontend;
 };
 
 } // namespace WebCore
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp
index aa42a54..fbb17c4 100644
--- a/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -34,8 +34,8 @@
 #if ENABLE(INSPECTOR)
 
 #include "Event.h"
+#include "InspectorFrontend.h"
 #include "IntRect.h"
-#include "RemoteInspectorFrontend.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "TimelineRecordFactory.h"
@@ -46,7 +46,7 @@ namespace WebCore {
 
 int InspectorTimelineAgent::s_instanceCount = 0;
 
-InspectorTimelineAgent::InspectorTimelineAgent(RemoteInspectorFrontend* frontend)
+InspectorTimelineAgent::InspectorTimelineAgent(InspectorFrontend* frontend)
     : m_frontend(frontend)
 {
     ++s_instanceCount;
@@ -279,7 +279,7 @@ void InspectorTimelineAgent::reset()
     m_recordStack.clear();
 }
 
-void InspectorTimelineAgent::resetFrontendProxyObject(RemoteInspectorFrontend* frontend)
+void InspectorTimelineAgent::resetFrontendProxyObject(InspectorFrontend* frontend)
 {
     ASSERT(frontend);
     reset();
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index 16d7b83..6b3324b 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -42,7 +42,7 @@
 
 namespace WebCore {
 class Event;
-class RemoteInspectorFrontend;
+class InspectorFrontend;
 class IntRect;
 class ResourceRequest;
 class ResourceResponse;
@@ -74,11 +74,11 @@ enum TimelineRecordType {
 
 class InspectorTimelineAgent : ScriptGCEventListener, public Noncopyable {
 public:
-    InspectorTimelineAgent(RemoteInspectorFrontend* frontend);
+    InspectorTimelineAgent(InspectorFrontend* frontend);
     ~InspectorTimelineAgent();
 
     void reset();
-    void resetFrontendProxyObject(RemoteInspectorFrontend*);
+    void resetFrontendProxyObject(InspectorFrontend*);
 
     // Methods called from WebCore.
     void willCallFunction(const String& scriptName, int scriptLine);
@@ -152,7 +152,7 @@ private:
 
     void pushGCEventRecords();
 
-    RemoteInspectorFrontend* m_frontend;
+    InspectorFrontend* m_frontend;
 
     Vector<TimelineRecordEntry> m_recordStack;
     static int s_instanceCount;

-- 
WebKit Debian packaging