Changeset 65891 in webkit


Ignore:
Timestamp:
Aug 24, 2010 5:26:55 AM (14 years ago)
Author:
loislo@chromium.org
Message:

2010-08-24 Ilya Tikhonovsky <​loislo@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:
Location:
trunk/WebCore
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r65889 r65891  
     12010-08-24  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        WebInspector: RemoteInspectorFrontend can be renamed to InspectorFrontend.
     6        The old version of InspectorFrontend was removed some time ago and now
     7        it is possible to rename the new version of inspector frontend class to its
     8        original name.
     9        https://bugs.webkit.org/show_bug.cgi?id=44499
     10
     11        * GNUmakefile.am:
     12        * WebCore.gyp/WebCore.gyp:
     13        * WebCore.pri:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * inspector/CodeGeneratorInspector.pm:
     17        * inspector/ConsoleMessage.cpp:
     18        (WebCore::ConsoleMessage::addToFrontend):
     19        (WebCore::ConsoleMessage::updateRepeatCountInConsole):
     20        * inspector/ConsoleMessage.h:
     21        * inspector/InjectedScriptHost.cpp:
     22        (WebCore::InjectedScriptHost::pushNodePathToFrontend):
     23        (WebCore::InjectedScriptHost::frontend):
     24        * inspector/InjectedScriptHost.h:
     25        * inspector/InspectorApplicationCacheAgent.cpp:
     26        (WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
     27        * inspector/InspectorApplicationCacheAgent.h:
     28        * inspector/InspectorBackend.cpp:
     29        (WebCore::InspectorBackend::dispatchOnInjectedScript):
     30        (WebCore::InspectorBackend::frontend):
     31        * inspector/InspectorBackend.h:
     32        * inspector/InspectorCSSStore.cpp:
     33        * inspector/InspectorCSSStore.h:
     34        * inspector/InspectorController.cpp:
     35        (WebCore::InspectorController::inspectedPageDestroyed):
     36        (WebCore::InspectorController::inspect):
     37        (WebCore::InspectorController::focusNode):
     38        (WebCore::InspectorController::windowVisible):
     39        (WebCore::InspectorController::addConsoleMessage):
     40        (WebCore::InspectorController::clearConsoleMessages):
     41        (WebCore::InspectorController::inspectedWindowScriptObjectCleared):
     42        (WebCore::InspectorController::setSearchingForNode):
     43        (WebCore::InspectorController::setMonitoringXHR):
     44        (WebCore::InspectorController::connectFrontend):
     45        (WebCore::InspectorController::show):
     46        (WebCore::InspectorController::showPanel):
     47        (WebCore::InspectorController::close):
     48        (WebCore::InspectorController::disconnectFrontend):
     49        (WebCore::InspectorController::populateScriptObjects):
     50        (WebCore::InspectorController::pruneResources):
     51        (WebCore::InspectorController::didCommitLoad):
     52        (WebCore::InspectorController::didLoadResourceFromMemoryCache):
     53        (WebCore::InspectorController::identifierForInitialRequest):
     54        (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
     55        (WebCore::InspectorController::mainResourceFiredLoadEvent):
     56        (WebCore::InspectorController::willSendRequest):
     57        (WebCore::InspectorController::didReceiveResponse):
     58        (WebCore::InspectorController::didReceiveContentLength):
     59        (WebCore::InspectorController::didFinishLoading):
     60        (WebCore::InspectorController::didFailLoading):
     61        (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
     62        (WebCore::InspectorController::scriptImported):
     63        (WebCore::InspectorController::enableResourceTracking):
     64        (WebCore::InspectorController::disableResourceTracking):
     65        (WebCore::InspectorController::startTimelineProfiler):
     66        (WebCore::InspectorController::stopTimelineProfiler):
     67        (WebCore::InspectorController::postWorkerNotificationToFrontend):
     68        (WebCore::InspectorController::didCreateWorker):
     69        (WebCore::InspectorController::didDestroyWorker):
     70        (WebCore::InspectorController::selectDatabase):
     71        (WebCore::InspectorController::didOpenDatabase):
     72        (WebCore::InspectorController::didUseDOMStorage):
     73        (WebCore::InspectorController::selectDOMStorage):
     74        (WebCore::InspectorController::enableDebuggerFromFrontend):
     75        (WebCore::InspectorController::enableDebugger):
     76        (WebCore::InspectorController::disableDebugger):
     77        (WebCore::InspectorController::evaluateForTestInFrontend):
     78        * inspector/InspectorController.h:
     79        (WebCore::InspectorController::hasFrontend):
     80        * inspector/InspectorDOMAgent.cpp:
     81        (WebCore::InspectorDOMAgent::InspectorDOMAgent):
     82        * inspector/InspectorDOMAgent.h:
     83        (WebCore::InspectorDOMAgent::create):
     84        * inspector/InspectorDOMStorageResource.cpp:
     85        (WebCore::InspectorDOMStorageResource::bind):
     86        * inspector/InspectorDOMStorageResource.h:
     87        * inspector/InspectorDatabaseResource.cpp:
     88        (WebCore::InspectorDatabaseResource::bind):
     89        * inspector/InspectorDatabaseResource.h:
     90        * inspector/InspectorDebuggerAgent.cpp:
     91        (WebCore::InspectorDebuggerAgent::create):
     92        (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
     93        (WebCore::InspectorDebuggerAgent::setPauseOnExceptionsState):
     94        (WebCore::InspectorDebuggerAgent::didParseSource):
     95        (WebCore::InspectorDebuggerAgent::failedToParseSource):
     96        (WebCore::InspectorDebuggerAgent::didPause):
     97        (WebCore::InspectorDebuggerAgent::didContinue):
     98        * inspector/InspectorDebuggerAgent.h:
     99        * inspector/InspectorProfilerAgent.cpp:
     100        (WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
     101        (WebCore::InspectorProfilerAgent::addProfile):
     102        (WebCore::InspectorProfilerAgent::disable):
     103        (WebCore::InspectorProfilerAgent::enable):
     104        (WebCore::InspectorProfilerAgent::resetState):
     105        (WebCore::InspectorProfilerAgent::toggleRecordButton):
     106        * inspector/InspectorProfilerAgent.h:
     107        (WebCore::InspectorProfilerAgent::setFrontend):
     108        * inspector/InspectorResource.cpp:
     109        (WebCore::InspectorResource::updateScriptObject):
     110        (WebCore::InspectorResource::releaseScriptObject):
     111        * inspector/InspectorResource.h:
     112        * inspector/InspectorStorageAgent.cpp:
     113        (WebCore::InspectorStorageAgent::InspectorStorageAgent):
     114        * inspector/InspectorStorageAgent.h:
     115        (WebCore::InspectorStorageAgent::create):
     116        (WebCore::InspectorStorageAgent::frontend):
     117        * inspector/InspectorTimelineAgent.cpp:
     118        (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
     119        (WebCore::InspectorTimelineAgent::resetFrontendProxyObject):
     120        * inspector/InspectorTimelineAgent.h:
     121
    11222010-08-24  Nikolas Zimmermann  <nzimmermann@rim.com>
    2123

  • trunk/WebCore/GNUmakefile.am

    r65827 r65891  
    9999        DerivedSources/WebCore/InspectorBackendDispatcher.cpp \
    100100        DerivedSources/WebCore/InspectorBackendDispatcher.h \
     101        DerivedSources/WebCore/InspectorFrontend.cpp \
     102        DerivedSources/WebCore/InspectorFrontend.h \
    101103        DerivedSources/WebCore/JSAbstractWorker.cpp \
    102104        DerivedSources/WebCore/JSAbstractWorker.h \
    … …  
    552554        DerivedSources/WebCore/JSXSLTProcessor.cpp \
    553555        DerivedSources/WebCore/JSXSLTProcessor.h \
    554         DerivedSources/WebCore/RemoteInspectorFrontend.cpp \
    555         DerivedSources/WebCore/RemoteInspectorFrontend.h \
    556556        DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
    557557        DerivedSources/WebCore/UserAgentStyleSheets.h \
    … …  
    45394539
    45404540# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
    4541 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
     4541DerivedSources/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
    45424542        $(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 $<
    45434543

  • trunk/WebCore/WebCore.gyp/WebCore.gyp

    r65608 r65891  
    288288            '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
    289289            '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorBackendDispatcher.h',
    290             '<(SHARED_INTERMEDIATE_DIR)/webcore/RemoteInspectorFrontend.cpp',
    291             '<(SHARED_INTERMEDIATE_DIR)/webkit/RemoteInspectorFrontend.h',
     290            '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp',
     291            '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorFrontend.h',
    292292          ],
    293293          'variables': {
    … …  
    758758
    759759        # Additional .cpp files from the webcore_inspector_sources list.
    760         '<(SHARED_INTERMEDIATE_DIR)/webcore/RemoteInspectorFrontend.cpp',
     760        '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorFrontend.cpp',
    761761        '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
    762762      ],

  • trunk/WebCore/WebCore.pri

    r65656 r65891  
    556556
    557557# GENERATOR 2: inspector idl compiler
    558 inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/Remote${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp
     558inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp
    559559inspectorIDL.input = INSPECTOR_INTERFACES
    560560inspectorIDL.wkScript = $$PWD/bindings/scripts/generate-bindings.pl

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r65827 r65891  
    554554                        </File>
    555555                        <File
     556                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorFrontend.cpp"
     557                                >
     558                        </File>
     559                        <File
     560                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorFrontend.h"
     561                                >
     562                        </File>
     563                        <File
    556564                                RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSAbstractWorker.cpp"
    557565                                >
    … …  
    2147521483                        <File
    2147621484                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\MathMLNames.h"
    21477                                 >
    21478                         </File>
    21479                         <File
    21480                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RemoteInspectorFrontend.cpp"
    21481                                 >
    21482                         </File>
    21483                         <File
    21484                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RemoteInspectorFrontend.h"
    2148521485                                >
    2148621486                        </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r65827 r65891  
    10721072                4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */; };
    10731073                4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F3289B411A42AAB005ABE7E /* InspectorValues.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1074                 4F4F5FFB11CBD2E100A186BF /* RemoteInspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* RemoteInspectorFrontend.cpp */; };
     1074                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */; };
    10751075                4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */; };
    10761076                4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */; };
    … …  
    69516951                4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorValues.cpp; sourceTree = "<group>"; };
    69526952                4F3289B411A42AAB005ABE7E /* InspectorValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorValues.h; sourceTree = "<group>"; };
    6953                 4F4F5FFA11CBD2D200A186BF /* RemoteInspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteInspectorFrontend.cpp; sourceTree = "<group>"; };
    6954                 4F4F5FFC11CBD30100A186BF /* RemoteInspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorFrontend.h; sourceTree = "<group>"; };
     6953                4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
     6954                4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
    69556955                4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackendDispatcher.cpp; sourceTree = "<group>"; };
    69566956                4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackendDispatcher.h; sourceTree = "<group>"; };
    … …  
    1175811758                                4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */,
    1175911759                                4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */,
     11760                                4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */,
     11761                                4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */,
    1176011762                                7A0E76D810BF059800A0276E /* JSInjectedScriptHost.cpp */,
    1176111763                                7A0E76D910BF059800A0276E /* JSInjectedScriptHost.h */,
    … …  
    1176811770                                9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */,
    1176911771                                9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */,
    11770                                 4F4F5FFA11CBD2D200A186BF /* RemoteInspectorFrontend.cpp */,
    11771                                 4F4F5FFC11CBD30100A186BF /* RemoteInspectorFrontend.h */,
    1177211772                        );
    1177311773                        name = Inspector;
    … …  
    2145821458                                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
    2145921459                                41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
     21460                                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
    2146021461                                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
    2146121462                                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
    … …  
    2215222153                                85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
    2215322154                                B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */,
    22154                                 4F4F5FFB11CBD2E100A186BF /* RemoteInspectorFrontend.cpp in Sources */,
    2215522155                                93309E00099E64920056E581 /* RemoveCSSPropertyCommand.cpp in Sources */,
    2215622156                                D06C0D900CFD11460065F43F /* RemoveFormatCommand.cpp in Sources */,

  • trunk/WebCore/inspector/CodeGeneratorInspector.pm

    r65809 r65891  
    4545};
    4646$typeTransform{"Frontend"} = {
    47     "forward" => "RemoteInspectorFrontend",
    48     "header" => "RemoteInspectorFrontend.h",
     47    "forward" => "InspectorFrontend",
     48    "header" => "InspectorFrontend.h",
    4949};
    5050$typeTransform{"PassRefPtr"} = {
    … …  
    201201    my $className = $interface->name;
    202202
    203     $frontendClassName = "Remote" . $className . "Frontend";
     203    $frontendClassName = $className . "Frontend";
    204204    $frontendConstructor = "    ${frontendClassName}(InspectorClient* inspectorClient) : m_inspectorClient(inspectorClient) { }";
    205205    $frontendFooter = "    InspectorClient* m_inspectorClient;";

  • trunk/WebCore/inspector/ConsoleMessage.cpp

    r65506 r65891  
    3939
    4040#if ENABLE(INSPECTOR)
    41 #include "RemoteInspectorFrontend.h"
     41#include "InspectorFrontend.h"
    4242#endif
    4343
    … …  
    115115
    116116#if ENABLE(INSPECTOR)
    117 void ConsoleMessage::addToFrontend(RemoteInspectorFrontend* frontend, InjectedScriptHost* injectedScriptHost)
     117void ConsoleMessage::addToFrontend(InspectorFrontend* frontend, InjectedScriptHost* injectedScriptHost)
    118118{
    119119    RefPtr<InspectorObject> jsonObj = InspectorObject::create();
    … …  
    150150}
    151151
    152 void ConsoleMessage::updateRepeatCountInConsole(RemoteInspectorFrontend* frontend)
     152void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend* frontend)
    153153{
    154154    frontend->updateConsoleMessageRepeatCount(m_repeatCount);

  • trunk/WebCore/inspector/ConsoleMessage.h

    r64722 r65891  
    4040namespace WebCore {
    4141class InjectedScriptHost;
     42class InspectorFrontend;
    4243class InspectorObject;
    43 class RemoteInspectorFrontend;
    4444class ScriptCallFrame;
    4545class ScriptCallStack;
    … …  
    5252
    5353#if ENABLE(INSPECTOR)
    54     void addToFrontend(RemoteInspectorFrontend*, InjectedScriptHost*);
    55     void updateRepeatCountInConsole(RemoteInspectorFrontend* frontend);
     54    void addToFrontend(InspectorFrontend*, InjectedScriptHost*);
     55    void updateRepeatCountInConsole(InspectorFrontend* frontend);
    5656#endif
    5757    void incrementCount() { ++m_repeatCount; }

  • trunk/WebCore/inspector/InjectedScriptHost.cpp

    r65730 r65891  
    4343#include "InspectorController.h"
    4444#include "InspectorDOMAgent.h"
     45#include "InspectorFrontend.h"
    4546#include "InspectorResource.h"
    4647#include "Pasteboard.h"
    47 #include "RemoteInspectorFrontend.h"
    4848
    4949#if ENABLE(JAVASCRIPT_DEBUGGER)
    … …  
    9999long InjectedScriptHost::pushNodePathToFrontend(Node* node, bool withChildren, bool selectInUI)
    100100{
    101     RemoteInspectorFrontend* frontend = remoteFrontend();
    102101    InspectorDOMAgent* domAgent = inspectorDOMAgent();
    103     if (!domAgent || !frontend)
     102    if (!domAgent || !frontend())
    104103        return 0;
    105104    long id = domAgent->pushNodePathToFrontend(node);
    … …  
    107106        domAgent->pushChildNodesToFrontend(id);
    108107    if (selectInUI)
    109         frontend->updateFocusedNode(id);
     108        frontend()->updateFocusedNode(id);
    110109    return id;
    111110}
    … …  
    176175}
    177176
    178 RemoteInspectorFrontend* InjectedScriptHost::remoteFrontend()
     177InspectorFrontend* InjectedScriptHost::frontend()
    179178{
    180179    if (!m_inspectorController)
    181180        return 0;
    182     return m_inspectorController->m_remoteFrontend.get();
     181    return m_inspectorController->m_frontend.get();
    183182}
    184183

  • trunk/WebCore/inspector/InjectedScriptHost.h

    r65730 r65891  
    4444class InjectedScript;
    4545class InspectorDOMAgent;
     46class InspectorFrontend;
    4647class Node;
    47 class RemoteInspectorFrontend;
    4848class ScriptObject;
    4949class Storage;
    … …  
    9696    InjectedScriptHost(InspectorController* inspectorController);
    9797    InspectorDOMAgent* inspectorDOMAgent();
    98     RemoteInspectorFrontend* remoteFrontend();
     98    InspectorFrontend* frontend();
    9999    ScriptObject createInjectedScript(const String& source, ScriptState* scriptState, long id);
    100100    void discardInjectedScript(ScriptState*);

  • trunk/WebCore/inspector/InspectorApplicationCacheAgent.cpp

    r65320 r65891  
    3434#include "FrameLoader.h"
    3535#include "InspectorController.h"
     36#include "InspectorFrontend.h"
    3637#include "InspectorValues.h"
    3738#include "Page.h"
    38 #include "RemoteInspectorFrontend.h"
    3939#include "ResourceResponse.h"
    4040
    4141namespace WebCore {
    4242
    43 InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorController* inspectorController, RemoteInspectorFrontend* frontend)
     43InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorController* inspectorController, InspectorFrontend* frontend)
    4444    : m_inspectorController(inspectorController)
    4545    , m_frontend(frontend)

  • trunk/WebCore/inspector/InspectorApplicationCacheAgent.h

    r64986 r65891  
    3636class InspectorArray;
    3737class InspectorController;
     38class InspectorFrontend;
    3839class InspectorObject;
    3940class InspectorValue;
    40 class RemoteInspectorFrontend;
    4141class ResourceResponse;
    4242
    4343class InspectorApplicationCacheAgent : public Noncopyable {
    4444public:
    45     InspectorApplicationCacheAgent(InspectorController* inspectorController, RemoteInspectorFrontend* frontend);
     45    InspectorApplicationCacheAgent(InspectorController* inspectorController, InspectorFrontend* frontend);
    4646    ~InspectorApplicationCacheAgent() { }
    4747
    … …  
    6060
    6161    InspectorController* m_inspectorController;
    62     RemoteInspectorFrontend* m_frontend;
     62    InspectorFrontend* m_frontend;
    6363};
    6464

  • trunk/WebCore/inspector/InspectorBackend.cpp

    r65412 r65891  
    4141#include "InspectorController.h"
    4242#include "InspectorDOMAgent.h"
     43#include "InspectorFrontend.h"
    4344#include "InspectorStorageAgent.h"
    44 #include "RemoteInspectorFrontend.h"
    4545#include "ScriptBreakpoint.h"
    4646#include "ScriptProfiler.h"
    … …  
    8989void InspectorBackend::dispatchOnInjectedScript(long injectedScriptId, const String& methodName, const String& arguments, RefPtr<InspectorValue>* result, bool* hadException)
    9090{
    91     if (!remoteFrontend())
     91    if (!frontend())
    9292        return;
    9393
    … …  
    138138#endif
    139139
    140 RemoteInspectorFrontend* InspectorBackend::remoteFrontend()
     140InspectorFrontend* InspectorBackend::frontend()
    141141{
    142     return m_inspectorController->m_remoteFrontend.get();
     142    return m_inspectorController->m_frontend.get();
    143143}
    144144

  • trunk/WebCore/inspector/InspectorBackend.h

    r65412 r65891  
    4141class InspectorDOMAgent;
    4242class InspectorFrontend;
    43 class RemoteInspectorFrontend;
    4443
    4544class InspectorBackend : public RefCounted<InspectorBackend>
    … …  
    7978private:
    8079    InspectorBackend(InspectorController* inspectorController);
    81     RemoteInspectorFrontend* remoteFrontend();
     80    InspectorFrontend* frontend();
    8281
    8382    InspectorController* m_inspectorController;

  • trunk/WebCore/inspector/InspectorCSSStore.cpp

    r64770 r65891  
    4242#include "InspectorResource.h"
    4343#include "PlatformString.h"
    44 #include "RemoteInspectorFrontend.h"
    4544#include "StyleSheetList.h"
    4645

  • trunk/WebCore/inspector/InspectorCSSStore.h

    r65077 r65891  
    3939class Document;
    4040class InspectorController;
    41 class InspectorFrontend;
    4241class CSSMutableStyleDeclaration;
    4342class CSSStyleDeclaration;

  • trunk/WebCore/inspector/InspectorController.cpp

    r65870 r65891  
    6060#include "InspectorCSSStore.h"
    6161#include "InspectorClient.h"
     62#include "InspectorFrontend.h"
    6263#include "InspectorFrontendClient.h"
    6364#include "InspectorDOMStorageResource.h"
    … …  
    7374#include "ProgressTracker.h"
    7475#include "Range.h"
    75 #include "RemoteInspectorFrontend.h"
    7676#include "RenderInline.h"
    7777#include "ResourceRequest.h"
    … …  
    198198void InspectorController::inspectedPageDestroyed()
    199199{
    200     if (m_remoteFrontend)
    201         m_remoteFrontend->inspectedPageDestroyed();
     200    if (m_frontend)
     201        m_frontend->inspectedPageDestroyed();
    202202
    203203    hideHighlight();
    … …  
    259259    m_nodeToFocus = node;
    260260
    261     if (!m_remoteFrontend) {
     261    if (!m_frontend) {
    262262        m_showAfterVisible = ElementsPanel;
    263263        return;
    … …  
    272272        return;
    273273
    274     ASSERT(m_remoteFrontend);
     274    ASSERT(m_frontend);
    275275    ASSERT(m_nodeToFocus);
    276276
    277277    long id = m_domAgent->pushNodePathToFrontend(m_nodeToFocus.get());
    278     m_remoteFrontend->updateFocusedNode(id);
     278    m_frontend->updateFocusedNode(id);
    279279    m_nodeToFocus = 0;
    280280}
    … …  
    306306bool InspectorController::windowVisible()
    307307{
    308     return m_remoteFrontend;
     308    return m_frontend;
    309309}
    310310
    … …  
    333333    if (m_previousMessage && m_previousMessage->isEqual(scriptState, consoleMessage.get())) {
    334334        m_previousMessage->incrementCount();
    335         if (m_remoteFrontend)
    336             m_previousMessage->updateRepeatCountInConsole(m_remoteFrontend.get());
     335        if (m_frontend)
     336            m_previousMessage->updateRepeatCountInConsole(m_frontend.get());
    337337    } else {
    338338        m_previousMessage = consoleMessage.get();
    339339        m_consoleMessages.append(consoleMessage);
    340         if (m_remoteFrontend)
    341             m_previousMessage->addToFrontend(m_remoteFrontend.get(), m_injectedScriptHost.get());
    342     }
    343 
    344     if (!m_remoteFrontend && m_consoleMessages.size() >= maximumConsoleMessages) {
     340        if (m_frontend)
     341            m_previousMessage->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
     342    }
     343
     344    if (!m_frontend && m_consoleMessages.size() >= maximumConsoleMessages) {
    345345        m_expiredConsoleMessageCount += expireConsoleMessagesStep;
    346346        m_consoleMessages.remove(0, expireConsoleMessagesStep);
    … …  
    357357    if (m_domAgent)
    358358        m_domAgent->releaseDanglingNodes();
    359     if (m_remoteFrontend)
    360         m_remoteFrontend->consoleMessagesCleared();
     359    if (m_frontend)
     360        m_frontend->consoleMessagesCleared();
    361361}
    362362
    … …  
    429429
    430430    if (enabled()) {
    431         if (m_remoteFrontend && frame == m_inspectedPage->mainFrame())
     431        if (m_frontend && frame == m_inspectedPage->mainFrame())
    432432            m_injectedScriptHost->discardInjectedScripts();
    433433        if (m_scriptsToEvaluateOnLoad.size()) {
    … …  
    450450    if (!m_searchingForNode)
    451451        hideHighlight();
    452     if (m_remoteFrontend) {
     452    if (m_frontend) {
    453453        if (enabled)
    454             m_remoteFrontend->searchingForNodeWasEnabled();
     454            m_frontend->searchingForNodeWasEnabled();
    455455        else
    456             m_remoteFrontend->searchingForNodeWasDisabled();
     456            m_frontend->searchingForNodeWasDisabled();
    457457    }
    458458}
    … …  
    464464    m_monitoringXHR = enabled;
    465465    setSetting(monitoringXHRSettingName, enabled ? "true" : "false");
    466     if (m_remoteFrontend) {
     466    if (m_frontend) {
    467467        if (enabled)
    468             m_remoteFrontend->monitoringXHRWasEnabled();
     468            m_frontend->monitoringXHRWasEnabled();
    469469        else
    470             m_remoteFrontend->monitoringXHRWasDisabled();
     470            m_frontend->monitoringXHRWasDisabled();
    471471    }
    472472}
    … …  
    476476    m_openingFrontend = false;
    477477    releaseFrontendLifetimeAgents();
    478     m_remoteFrontend = new RemoteInspectorFrontend(m_client);
    479     m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_remoteFrontend.get());
     478    m_frontend = new InspectorFrontend(m_client);
     479    m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_frontend.get());
    480480
    481481#if ENABLE(DATABASE)
    482     m_storageAgent = InspectorStorageAgent::create(m_remoteFrontend.get());
     482    m_storageAgent = InspectorStorageAgent::create(m_frontend.get());
    483483#endif
    484484
    485485    if (m_timelineAgent)
    486         m_timelineAgent->resetFrontendProxyObject(m_remoteFrontend.get());
     486        m_timelineAgent->resetFrontendProxyObject(m_frontend.get());
    487487
    488488    // Initialize Web Inspector title.
    489     m_remoteFrontend->inspectedURLChanged(m_inspectedPage->mainFrame()->loader()->url().string());
     489    m_frontend->inspectedURLChanged(m_inspectedPage->mainFrame()->loader()->url().string());
    490490
    491491    populateScriptObjects();
    … …  
    501501            enableDebugger();
    502502    }
    503     m_profilerAgent->setRemoteFrontend(m_remoteFrontend.get());
     503    m_profilerAgent->setFrontend(m_frontend.get());
    504504    if (!ScriptProfiler::isProfilerAlwaysEnabled()) {
    505505        String profilerEnabledSetting = setting(profilerEnabledSettingName);
    … …  
    517517
    518518#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    519     m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_remoteFrontend.get());
     519    m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend.get());
    520520#endif
    521521
    … …  
    533533        return;
    534534
    535     if (m_remoteFrontend)
    536         m_remoteFrontend->bringToFront();
     535    if (m_frontend)
     536        m_frontend->bringToFront();
    537537    else {
    538538        m_openingFrontend = true;
    … …  
    548548    show();
    549549
    550     if (!m_remoteFrontend) {
     550    if (!m_frontend) {
    551551        m_showAfterVisible = panel;
    552552        return;
    … …  
    556556        return;
    557557
    558     m_remoteFrontend->showPanel(panel);
     558    m_frontend->showPanel(panel);
    559559}
    560560
    561561void InspectorController::close()
    562562{
    563     if (!m_remoteFrontend)
    564         return;
    565     m_remoteFrontend->close();
     563    if (!m_frontend)
     564        return;
     565    m_frontend->close();
    566566}
    567567
    568568void InspectorController::disconnectFrontend()
    569569{
    570     if (!m_remoteFrontend)
    571         return;
    572     m_remoteFrontend.clear();
     570    if (!m_frontend)
     571        return;
     572    m_frontend.clear();
    573573
    574574    connectedFrontendCount--;
    … …  
    593593
    594594#if ENABLE(JAVASCRIPT_DEBUGGER)
    595     m_profilerAgent->setRemoteFrontend(0);
     595    m_profilerAgent->setFrontend(0);
    596596    m_profilerAgent->stopUserInitiatedProfiling();
    597597#endif
    … …  
    622622void InspectorController::populateScriptObjects()
    623623{
    624     ASSERT(m_remoteFrontend);
    625     if (!m_remoteFrontend)
    626         return;
    627 
    628     m_remoteFrontend->populateApplicationSettings(setting(frontendSettingsSettingName()));
     624    ASSERT(m_frontend);
     625    if (!m_frontend)
     626        return;
     627
     628    m_frontend->populateApplicationSettings(setting(frontendSettingsSettingName()));
    629629
    630630    if (m_resourceTrackingEnabled)
    631         m_remoteFrontend->resourceTrackingWasEnabled();
     631        m_frontend->resourceTrackingWasEnabled();
    632632
    633633    if (m_searchingForNode)
    634         m_remoteFrontend->searchingForNodeWasEnabled();
     634        m_frontend->searchingForNodeWasEnabled();
    635635
    636636    if (m_monitoringXHR)
    637         m_remoteFrontend->monitoringXHRWasEnabled();
     637        m_frontend->monitoringXHRWasEnabled();
    638638
    639639#if ENABLE(JAVASCRIPT_DEBUGGER)
    640640    if (m_profilerAgent->enabled())
    641         m_remoteFrontend->profilerWasEnabled();
     641        m_frontend->profilerWasEnabled();
    642642#endif
    643643
    644644    ResourcesMap::iterator resourcesEnd = m_resources.end();
    645645    for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
    646         it->second->updateScriptObject(m_remoteFrontend.get());
     646        it->second->updateScriptObject(m_frontend.get());
    647647
    648648    m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
    649649
    650650    if (m_expiredConsoleMessageCount)
    651         m_remoteFrontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     651        m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
    652652    unsigned messageCount = m_consoleMessages.size();
    653653    for (unsigned i = 0; i < messageCount; ++i)
    654         m_consoleMessages[i]->addToFrontend(m_remoteFrontend.get(), m_injectedScriptHost.get());
     654        m_consoleMessages[i]->addToFrontend(m_frontend.get(), m_injectedScriptHost.get());
    655655
    656656#if ENABLE(JAVASCRIPT_DEBUGGER)
    657657    if (debuggerEnabled())
    658         m_remoteFrontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
     658        m_frontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
    659659#endif
    660660#if ENABLE(DATABASE)
    661661    DatabaseResourcesMap::iterator databasesEnd = m_databaseResources.end();
    662662    for (DatabaseResourcesMap::iterator it = m_databaseResources.begin(); it != databasesEnd; ++it)
    663         it->second->bind(m_remoteFrontend.get());
     663        it->second->bind(m_frontend.get());
    664664#endif
    665665#if ENABLE(DOM_STORAGE)
    666666    DOMStorageResourcesMap::iterator domStorageEnd = m_domStorageResources.end();
    667667    for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it)
    668         it->second->bind(m_remoteFrontend.get());
     668        it->second->bind(m_frontend.get());
    669669#endif
    670670#if ENABLE(WORKERS)
    … …  
    672672    for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it) {
    673673        InspectorWorkerResource* worker = it->second.get();
    674         m_remoteFrontend->didCreateWorker(worker->id(), worker->url(), worker->isSharedWorker());
    675     }
    676 #endif
    677 
    678     m_remoteFrontend->populateSessionSettings(m_sessionSettings->toJSONString());
    679     m_remoteFrontend->populateInterface();
     674        m_frontend->didCreateWorker(worker->id(), worker->url(), worker->isSharedWorker());
     675    }
     676#endif
     677
     678    m_frontend->populateSessionSettings(m_sessionSettings->toJSONString());
     679    m_frontend->populateInterface();
    680680
    681681    // Dispatch pending frontend commands
    682682    for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); it != m_pendingEvaluateTestCommands.end(); ++it)
    683         m_remoteFrontend->evaluateForTestInFrontend((*it).first, (*it).second);
     683        m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
    684684    m_pendingEvaluateTestCommands.clear();
    685685}
    … …  
    718718        if (!loaderToKeep || !resource->isSameLoader(loaderToKeep)) {
    719719            removeResource(resource);
    720             if (m_remoteFrontend)
    721                 resource->releaseScriptObject(m_remoteFrontend.get());
     720            if (m_frontend)
     721                resource->releaseScriptObject(m_frontend.get());
    722722        }
    723723    }
    … …  
    732732
    733733    if (loader->frame() == m_inspectedPage->mainFrame()) {
    734         if (m_remoteFrontend)
    735             m_remoteFrontend->inspectedURLChanged(loader->url().string());
     734        if (m_frontend)
     735            m_frontend->inspectedURLChanged(loader->url().string());
    736736
    737737        m_injectedScriptHost->discardInjectedScripts();
    … …  
    753753        m_cssStore->reset();
    754754        m_sessionSettings = InspectorObject::create();
    755         if (m_remoteFrontend) {
    756             m_remoteFrontend->reset();
     755        if (m_frontend) {
     756            m_frontend->reset();
    757757            m_domAgent->reset();
    758758        }
    … …  
    767767#endif
    768768
    769         if (m_remoteFrontend) {
     769        if (m_frontend) {
    770770            if (!loader->frameLoader()->isLoadingFromCachedPage()) {
    771771                ASSERT(m_mainResource && m_mainResource->isSameLoader(loader));
    … …  
    773773                // needed to keep the load for a user-entered URL from showing up in the
    774774                // list of resources for the page they are navigating away from.
    775                 m_mainResource->updateScriptObject(m_remoteFrontend.get());
     775                m_mainResource->updateScriptObject(m_frontend.get());
    776776            } else {
    777777                // Pages loaded from the page cache are committed before
    … …  
    781781                m_mainResource = 0;
    782782            }
    783             m_remoteFrontend->didCommitLoad();
     783            m_frontend->didCommitLoad();
    784784            m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
    785785        }
    … …  
    884884    addResource(resource.get());
    885885
    886     if (m_remoteFrontend)
    887         resource->updateScriptObject(m_remoteFrontend.get());
     886    if (m_frontend)
     887        resource->updateScriptObject(m_frontend.get());
    888888}
    889889
    … …  
    908908    addResource(resource.get());
    909909
    910     if (m_remoteFrontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
    911         resource->updateScriptObject(m_remoteFrontend.get());
     910    if (m_frontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
     911        resource->updateScriptObject(m_frontend.get());
    912912}
    913913
    … …  
    921921        if (m_timelineAgent)
    922922            m_timelineAgent->didMarkDOMContentEvent();
    923         if (m_remoteFrontend)
    924             m_mainResource->updateScriptObject(m_remoteFrontend.get());
     923        if (m_frontend)
     924            m_mainResource->updateScriptObject(m_frontend.get());
    925925    }
    926926}
    … …  
    935935        if (m_timelineAgent)
    936936            m_timelineAgent->didMarkLoadEvent();
    937         if (m_remoteFrontend)
    938             m_mainResource->updateScriptObject(m_remoteFrontend.get());
     937        if (m_frontend)
     938            m_mainResource->updateScriptObject(m_frontend.get());
    939939    }
    940940}
    … …  
    983983    resource->updateRequest(request);
    984984
    985     if (resource != m_mainResource && m_remoteFrontend)
    986         resource->updateScriptObject(m_remoteFrontend.get());
     985    if (resource != m_mainResource && m_frontend)
     986        resource->updateScriptObject(m_frontend.get());
    987987}
    988988
    … …  
    995995        resource->updateResponse(response);
    996996
    997         if (resource != m_mainResource && m_remoteFrontend)
    998             resource->updateScriptObject(m_remoteFrontend.get());
     997        if (resource != m_mainResource && m_frontend)
     998            resource->updateScriptObject(m_frontend.get());
    999999    }
    10001000    if (response.httpStatusCode() >= 400) {
    … …  
    10171017    resource->addLength(lengthReceived);
    10181018
    1019     if (resource != m_mainResource && m_remoteFrontend)
    1020         resource->updateScriptObject(m_remoteFrontend.get());
     1019    if (resource != m_mainResource && m_frontend)
     1020        resource->updateScriptObject(m_frontend.get());
    10211021}
    10221022
    … …  
    10361036
    10371037    // No need to mute this event for main resource since it happens after did commit load.
    1038     if (m_remoteFrontend)
    1039         resource->updateScriptObject(m_remoteFrontend.get());
     1038    if (m_frontend)
     1039        resource->updateScriptObject(m_frontend.get());
    10401040}
    10411041
    … …  
    10611061
    10621062    // No need to mute this event for main resource since it happens after did commit load.
    1063     if (m_remoteFrontend)
    1064         resource->updateScriptObject(m_remoteFrontend.get());
     1063    if (m_frontend)
     1064        resource->updateScriptObject(m_frontend.get());
    10651065}
    10661066
    … …  
    10821082    resource->setOverrideContent(sourceString, InspectorResource::XHR);
    10831083
    1084     if (m_remoteFrontend)
    1085         resource->updateScriptObject(m_remoteFrontend.get());
     1084    if (m_frontend)
     1085        resource->updateScriptObject(m_frontend.get());
    10861086}
    10871087
    … …  
    10971097    resource->setOverrideContent(ScriptString(sourceString), InspectorResource::Script);
    10981098
    1099     if (m_remoteFrontend)
    1100         resource->updateScriptObject(m_remoteFrontend.get());
     1099    if (m_frontend)
     1100        resource->updateScriptObject(m_frontend.get());
    11011101}
    11021102
    … …  
    11141114    ASSERT(m_inspectedPage);
    11151115    m_resourceTrackingEnabled = true;
    1116     if (m_remoteFrontend)
    1117         m_remoteFrontend->resourceTrackingWasEnabled();
     1116    if (m_frontend)
     1117        m_frontend->resourceTrackingWasEnabled();
    11181118    m_client->resourceTrackingWasEnabled();
    11191119
    … …  
    11321132    ASSERT(m_inspectedPage);
    11331133    m_resourceTrackingEnabled = false;
    1134     if (m_remoteFrontend)
    1135         m_remoteFrontend->resourceTrackingWasDisabled();
     1134    if (m_frontend)
     1135        m_frontend->resourceTrackingWasDisabled();
    11361136    m_client->resourceTrackingWasDisabled();
    11371137}
    … …  
    11611161        return;
    11621162
    1163     m_timelineAgent = new InspectorTimelineAgent(m_remoteFrontend.get());
    1164     if (m_remoteFrontend)
    1165         m_remoteFrontend->timelineProfilerWasStarted();
     1163    m_timelineAgent = new InspectorTimelineAgent(m_frontend.get());
     1164    if (m_frontend)
     1165        m_frontend->timelineProfilerWasStarted();
    11661166    m_client->timelineProfilerWasStarted();
    11671167}
    … …  
    11761176
    11771177    m_timelineAgent = 0;
    1178     if (m_remoteFrontend)
    1179         m_remoteFrontend->timelineProfilerWasStopped();
     1178    if (m_frontend)
     1179        m_frontend->timelineProfilerWasStopped();
    11801180    m_client->timelineProfilerWasStopped();
    11811181}
    … …  
    12091209void InspectorController::postWorkerNotificationToFrontend(const InspectorWorkerResource& worker, InspectorController::WorkerAction action)
    12101210{
    1211     if (!m_remoteFrontend)
     1211    if (!m_frontend)
    12121212        return;
    12131213    switch (action) {
    12141214    case InspectorController::WorkerCreated:
    1215         m_remoteFrontend->didCreateWorker(worker.id(), worker.url(), worker.isSharedWorker());
     1215        m_frontend->didCreateWorker(worker.id(), worker.url(), worker.isSharedWorker());
    12161216        break;
    12171217    case InspectorController::WorkerDestroyed:
    1218         m_remoteFrontend->didDestroyWorker(worker.id());
     1218        m_frontend->didDestroyWorker(worker.id());
    12191219        break;
    12201220    }
    … …  
    12281228    RefPtr<InspectorWorkerResource> workerResource(InspectorWorkerResource::create(id, url, isSharedWorker));
    12291229    m_workers.set(id, workerResource);
    1230     if (m_inspectedPage && m_remoteFrontend)
     1230    if (m_inspectedPage && m_frontend)
    12311231        m_inspectedPage->mainFrame()->document()->postTask(PostWorkerNotificationToFrontendTask::create(workerResource, InspectorController::WorkerCreated));
    12321232}
    … …  
    12401240    if (workerResource == m_workers.end())
    12411241        return;
    1242     if (m_inspectedPage && m_remoteFrontend)
     1242    if (m_inspectedPage && m_frontend)
    12431243        m_inspectedPage->mainFrame()->document()->postTask(PostWorkerNotificationToFrontendTask::create(workerResource->second, InspectorController::WorkerDestroyed));
    12441244    m_workers.remove(workerResource);
    … …  
    12491249void InspectorController::selectDatabase(Database* database)
    12501250{
    1251     if (!m_remoteFrontend)
     1251    if (!m_frontend)
    12521252        return;
    12531253
    12541254    for (DatabaseResourcesMap::iterator it = m_databaseResources.begin(); it != m_databaseResources.end(); ++it) {
    12551255        if (it->second->database() == database) {
    1256             m_remoteFrontend->selectDatabase(it->first);
     1256            m_frontend->selectDatabase(it->first);
    12571257            break;
    12581258        }
    … …  
    12781278
    12791279    // Resources are only bound while visible.
    1280     if (m_remoteFrontend)
    1281         resource->bind(m_remoteFrontend.get());
     1280    if (m_frontend)
     1281        resource->bind(m_frontend.get());
    12821282}
    12831283#endif
    … …  
    13791379
    13801380    // Resources are only bound while visible.
    1381     if (m_remoteFrontend)
    1382         resource->bind(m_remoteFrontend.get());
     1381    if (m_frontend)
     1382        resource->bind(m_frontend.get());
    13831383}
    13841384
    … …  
    13861386{
    13871387    ASSERT(storage);
    1388     if (!m_remoteFrontend)
     1388    if (!m_frontend)
    13891389        return;
    13901390
    … …  
    14011401    }
    14021402    if (storageResourceId)
    1403         m_remoteFrontend->selectDOMStorage(storageResourceId);
     1403        m_frontend->selectDOMStorage(storageResourceId);
    14041404}
    14051405
    … …  
    15211521    ASSERT(m_inspectedPage);
    15221522
    1523     m_debuggerAgent = InspectorDebuggerAgent::create(this, m_remoteFrontend.get());
    1524 
    1525     m_remoteFrontend->debuggerWasEnabled();
     1523    m_debuggerAgent = InspectorDebuggerAgent::create(this, m_frontend.get());
     1524
     1525    m_frontend->debuggerWasEnabled();
    15261526}
    15271527
    … …  
    15341534        return;
    15351535
    1536     if (!m_remoteFrontend)
     1536    if (!m_frontend)
    15371537        m_attachDebuggerWhenShown = true;
    15381538    else {
    1539         m_remoteFrontend->attachDebuggerWhenShown();
     1539        m_frontend->attachDebuggerWhenShown();
    15401540        m_attachDebuggerWhenShown = false;
    15411541    }
    … …  
    15561556    m_attachDebuggerWhenShown = false;
    15571557
    1558     if (m_remoteFrontend)
    1559         m_remoteFrontend->debuggerWasDisabled();
     1558    if (m_frontend)
     1559        m_frontend->debuggerWasDisabled();
    15601560}
    15611561
    … …  
    15711571void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
    15721572{
    1573     if (m_remoteFrontend)
    1574         m_remoteFrontend->evaluateForTestInFrontend(callId, script);
     1573    if (m_frontend)
     1574        m_frontend->evaluateForTestInFrontend(callId, script);
    15751575    else
    15761576        m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));

  • trunk/WebCore/inspector/InspectorController.h

    r65870 r65891  
    6262class InspectorDatabaseResource;
    6363class InspectorDebuggerAgent;
     64class InspectorFrontend;
    6465class InspectorFrontendClient;
    6566class InspectorObject;
    … …  
    7374class Node;
    7475class Page;
    75 class RemoteInspectorFrontend;
    7676class ResourceRequest;
    7777class ResourceResponse;
    … …  
    210210    const ResourcesMap& resources() const { return m_resources; }
    211211    InspectorResource* resourceForURL(const String& url);
    212     bool hasFrontend() const { return m_remoteFrontend; }
     212    bool hasFrontend() const { return m_frontend; }
    213213
    214214    void drawNodeHighlight(GraphicsContext&) const;
    … …  
    320320    OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
    321321    bool m_openingFrontend;
    322     OwnPtr<RemoteInspectorFrontend> m_remoteFrontend;
     322    OwnPtr<InspectorFrontend> m_frontend;
    323323    RefPtr<InspectorDOMAgent> m_domAgent;
    324324    RefPtr<InspectorStorageAgent> m_storageAgent;

  • trunk/WebCore/inspector/InspectorDOMAgent.cpp

    r65887 r65891  
    5555#include "HTMLElement.h"
    5656#include "HTMLFrameOwnerElement.h"
     57#include "InspectorFrontend.h"
    5758#include "MutationEvent.h"
    5859#include "Node.h"
    … …  
    6061#include "Pasteboard.h"
    6162#include "PlatformString.h"
    62 #include "RemoteInspectorFrontend.h"
    6363#include "RenderStyle.h"
    6464#include "RenderStyleConstants.h"
    … …  
    208208InspectorDOMAgent* InspectorDOMAgent::s_domAgentOnBreakpoint = 0;
    209209
    210 InspectorDOMAgent::InspectorDOMAgent(InspectorCSSStore* cssStore, RemoteInspectorFrontend* frontend)
     210InspectorDOMAgent::InspectorDOMAgent(InspectorCSSStore* cssStore, InspectorFrontend* frontend)
    211211    : EventListener(InspectorDOMAgentType)
    212212    , m_cssStore(cssStore)

  • trunk/WebCore/inspector/InspectorDOMAgent.h

    r65731 r65891  
    5858    class Event;
    5959    class InspectorDOMAgent;
    60     class RemoteInspectorFrontend;
     60    class InspectorFrontend;
    6161    class MatchJob;
    6262    class NameNodeMap;
    … …  
    8181    class InspectorDOMAgent : public EventListener {
    8282    public:
    83         static PassRefPtr<InspectorDOMAgent> create(InspectorCSSStore* cssStore, RemoteInspectorFrontend* frontend)
     83        static PassRefPtr<InspectorDOMAgent> create(InspectorCSSStore* cssStore, InspectorFrontend* frontend)
    8484        {
    8585            return adoptRef(new InspectorDOMAgent(cssStore, frontend));
    … …  
    9393        }
    9494
    95         InspectorDOMAgent(InspectorCSSStore* cssStore, RemoteInspectorFrontend* frontend);
     95        InspectorDOMAgent(InspectorCSSStore* cssStore, InspectorFrontend* frontend);
    9696        ~InspectorDOMAgent();
    9797
    … …  
    203203
    204204        InspectorCSSStore* m_cssStore;
    205         RemoteInspectorFrontend* m_frontend;
     205        InspectorFrontend* m_frontend;
    206206        NodeToIdMap m_documentNodeToIdMap;
    207207        // Owns node mappings for dangling nodes.

  • trunk/WebCore/inspector/InspectorDOMStorageResource.cpp

    r64713 r65891  
    3838#include "EventNames.h"
    3939#include "Frame.h"
     40#include "InspectorFrontend.h"
    4041#include "InspectorValues.h"
    41 #include "RemoteInspectorFrontend.h"
    4242#include "Storage.h"
    4343#include "StorageEvent.h"
    … …  
    6565}
    6666
    67 void InspectorDOMStorageResource::bind(RemoteInspectorFrontend* frontend)
     67void InspectorDOMStorageResource::bind(InspectorFrontend* frontend)
    6868{
    6969    ASSERT(!m_frontend);

  • trunk/WebCore/inspector/InspectorDOMStorageResource.h

    r64713 r65891  
    4444    class Storage;
    4545    class Frame;
    46     class RemoteInspectorFrontend;
     46    class InspectorFrontend;
    4747
    4848    class InspectorDOMStorageResource : public EventListener {
    … …  
    5757        }
    5858
    59         void bind(RemoteInspectorFrontend* frontend);
     59        void bind(InspectorFrontend* frontend);
    6060        void unbind();
    6161        void startReportingChangesToFrontend();
    … …  
    7575        bool m_isLocalStorage;
    7676        RefPtr<Frame> m_frame;
    77         RemoteInspectorFrontend* m_frontend;
     77        InspectorFrontend* m_frontend;
    7878        int m_id;
    7979        bool m_reportingChangesToFrontend;

  • trunk/WebCore/inspector/InspectorDatabaseResource.cpp

    r64650 r65891  
    3434#if ENABLE(DATABASE) && ENABLE(INSPECTOR)
    3535#include "Database.h"
     36#include "InspectorFrontend.h"
    3637#include "InspectorValues.h"
    37 #include "RemoteInspectorFrontend.h"
    3838
    3939namespace WebCore {
    … …  
    5656}
    5757
    58 void InspectorDatabaseResource::bind(RemoteInspectorFrontend* frontend)
     58void InspectorDatabaseResource::bind(InspectorFrontend* frontend)
    5959{
    6060    if (m_scriptObjectCreated)

  • trunk/WebCore/inspector/InspectorDatabaseResource.h

    r64650 r65891  
    4040namespace WebCore {
    4141class Database;
    42 class RemoteInspectorFrontend;
     42class InspectorFrontend;
    4343
    4444class InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
    … …  
    4646    static PassRefPtr<InspectorDatabaseResource> create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version);
    4747
    48     void bind(RemoteInspectorFrontend* frontend);
     48    void bind(InspectorFrontend* frontend);
    4949    void unbind();
    5050    Database* database() { return m_database.get(); }

  • trunk/WebCore/inspector/InspectorDebuggerAgent.cpp

    r65320 r65891  
    3434#include "InjectedScript.h"
    3535#include "InjectedScriptHost.h"
     36#include "InspectorFrontend.h"
    3637#include "InspectorValues.h"
    3738#include "PlatformString.h"
    38 #include "RemoteInspectorFrontend.h"
    3939#include "ScriptDebugServer.h"
    4040#include <wtf/MD5.h>
    … …  
    4747}
    4848
    49 PassOwnPtr<InspectorDebuggerAgent> InspectorDebuggerAgent::create(InspectorController* inspectorController, RemoteInspectorFrontend* remoteFrontend)
    50 {
    51     OwnPtr<InspectorDebuggerAgent> agent = adoptPtr(new InspectorDebuggerAgent(inspectorController, remoteFrontend));
     49PassOwnPtr<InspectorDebuggerAgent> InspectorDebuggerAgent::create(InspectorController* inspectorController, InspectorFrontend* frontend)
     50{
     51    OwnPtr<InspectorDebuggerAgent> agent = adoptPtr(new InspectorDebuggerAgent(inspectorController, frontend));
    5252    ScriptDebugServer::shared().clearBreakpoints();
    5353    ScriptDebugServer::shared().addListener(agent.get(), inspectorController->inspectedPage());
    … …  
    5555}
    5656
    57 InspectorDebuggerAgent::InspectorDebuggerAgent(InspectorController* inspectorController, RemoteInspectorFrontend* remoteFrontend)
     57InspectorDebuggerAgent::InspectorDebuggerAgent(InspectorController* inspectorController, InspectorFrontend* frontend)
    5858    : m_inspectorController(inspectorController)
    59     , m_remoteFrontend(remoteFrontend)
     59    , m_frontend(frontend)
    6060    , m_pausedScriptState(0)
    6161    , m_breakpointsLoaded(false)
    … …  
    168168{
    169169    ScriptDebugServer::shared().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
    170     m_remoteFrontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
     170    m_frontend->updatePauseOnExceptionsState(ScriptDebugServer::shared().pauseOnExceptionsState());
    171171}
    172172
    … …  
    247247{
    248248    // Don't send script content to the front end until it's really needed.
    249     m_remoteFrontend->parsedScriptSource(sourceID, url, "", firstLine, worldType);
     249    m_frontend->parsedScriptSource(sourceID, url, "", firstLine, worldType);
    250250
    251251    m_scriptIDToContent.set(sourceID, data);
    … …  
    265265            if (!success)
    266266                continue;
    267             m_remoteFrontend->restoredBreakpoint(sourceID, url, actualLineNumber, breakpointIt->second.enabled, breakpointIt->second.condition);
     267            m_frontend->restoredBreakpoint(sourceID, url, actualLineNumber, breakpointIt->second.enabled, breakpointIt->second.condition);
    268268            String breakpointId = formatBreakpointId(sourceID, actualLineNumber);
    269269            m_breakpointsMapping.set(breakpointId, lineNumber);
    … …  
    275275void InspectorDebuggerAgent::failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage)
    276276{
    277     m_remoteFrontend->failedToParseScriptSource(url, data, firstLine, errorLine, errorMessage);
     277    m_frontend->failedToParseScriptSource(url, data, firstLine, errorLine, errorMessage);
    278278}
    279279
    … …  
    283283    m_pausedScriptState = scriptState;
    284284    RefPtr<InspectorValue> callFrames = currentCallFrames();
    285     m_remoteFrontend->pausedScript(callFrames.get());
     285    m_frontend->pausedScript(callFrames.get());
    286286}
    287287
    … …  
    289289{
    290290    m_pausedScriptState = 0;
    291     m_remoteFrontend->resumedScript();
     291    m_frontend->resumedScript();
    292292}
    293293

  • trunk/WebCore/inspector/InspectorDebuggerAgent.h

    r65077 r65891  
    4343class InjectedScriptHost;
    4444class InspectorController;
     45class InspectorFrontend;
    4546class InspectorValue;
    46 class RemoteInspectorFrontend;
    4747
    4848class InspectorDebuggerAgent : public ScriptDebugListener, public Noncopyable {
    4949public:
    50     static PassOwnPtr<InspectorDebuggerAgent> create(InspectorController*, RemoteInspectorFrontend*);
     50    static PassOwnPtr<InspectorDebuggerAgent> create(InspectorController*, InspectorFrontend*);
    5151    virtual ~InspectorDebuggerAgent();
    5252
    … …  
    7474
    7575private:
    76     InspectorDebuggerAgent(InspectorController*, RemoteInspectorFrontend*);
     76    InspectorDebuggerAgent(InspectorController*, InspectorFrontend*);
    7777
    7878    PassRefPtr<InspectorValue> currentCallFrames();
    … …  
    8787
    8888    InspectorController* m_inspectorController;
    89     RemoteInspectorFrontend* m_remoteFrontend;
     89    InspectorFrontend* m_frontend;
    9090    ScriptState* m_pausedScriptState;
    9191    HashMap<String, String> m_sourceIDToURL;

  • trunk/WebCore/inspector/InspectorProfilerAgent.cpp

    r65797 r65891  
    3535#include "Console.h"
    3636#include "InspectorController.h"
     37#include "InspectorFrontend.h"
    3738#include "InspectorValues.h"
    3839#include "KURL.h"
    3940#include "Page.h"
    40 #include "RemoteInspectorFrontend.h"
    4141#include "ScriptDebugServer.h"
    4242#include "ScriptProfile.h"
    … …  
    6161InspectorProfilerAgent::InspectorProfilerAgent(InspectorController* inspectorController)
    6262    : m_inspectorController(inspectorController)
    63     , m_remoteFrontend(0)
     63    , m_frontend(0)
    6464    , m_enabled(ScriptProfiler::isProfilerAlwaysEnabled())
    6565    , m_recordingUserInitiatedProfile(false)
    … …  
    7777    RefPtr<ScriptProfile> profile = prpProfile;
    7878    m_profiles.add(profile->uid(), profile);
    79     if (m_remoteFrontend)
    80         m_remoteFrontend->addProfileHeader(createProfileHeader(*profile));
     79    if (m_frontend)
     80        m_frontend->addProfileHeader(createProfileHeader(*profile));
    8181    addProfileFinishedMessageToConsole(profile, lineNumber, sourceURL);
    8282}
    … …  
    111111    m_enabled = false;
    112112    ScriptDebugServer::shared().recompileAllJSFunctionsSoon();
    113     if (m_remoteFrontend)
    114         m_remoteFrontend->profilerWasDisabled();
     113    if (m_frontend)
     114        m_frontend->profilerWasDisabled();
    115115}
    116116
    … …  
    122122    if (!skipRecompile)
    123123        ScriptDebugServer::shared().recompileAllJSFunctionsSoon();
    124     if (m_remoteFrontend)
    125         m_remoteFrontend->profilerWasEnabled();
     124    if (m_frontend)
     125        m_frontend->profilerWasEnabled();
    126126}
    127127
    … …  
    161161    m_currentUserInitiatedProfileNumber = 1;
    162162    m_nextUserInitiatedProfileNumber = 1;
    163     if (m_remoteFrontend)
    164         m_remoteFrontend->resetProfilesPanel();
     163    if (m_frontend)
     164        m_frontend->resetProfilesPanel();
    165165}
    166166
    … …  
    202202void InspectorProfilerAgent::toggleRecordButton(bool isProfiling)
    203203{
    204     if (m_remoteFrontend)
    205         m_remoteFrontend->setRecordingProfile(isProfiling);
     204    if (m_frontend)
     205        m_frontend->setRecordingProfile(isProfiling);
    206206}
    207207

  • trunk/WebCore/inspector/InspectorProfilerAgent.h

    r65797 r65891  
    4343class InspectorArray;
    4444class InspectorController;
     45class InspectorFrontend;
    4546class InspectorObject;
    4647class ScriptProfile;
    47 class RemoteInspectorFrontend;
    4848
    4949class InspectorProfilerAgent : public Noncopyable {
    … …  
    6565    void removeProfile(unsigned uid);
    6666    void resetState();
    67     void setRemoteFrontend(RemoteInspectorFrontend* frontend) { m_remoteFrontend = frontend; }
     67    void setFrontend(InspectorFrontend* frontend) { m_frontend = frontend; }
    6868    void startProfiling() { startUserInitiatedProfiling(); }
    6969    void startUserInitiatedProfiling();
    … …  
    7979
    8080    InspectorController* m_inspectorController;
    81     RemoteInspectorFrontend* m_remoteFrontend;
     81    InspectorFrontend* m_frontend;
    8282    bool m_enabled;
    8383    bool m_recordingUserInitiatedProfile;

  • trunk/WebCore/inspector/InspectorResource.cpp

    r65320 r65891  
    3939#include "DocumentLoader.h"
    4040#include "Frame.h"
     41#include "InspectorFrontend.h"
    4142#include "InspectorValues.h"
    42 #include "RemoteInspectorFrontend.h"
    4343#include "ResourceLoadTiming.h"
    4444#include "ResourceRequest.h"
    … …  
    176176
    177177
    178 void InspectorResource::updateScriptObject(RemoteInspectorFrontend* frontend)
     178void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
    179179{
    180180    if (m_changes.hasChange(NoChange))
    … …  
    252252}
    253253
    254 void InspectorResource::releaseScriptObject(RemoteInspectorFrontend* frontend)
     254void InspectorResource::releaseScriptObject(InspectorFrontend* frontend)
    255255{
    256256    m_changes.setAll();

  • trunk/WebCore/inspector/InspectorResource.h

    r64547 r65891  
    4747    class DocumentLoader;
    4848    class Frame;
    49     class RemoteInspectorFrontend;
     49    class InspectorFrontend;
    5050    class ResourceLoadTiming;
    5151    class ResourceRequest;
    … …  
    7777
    7878        PassRefPtr<InspectorResource> appendRedirect(unsigned long identifier, const KURL& redirectURL);
    79         void updateScriptObject(RemoteInspectorFrontend* frontend);
    80         void releaseScriptObject(RemoteInspectorFrontend* frontend);
     79        void updateScriptObject(InspectorFrontend* frontend);
     80        void releaseScriptObject(InspectorFrontend* frontend);
    8181
    8282        void updateRequest(const ResourceRequest&);

  • trunk/WebCore/inspector/InspectorStorageAgent.cpp

    r65320 r65891  
    3535#include "Database.h"
    3636#include "ExceptionCode.h"
     37#include "InspectorFrontend.h"
    3738#include "InspectorValues.h"
    3839#include "SQLError.h"
    … …  
    4445#include "SQLTransactionErrorCallback.h"
    4546#include "SQLValue.h"
    46 #include "RemoteInspectorFrontend.h"
    4747#include "VoidCallback.h"
    4848
    … …  
    201201} // namespace
    202202
    203 InspectorStorageAgent::InspectorStorageAgent(RemoteInspectorFrontend* frontend)
     203InspectorStorageAgent::InspectorStorageAgent(InspectorFrontend* frontend)
    204204    : m_frontend(frontend)
    205205{

  • trunk/WebCore/inspector/InspectorStorageAgent.h

    r65072 r65891  
    3636
    3737class Database;
    38 class RemoteInspectorFrontend;
     38class InspectorFrontend;
    3939
    4040class InspectorStorageAgent : public RefCounted<InspectorStorageAgent> {
    4141public:
    42     static PassRefPtr<InspectorStorageAgent> create(RemoteInspectorFrontend* frontend)
     42    static PassRefPtr<InspectorStorageAgent> create(InspectorFrontend* frontend)
    4343    {
    4444        return adoptRef(new InspectorStorageAgent(frontend));
    … …  
    4949    long executeSQL(Database*, const String& query);
    5050
    51     RemoteInspectorFrontend* frontend() { return m_frontend; }
     51    InspectorFrontend* frontend() { return m_frontend; }
    5252    void clearFrontend();
    5353
    5454private:
    55     InspectorStorageAgent(RemoteInspectorFrontend*);
     55    InspectorStorageAgent(InspectorFrontend*);
    5656
    57     RemoteInspectorFrontend* m_frontend;
     57    InspectorFrontend* m_frontend;
    5858};
    5959

  • trunk/WebCore/inspector/InspectorTimelineAgent.cpp

    r65320 r65891  
    3535
    3636#include "Event.h"
     37#include "InspectorFrontend.h"
    3738#include "IntRect.h"
    38 #include "RemoteInspectorFrontend.h"
    3939#include "ResourceRequest.h"
    4040#include "ResourceResponse.h"
    … …  
    4747int InspectorTimelineAgent::s_instanceCount = 0;
    4848
    49 InspectorTimelineAgent::InspectorTimelineAgent(RemoteInspectorFrontend* frontend)
     49InspectorTimelineAgent::InspectorTimelineAgent(InspectorFrontend* frontend)
    5050    : m_frontend(frontend)
    5151{
    … …  
    280280}
    281281
    282 void InspectorTimelineAgent::resetFrontendProxyObject(RemoteInspectorFrontend* frontend)
     282void InspectorTimelineAgent::resetFrontendProxyObject(InspectorFrontend* frontend)
    283283{
    284284    ASSERT(frontend);

  • trunk/WebCore/inspector/InspectorTimelineAgent.h

    r63198 r65891  
    4343namespace WebCore {
    4444class Event;
    45 class RemoteInspectorFrontend;
     45class InspectorFrontend;
    4646class IntRect;
    4747class ResourceRequest;
    … …  
    7575class InspectorTimelineAgent : ScriptGCEventListener, public Noncopyable {
    7676public:
    77     InspectorTimelineAgent(RemoteInspectorFrontend* frontend);
     77    InspectorTimelineAgent(InspectorFrontend* frontend);
    7878    ~InspectorTimelineAgent();
    7979
    8080    void reset();
    81     void resetFrontendProxyObject(RemoteInspectorFrontend*);
     81    void resetFrontendProxyObject(InspectorFrontend*);
    8282
    8383    // Methods called from WebCore.
    … …  
    153153    void pushGCEventRecords();
    154154
    155     RemoteInspectorFrontend* m_frontend;
     155    InspectorFrontend* m_frontend;
    156156
    157157    Vector<TimelineRecordEntry> m_recordStack;
Note: See TracChangeset for help on using the changeset viewer.