Changeset 65053 in webkit
- Timestamp:
- Aug 9, 2010 11:59:11 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r65029 r65053 1 2010-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 1 11 2010-08-09 Sam Weinig <sam@webkit.org> 2 12 -
trunk/LayoutTests/http/tests/inspector/inspector-test.js
r64977 r65053 35 35 evaluateInWebInspector("true", function() { 36 36 if (window.layoutTestController) { 37 layoutTestController.notifyDone();38 37 layoutTestController.closeWebInspector(); 38 // Wait until Web Inspector actually closes before calling notifyDone. 39 setTimeout(function() { 40 layoutTestController.notifyDone(); 41 }, 0); 39 42 } 40 43 }); -
trunk/WebCore/CMakeLists.txt
r65005 r65053 1059 1059 inspector/InspectorDatabaseResource.cpp 1060 1060 inspector/InspectorDebuggerAgent.cpp 1061 inspector/InspectorFrontend.cpp1062 1061 inspector/InspectorFrontendClientLocal.cpp 1063 1062 inspector/InspectorFrontendHost.cpp -
trunk/WebCore/ChangeLog
r65052 r65053 1 2010-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 1 22 2010-08-09 Ilya Tikhonovsky <loislo@chromium.org> 2 23 -
trunk/WebCore/GNUmakefile.am
r65005 r65053 1616 1616 WebCore/inspector/InspectorController.cpp \ 1617 1617 WebCore/inspector/InspectorController.h \ 1618 WebCore/inspector/InspectorFrontend.cpp \1619 WebCore/inspector/InspectorFrontend.h \1620 1618 WebCore/inspector/InspectorFrontendClient.h \ 1621 1619 WebCore/inspector/InspectorFrontendClientLocal.cpp \ -
trunk/WebCore/WebCore.gypi
r65005 r65053 1757 1757 'inspector/InspectorDOMStorageResource.cpp', 1758 1758 'inspector/InspectorDOMStorageResource.h', 1759 'inspector/InspectorFrontend.cpp',1760 'inspector/InspectorFrontend.h',1761 1759 'inspector/InspectorFrontendClient.h', 1762 1760 'inspector/InspectorFrontendHost.cpp', -
trunk/WebCore/WebCore.pro
r65005 r65053 751 751 inspector/InspectorDOMAgent.cpp \ 752 752 inspector/InspectorDOMStorageResource.cpp \ 753 inspector/InspectorFrontend.cpp \754 753 inspector/InspectorFrontendClientLocal.cpp \ 755 754 inspector/InspectorFrontendHost.cpp \ … … 1511 1510 inspector/InspectorDebuggerAgent.h \ 1512 1511 inspector/InspectorDOMStorageResource.h \ 1513 inspector/InspectorFrontend.h \1514 1512 inspector/InspectorFrontendClient.h \ 1515 1513 inspector/InspectorFrontendClientLocal.h \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r65005 r65053 50958 50958 </File> 50959 50959 <File 50960 RelativePath="..\inspector\InspectorFrontend.cpp"50961 >50962 </File>50963 <File50964 RelativePath="..\inspector\InspectorFrontend.h"50965 >50966 </File>50967 <File50968 50960 RelativePath="..\inspector\InspectorFrontendClient.h" 50969 50961 > -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r65021 r65053 1422 1422 7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; }; 1423 1423 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 */; };1426 1424 7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1427 1425 7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 7258 7256 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; }; 7259 7257 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>"; };7262 7258 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; }; 7263 7259 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; }; … … 11655 11651 41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */, 11656 11652 41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */, 11657 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */,11658 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */,11659 11653 F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */, 11660 11654 F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */, … … 18785 18779 7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */, 18786 18780 41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */, 18787 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */,18788 18781 F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */, 18789 18782 F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */, … … 21228 21221 7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */, 21229 21222 41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */, 21230 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */,21231 21223 F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */, 21232 21224 7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */, -
trunk/WebCore/inspector/InjectedScriptHost.h
r64951 r65053 46 46 class Node; 47 47 class RemoteInspectorFrontend; 48 class ScriptObject; 48 49 class Storage; 49 50 -
trunk/WebCore/inspector/InspectorController.cpp
r65021 r65053 63 63 #include "InspectorDatabaseResource.h" 64 64 #include "InspectorDebuggerAgent.h" 65 #include "InspectorFrontend.h"66 65 #include "InspectorResource.h" 67 66 #include "InspectorValues.h" … … 128 127 static const char* const monitoringXHRSettingName = "xhrMonitor"; 129 128 130 int connectedFrontendCount = 0;129 static int connectedFrontendCount = 0; 131 130 132 131 const String& InspectorController::frontendSettingsSettingName() … … 473 472 } 474 473 475 void InspectorController::connectFrontend( const ScriptObject& webInspector)474 void InspectorController::connectFrontend() 476 475 { 477 476 m_openingFrontend = false; 478 477 releaseFrontendLifetimeAgents(); 479 m_frontend = new InspectorFrontend(webInspector, m_client);480 478 m_remoteFrontend = new RemoteInspectorFrontend(m_client); 481 479 m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_remoteFrontend.get()); … … 557 555 if (!m_remoteFrontend) 558 556 return; 559 m_ frontend->close();557 m_remoteFrontend->close(); 560 558 } 561 559 … … 564 562 if (!m_remoteFrontend) 565 563 return; 566 m_frontend.clear();567 564 m_remoteFrontend.clear(); 568 565 -
trunk/WebCore/inspector/InspectorController.h
r65021 r65053 64 64 class InspectorDatabaseResource; 65 65 class InspectorDebuggerAgent; 66 class InspectorFrontend;67 66 class InspectorFrontendClient; 68 67 class InspectorResource; … … 78 77 class ResourceError; 79 78 class ScriptCallStack; 80 class ScriptObject;81 79 class ScriptString; 82 80 class SharedBuffer; … … 134 132 // transport via InspectorClient. After migration, webInspector parameter should 135 133 // be removed. 136 void connectFrontend( const ScriptObject& webInspector);134 void connectFrontend(); 137 135 void disconnectFrontend(); 138 136 … … 210 208 const ResourcesMap& resources() const { return m_resources; } 211 209 InspectorResource* resourceForURL(const String& url); 212 InspectorFrontend* inspectorFrontend() { return m_frontend.get(); }213 210 RemoteInspectorFrontend* remoteInspectorFrontend() { return m_remoteFrontend.get(); } 214 211 … … 330 327 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient; 331 328 bool m_openingFrontend; 332 OwnPtr<InspectorFrontend> m_frontend;333 329 OwnPtr<RemoteInspectorFrontend> m_remoteFrontend; 334 330 RefPtr<InspectorDOMAgent> m_domAgent; -
trunk/WebCore/inspector/InspectorFrontendClientLocal.cpp
r64951 r65053 80 80 { 81 81 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(); 90 83 } 91 84
Note: See TracChangeset
for help on using the changeset viewer.