Changeset 65053 in webkit


Ignore:
Timestamp:
Aug 9, 2010 11:59:11 PM (14 years ago)
Author:
yurys@chromium.org
Message:

2010-08-09 Yury Semikhatsky <yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
https://bugs.webkit.org/show_bug.cgi?id=43726

  • CMakeLists.txt:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • inspector/InspectorController.cpp: (WebCore::InspectorController::connectFrontend): (WebCore::InspectorController::close): (WebCore::InspectorController::disconnectFrontend):
  • inspector/InspectorController.h:
  • inspector/InspectorFrontend.cpp: Removed.
  • inspector/InspectorFrontend.h: Removed.

2010-08-09 Yury Semikhatsky <yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
https://bugs.webkit.org/show_bug.cgi?id=43726

  • http/tests/inspector/inspector-test.js: (notifyDone):
Location:
trunk
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r65029 r65053  
     12010-08-09  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
     6        https://bugs.webkit.org/show_bug.cgi?id=43726
     7
     8        * http/tests/inspector/inspector-test.js:
     9        (notifyDone):
     10
    1112010-08-09  Sam Weinig  <sam@webkit.org>
    212
  • trunk/LayoutTests/http/tests/inspector/inspector-test.js

    r64977 r65053  
    3535    evaluateInWebInspector("true", function() {
    3636        if (window.layoutTestController) {
    37             layoutTestController.notifyDone();
    3837            layoutTestController.closeWebInspector();
     38            // Wait until Web Inspector actually closes before calling notifyDone.
     39            setTimeout(function() {
     40                layoutTestController.notifyDone();
     41            }, 0);
    3942        }
    4043    });
  • trunk/WebCore/CMakeLists.txt

    r65005 r65053  
    10591059    inspector/InspectorDatabaseResource.cpp
    10601060    inspector/InspectorDebuggerAgent.cpp
    1061     inspector/InspectorFrontend.cpp
    10621061    inspector/InspectorFrontendClientLocal.cpp
    10631062    inspector/InspectorFrontendHost.cpp
  • trunk/WebCore/ChangeLog

    r65052 r65053  
     12010-08-09  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: remove InspectorFrontend class and use RemoteInspectorFrontend instead.
     6        https://bugs.webkit.org/show_bug.cgi?id=43726
     7
     8        * CMakeLists.txt:
     9        * GNUmakefile.am:
     10        * WebCore.gypi:
     11        * WebCore.pro:
     12        * WebCore.vcproj/WebCore.vcproj:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * inspector/InspectorController.cpp:
     15        (WebCore::InspectorController::connectFrontend):
     16        (WebCore::InspectorController::close):
     17        (WebCore::InspectorController::disconnectFrontend):
     18        * inspector/InspectorController.h:
     19        * inspector/InspectorFrontend.cpp: Removed.
     20        * inspector/InspectorFrontend.h: Removed.
     21
    1222010-08-09  Ilya Tikhonovsky  <loislo@chromium.org>
    223
  • trunk/WebCore/GNUmakefile.am

    r65005 r65053  
    16161616        WebCore/inspector/InspectorController.cpp \
    16171617        WebCore/inspector/InspectorController.h \
    1618         WebCore/inspector/InspectorFrontend.cpp \
    1619         WebCore/inspector/InspectorFrontend.h \
    16201618        WebCore/inspector/InspectorFrontendClient.h \
    16211619        WebCore/inspector/InspectorFrontendClientLocal.cpp \
  • trunk/WebCore/WebCore.gypi

    r65005 r65053  
    17571757            'inspector/InspectorDOMStorageResource.cpp',
    17581758            'inspector/InspectorDOMStorageResource.h',
    1759             'inspector/InspectorFrontend.cpp',
    1760             'inspector/InspectorFrontend.h',
    17611759            'inspector/InspectorFrontendClient.h',
    17621760            'inspector/InspectorFrontendHost.cpp',
  • trunk/WebCore/WebCore.pro

    r65005 r65053  
    751751    inspector/InspectorDOMAgent.cpp \
    752752    inspector/InspectorDOMStorageResource.cpp \
    753     inspector/InspectorFrontend.cpp \
    754753    inspector/InspectorFrontendClientLocal.cpp \
    755754    inspector/InspectorFrontendHost.cpp \
     
    15111510    inspector/InspectorDebuggerAgent.h \
    15121511    inspector/InspectorDOMStorageResource.h \
    1513     inspector/InspectorFrontend.h \
    15141512    inspector/InspectorFrontendClient.h \
    15151513    inspector/InspectorFrontendClientLocal.h \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r65005 r65053  
    5095850958                        </File>
    5095950959                        <File
    50960                                 RelativePath="..\inspector\InspectorFrontend.cpp"
    50961                                 >
    50962                         </File>
    50963                         <File
    50964                                 RelativePath="..\inspector\InspectorFrontend.h"
    50965                                 >
    50966                         </File>
    50967                         <File
    5096850960                                RelativePath="..\inspector\InspectorFrontendClient.h"
    5096950961                                >
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r65021 r65053  
    14221422                7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; };
    14231423                7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; };
    1424                 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; };
    1425                 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; };
    14261424                7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14271425                7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    72587256                7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; };
    72597257                7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; };
    7260                 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
    7261                 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
    72627258                7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; };
    72637259                7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; };
     
    1165511651                                41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
    1165611652                                41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
    11657                                 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */,
    11658                                 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */,
    1165911653                                F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
    1166011654                                F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
     
    1878518779                                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
    1878618780                                41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
    18787                                 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */,
    1878818781                                F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
    1878918782                                F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
     
    2122821221                                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
    2122921222                                41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
    21230                                 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */,
    2123121223                                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
    2123221224                                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
  • trunk/WebCore/inspector/InjectedScriptHost.h

    r64951 r65053  
    4646class Node;
    4747class RemoteInspectorFrontend;
     48class ScriptObject;
    4849class Storage;
    4950
  • trunk/WebCore/inspector/InspectorController.cpp

    r65021 r65053  
    6363#include "InspectorDatabaseResource.h"
    6464#include "InspectorDebuggerAgent.h"
    65 #include "InspectorFrontend.h"
    6665#include "InspectorResource.h"
    6766#include "InspectorValues.h"
     
    128127static const char* const monitoringXHRSettingName = "xhrMonitor";
    129128
    130 int connectedFrontendCount = 0;
     129static int connectedFrontendCount = 0;
    131130
    132131const String& InspectorController::frontendSettingsSettingName()
     
    473472}
    474473
    475 void InspectorController::connectFrontend(const ScriptObject& webInspector)
     474void InspectorController::connectFrontend()
    476475{
    477476    m_openingFrontend = false;
    478477    releaseFrontendLifetimeAgents();
    479     m_frontend = new InspectorFrontend(webInspector, m_client);
    480478    m_remoteFrontend = new RemoteInspectorFrontend(m_client);
    481479    m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_remoteFrontend.get());
     
    557555    if (!m_remoteFrontend)
    558556        return;
    559     m_frontend->close();
     557    m_remoteFrontend->close();
    560558}
    561559
     
    564562    if (!m_remoteFrontend)
    565563        return;
    566     m_frontend.clear();
    567564    m_remoteFrontend.clear();
    568565
  • trunk/WebCore/inspector/InspectorController.h

    r65021 r65053  
    6464class InspectorDatabaseResource;
    6565class InspectorDebuggerAgent;
    66 class InspectorFrontend;
    6766class InspectorFrontendClient;
    6867class InspectorResource;
     
    7877class ResourceError;
    7978class ScriptCallStack;
    80 class ScriptObject;
    8179class ScriptString;
    8280class SharedBuffer;
     
    134132    // transport via InspectorClient. After migration, webInspector parameter should
    135133    // be removed.
    136     void connectFrontend(const ScriptObject& webInspector);
     134    void connectFrontend();
    137135    void disconnectFrontend();
    138136
     
    210208    const ResourcesMap& resources() const { return m_resources; }
    211209    InspectorResource* resourceForURL(const String& url);
    212     InspectorFrontend* inspectorFrontend() { return m_frontend.get(); }
    213210    RemoteInspectorFrontend* remoteInspectorFrontend() { return m_remoteFrontend.get(); }
    214211
     
    330327    OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
    331328    bool m_openingFrontend;
    332     OwnPtr<InspectorFrontend> m_frontend;
    333329    OwnPtr<RemoteInspectorFrontend> m_remoteFrontend;
    334330    RefPtr<InspectorDOMAgent> m_domAgent;
  • trunk/WebCore/inspector/InspectorFrontendClientLocal.cpp

    r64951 r65053  
    8080{
    8181    bringToFront();
    82     // Create InspectorFrontend and set it to InspectorController.
    83     ASSERT(m_frontendScriptState);
    84     ScriptObject webInspectorObj;
    85     if (!ScriptGlobalObject::get(m_frontendScriptState, "WebInspector", webInspectorObj)) {
    86         ASSERT_NOT_REACHED();
    87         return;
    88     }
    89     m_inspectorController->connectFrontend(webInspectorObj);
     82    m_inspectorController->connectFrontend();
    9083}
    9184
Note: See TracChangeset for help on using the changeset viewer.