Changeset 101081 in webkit
- Timestamp:
- Nov 23, 2011 7:28:40 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 18 edited
- 8 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r101052 r101081 902 902 inspector/InstrumentingAgents.cpp 903 903 inspector/NetworkResourcesData.cpp 904 inspector/PageConsoleAgent.cpp 904 905 inspector/PageDebuggerAgent.cpp 906 inspector/PageRuntimeAgent.cpp 905 907 inspector/ScriptArguments.cpp 906 908 inspector/ScriptCallFrame.cpp 907 909 inspector/ScriptCallStack.cpp 908 910 inspector/TimelineRecordFactory.cpp 911 inspector/WorkerConsoleAgent.cpp 909 912 inspector/WorkerDebuggerAgent.cpp 910 913 inspector/WorkerInspectorController.cpp 914 inspector/WorkerRuntimeAgent.cpp 911 915 912 916 loader/CrossOriginAccessControl.cpp -
trunk/Source/WebCore/ChangeLog
r101080 r101081 1 2011-11-23 Yury Semikhatsky <yurys@chromium.org> 2 3 Web Inspector: split console agent into worker and page console agents 4 https://bugs.webkit.org/show_bug.cgi?id=73019 5 6 InspectorConsoleAgent now has two descendants: WorkerConsoleAgent and PageConsoleAgent 7 which encapsulate functionality specific for the type of inspected instance. 8 9 Reviewed by Pavel Feldman. 10 11 * CMakeLists.txt: 12 * GNUmakefile.list.am: 13 * Target.pri: 14 * WebCore.gypi: 15 * WebCore.vcproj/WebCore.vcproj: 16 * WebCore.xcodeproj/project.pbxproj: 17 * inspector/InspectorConsoleAgent.cpp: 18 (WebCore::InspectorConsoleAgent::InspectorConsoleAgent): 19 (WebCore::InspectorConsoleAgent::~InspectorConsoleAgent): 20 (WebCore::InspectorConsoleAgent::clearMessages): 21 (WebCore::InspectorConsoleAgent::addMessageToConsole): 22 (WebCore::InspectorConsoleAgent::resourceRetrievedByXMLHttpRequest): 23 (WebCore::InspectorConsoleAgent::didReceiveResponse): 24 (WebCore::InspectorConsoleAgent::didFailLoading): 25 (WebCore::InspectorConsoleAgent::addConsoleMessage): 26 * inspector/InspectorConsoleAgent.h: 27 * inspector/InspectorController.cpp: 28 (WebCore::InspectorController::InspectorController): 29 * inspector/InspectorStyleTextEditor.cpp: 30 * inspector/InspectorStyleTextEditor.h: 31 * inspector/PageConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.cpp. 32 (WebCore::PageConsoleAgent::PageConsoleAgent): 33 (WebCore::PageConsoleAgent::~PageConsoleAgent): 34 (WebCore::PageConsoleAgent::clearMessages): 35 (WebCore::PageConsoleAgent::addInspectedNode): 36 (WebCore::PageConsoleAgent::developerExtrasEnabled): 37 * inspector/PageConsoleAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 38 * inspector/PageDebuggerAgent.cpp: 39 * inspector/PageDebuggerAgent.h: 40 * inspector/PageRuntimeAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 41 (WebCore::PageRuntimeAgent::PageRuntimeAgent): PageRuntimeAgent was moved into its own file. 42 (WebCore::PageRuntimeAgent::~PageRuntimeAgent): 43 (WebCore::PageRuntimeAgent::scriptStateForFrameId): 44 (WebCore::PageRuntimeAgent::getDefaultInspectedState): 45 * inspector/PageRuntimeAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 46 * inspector/WorkerConsoleAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 47 (WebCore::WorkerConsoleAgent::WorkerConsoleAgent): 48 (WebCore::WorkerConsoleAgent::~WorkerConsoleAgent): 49 (WebCore::WorkerConsoleAgent::addInspectedNode): 50 (WebCore::WorkerConsoleAgent::developerExtrasEnabled): 51 * inspector/WorkerConsoleAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 52 * inspector/WorkerDebuggerAgent.cpp: 53 * inspector/WorkerDebuggerAgent.h: 54 * inspector/WorkerInspectorController.cpp: 55 (WebCore::WorkerInspectorController::WorkerInspectorController): 56 * inspector/WorkerInspectorController.h: 57 * inspector/WorkerRuntimeAgent.cpp: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 58 (WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent): WorkerRuntimeAgent was moved into its own file. 59 (WebCore::WorkerRuntimeAgent::~WorkerRuntimeAgent): 60 (WebCore::WorkerRuntimeAgent::scriptStateForFrameId): 61 (WebCore::WorkerRuntimeAgent::getDefaultInspectedState): 62 * inspector/WorkerRuntimeAgent.h: Copied from Source/WebCore/inspector/PageDebuggerAgent.h. 63 1 64 2011-11-23 Alexander Pavlov <apavlov@chromium.org> 2 65 -
trunk/Source/WebCore/GNUmakefile.list.am
r100997 r101081 2110 2110 Source/WebCore/inspector/NetworkResourcesData.cpp \ 2111 2111 Source/WebCore/inspector/NetworkResourcesData.h \ 2112 Source/WebCore/inspector/PageConsoleAgent.cpp \ 2113 Source/WebCore/inspector/PageConsoleAgent.h \ 2112 2114 Source/WebCore/inspector/PageDebuggerAgent.cpp \ 2113 2115 Source/WebCore/inspector/PageDebuggerAgent.h \ 2116 Source/WebCore/inspector/PageRuntimeAgent.cpp \ 2117 Source/WebCore/inspector/PageRuntimeAgent.h \ 2114 2118 Source/WebCore/inspector/ScriptArguments.cpp \ 2115 2119 Source/WebCore/inspector/ScriptArguments.h \ … … 2123 2127 Source/WebCore/inspector/TimelineRecordFactory.cpp \ 2124 2128 Source/WebCore/inspector/TimelineRecordFactory.h \ 2129 Source/WebCore/inspector/WorkerConsoleAgent.cpp \ 2130 Source/WebCore/inspector/WorkerConsoleAgent.h \ 2125 2131 Source/WebCore/inspector/WorkerDebuggerAgent.cpp \ 2126 2132 Source/WebCore/inspector/WorkerDebuggerAgent.h \ 2127 2133 Source/WebCore/inspector/WorkerInspectorController.cpp \ 2128 2134 Source/WebCore/inspector/WorkerInspectorController.h \ 2135 Source/WebCore/inspector/WorkerRuntimeAgent.cpp \ 2136 Source/WebCore/inspector/WorkerRuntimeAgent.h \ 2129 2137 Source/WebCore/loader/appcache/ApplicationCache.cpp \ 2130 2138 Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp \ -
trunk/Source/WebCore/Target.pri
r100993 r101081 887 887 inspector/InstrumentingAgents.cpp \ 888 888 inspector/NetworkResourcesData.cpp \ 889 inspector/PageConsoleAgent.cpp \ 889 890 inspector/PageDebuggerAgent.cpp \ 891 inspector/PageRuntimeAgent.cpp \ 890 892 inspector/ScriptArguments.cpp \ 891 893 inspector/ScriptCallFrame.cpp \ 892 894 inspector/ScriptCallStack.cpp \ 893 895 inspector/TimelineRecordFactory.cpp \ 896 inspector/WorkerConsoleAgent.cpp \ 894 897 inspector/WorkerDebuggerAgent.cpp \ 895 898 inspector/WorkerInspectorController.cpp \ 899 inspector/WorkerRuntimeAgent.cpp \ 896 900 loader/appcache/ApplicationCache.cpp \ 897 901 loader/appcache/ApplicationCacheGroup.cpp \ … … 1933 1937 inspector/InstrumentingAgents.h \ 1934 1938 inspector/NetworkResourcesData.h \ 1939 inspector/PageConsoleAgent.h \ 1935 1940 inspector/PageDebuggerAgent.h \ 1941 inspector/PageRuntimeAgent.h \ 1936 1942 inspector/ScriptGCEventListener.h \ 1937 1943 inspector/TimelineRecordFactory.h \ 1944 inspector/WorkerConsoleAgent.h \ 1938 1945 inspector/WorkerDebuggerAgent.h \ 1946 inspector/WorkerRuntimeAgent.h \ 1939 1947 loader/appcache/ApplicationCacheGroup.h \ 1940 1948 loader/appcache/ApplicationCacheHost.h \ -
trunk/Source/WebCore/WebCore.gypi
r101065 r101081 2772 2772 'inspector/NetworkResourcesData.cpp', 2773 2773 'inspector/NetworkResourcesData.h', 2774 'inspector/PageConsoleAgent.cpp', 2775 'inspector/PageConsoleAgent.h', 2774 2776 'inspector/PageDebuggerAgent.cpp', 2775 2777 'inspector/PageDebuggerAgent.h', 2778 'inspector/PageRuntimeAgent.cpp', 2779 'inspector/PageRuntimeAgent.h', 2776 2780 'inspector/ScriptArguments.cpp', 2777 2781 'inspector/ScriptArguments.h', … … 2783 2787 'inspector/TimelineRecordFactory.cpp', 2784 2788 'inspector/TimelineRecordFactory.h', 2789 'inspector/WorkerConsoleAgent.cpp', 2790 'inspector/WorkerConsoleAgent.h', 2785 2791 'inspector/WorkerDebuggerAgent.cpp', 2786 2792 'inspector/WorkerDebuggerAgent.h', 2787 2793 'inspector/WorkerInspectorController.cpp', 2788 2794 'inspector/WorkerInspectorController.h', 2795 'inspector/WorkerRuntimeAgent.cpp', 2796 'inspector/WorkerRuntimeAgent.h', 2789 2797 'loader/CachedMetadata.h', 2790 2798 'loader/CrossOriginAccessControl.cpp', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r100991 r101081 68575 68575 </File> 68576 68576 <File 68577 RelativePath="..\inspector\PageConsoleAgent.cpp" 68578 > 68579 </File> 68580 <File 68581 RelativePath="..\inspector\PageConsoleAgent.h" 68582 > 68583 </File> 68584 <File 68577 68585 RelativePath="..\inspector\PageDebuggerAgent.cpp" 68578 68586 > … … 68583 68591 </File> 68584 68592 <File 68593 RelativePath="..\inspector\PageRuntimeAgent.cpp" 68594 > 68595 </File> 68596 <File 68597 RelativePath="..\inspector\PageRuntimeAgent.h" 68598 > 68599 </File> 68600 <File 68585 68601 RelativePath="..\inspector\ScriptArguments.cpp" 68586 68602 > … … 68623 68639 </File> 68624 68640 <File 68641 RelativePath="..\inspector\WorkerConsoleAgent.cpp" 68642 > 68643 </File> 68644 <File 68645 RelativePath="..\inspector\WorkerConsoleAgent.h" 68646 > 68647 </File> 68648 <File 68625 68649 RelativePath="..\inspector\WorkerDebuggerAgent.cpp" 68626 68650 > … … 68636 68660 <File 68637 68661 RelativePath="..\inspector\WorkerInspectorController.h" 68662 > 68663 </File> 68664 <File 68665 RelativePath="..\inspector\WorkerRuntimeAgent.cpp" 68666 > 68667 </File> 68668 <File 68669 RelativePath="..\inspector\WorkerRuntimeAgent.h" 68638 68670 > 68639 68671 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r100616 r101081 6024 6024 F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */; }; 6025 6025 F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */; }; 6026 F3820892147D35F90010BC06 /* PageConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */; }; 6027 F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088B147D35F90010BC06 /* PageConsoleAgent.h */; }; 6028 F3820894147D35F90010BC06 /* PageRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */; }; 6029 F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088D147D35F90010BC06 /* PageRuntimeAgent.h */; }; 6030 F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */; }; 6031 F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */; }; 6032 F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */; }; 6033 F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */; }; 6026 6034 F392249C126F11AE00A926D9 /* ScriptCallStackFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */; }; 6027 6035 F392249D126F11AE00A926D9 /* ScriptCallStackFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */; }; … … 13382 13390 F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWorkerAgent.cpp; sourceTree = "<group>"; }; 13383 13391 F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWorkerAgent.h; sourceTree = "<group>"; }; 13392 F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageConsoleAgent.cpp; sourceTree = "<group>"; }; 13393 F382088B147D35F90010BC06 /* PageConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageConsoleAgent.h; sourceTree = "<group>"; }; 13394 F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageRuntimeAgent.cpp; sourceTree = "<group>"; }; 13395 F382088D147D35F90010BC06 /* PageRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageRuntimeAgent.h; sourceTree = "<group>"; }; 13396 F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerConsoleAgent.cpp; sourceTree = "<group>"; }; 13397 F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerConsoleAgent.h; sourceTree = "<group>"; }; 13398 F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerRuntimeAgent.cpp; sourceTree = "<group>"; }; 13399 F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerRuntimeAgent.h; sourceTree = "<group>"; }; 13384 13400 F392249A126F11AE00A926D9 /* ScriptCallStackFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStackFactory.cpp; sourceTree = "<group>"; }; 13385 13401 F392249B126F11AE00A926D9 /* ScriptCallStackFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStackFactory.h; sourceTree = "<group>"; }; … … 14557 14573 59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */, 14558 14574 59C27F06138D28CF0079B7E2 /* NetworkResourcesData.h */, 14575 F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */, 14576 F382088B147D35F90010BC06 /* PageConsoleAgent.h */, 14559 14577 F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */, 14560 14578 F34742DB134362F000531BC2 /* PageDebuggerAgent.h */, 14579 F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */, 14580 F382088D147D35F90010BC06 /* PageRuntimeAgent.h */, 14561 14581 F39BE95912673BF400E0A674 /* ScriptArguments.cpp */, 14562 14582 F39BE95A12673BF400E0A674 /* ScriptArguments.h */, … … 14571 14591 7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */, 14572 14592 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */, 14593 F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */, 14594 F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */, 14573 14595 F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */, 14574 14596 F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */, 14575 14597 F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */, 14576 14598 F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */, 14599 F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */, 14600 F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */, 14577 14601 ); 14578 14602 path = inspector; … … 24728 24752 A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */, 24729 24753 3138A9E51474434600B0ED12 /* StyleShader.h in Headers */, 24754 F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */, 24755 F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */, 24756 F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */, 24757 F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */, 24730 24758 ); 24731 24759 runOnlyForDeploymentPostprocessing = 0; … … 27602 27630 5038BE401472AD980095E0D1 /* CachedShader.cpp in Sources */, 27603 27631 A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */, 27632 F3820892147D35F90010BC06 /* PageConsoleAgent.cpp in Sources */, 27633 F3820894147D35F90010BC06 /* PageRuntimeAgent.cpp in Sources */, 27634 F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */, 27635 F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */, 27604 27636 ); 27605 27637 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp
r100756 r101081 35 35 #include "InjectedScriptHost.h" 36 36 #include "InjectedScriptManager.h" 37 #include "InspectorAgent.h"38 #include "InspectorDOMAgent.h"39 37 #include "InspectorFrontend.h" 40 38 #include "InspectorState.h" … … 59 57 } 60 58 61 InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, Inspector Agent* inspectorAgent, InspectorState* state, InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)59 InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InjectedScriptManager* injectedScriptManager) 62 60 : m_instrumentingAgents(instrumentingAgents) 63 , m_inspectorAgent(inspectorAgent)64 61 , m_inspectorState(state) 65 62 , m_injectedScriptManager(injectedScriptManager) 66 , m_inspectorDOMAgent(domAgent)67 63 , m_frontend(0) 68 64 , m_previousMessage(0) … … 76 72 m_instrumentingAgents->setInspectorConsoleAgent(0); 77 73 m_instrumentingAgents = 0; 78 m_inspectorAgent = 0;79 74 m_inspectorState = 0; 80 75 m_injectedScriptManager = 0; 81 m_inspectorDOMAgent = 0;82 76 } 83 77 … … 107 101 m_previousMessage = 0; 108 102 m_injectedScriptManager->releaseObjectGroup("console"); 109 m_inspectorDOMAgent->releaseDanglingNodes();110 103 if (m_frontend) 111 104 m_frontend->messagesCleared(); … … 141 134 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack) 142 135 { 143 if (! m_inspectorAgent->enabled())136 if (!developerExtrasEnabled()) 144 137 return; 145 138 addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, arguments, callStack))); … … 148 141 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& scriptId) 149 142 { 150 if (! m_inspectorAgent->enabled())143 if (!developerExtrasEnabled()) 151 144 return; 152 145 addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, scriptId))); … … 217 210 void InspectorConsoleAgent::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const String& url, const String& sendURL, unsigned sendLineNumber) 218 211 { 219 if (! m_inspectorAgent->enabled())212 if (!developerExtrasEnabled()) 220 213 return; 221 214 if (m_frontend && m_inspectorState->getBoolean(ConsoleAgentState::monitoringXHR)) { … … 230 223 void InspectorConsoleAgent::didReceiveResponse(unsigned long identifier, const ResourceResponse& response) 231 224 { 232 if (! m_inspectorAgent->enabled())225 if (!developerExtrasEnabled()) 233 226 return; 234 227 … … 242 235 void InspectorConsoleAgent::didFailLoading(unsigned long identifier, const ResourceError& error) 243 236 { 244 if (! m_inspectorAgent->enabled())237 if (!developerExtrasEnabled()) 245 238 return; 246 239 if (error.isCancellation()) // Report failures only. … … 258 251 } 259 252 260 void InspectorConsoleAgent::addInspectedNode(ErrorString*, int nodeId)261 {262 Node* node = m_inspectorDOMAgent->nodeForId(nodeId);263 if (!node)264 return;265 m_injectedScriptManager->injectedScriptHost()->addInspectedNode(node);266 }267 268 253 static bool isGroupMessage(MessageType type) 269 254 { … … 275 260 void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage) 276 261 { 277 ASSERT( m_inspectorAgent->enabled());262 ASSERT(developerExtrasEnabled()); 278 263 ASSERT_ARG(consoleMessage, consoleMessage); 279 264 -
trunk/Source/WebCore/inspector/InspectorConsoleAgent.h
r98326 r101081 40 40 class ConsoleMessage; 41 41 class DOMWindow; 42 class InspectorAgent;43 class InspectorDOMAgent;44 42 class InspectorFrontend; 45 43 class InspectorState; … … 57 55 WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent); 58 56 public: 59 InspectorConsoleAgent(InstrumentingAgents*, Inspector Agent*, InspectorState*, InjectedScriptManager*, InspectorDOMAgent*);60 ~InspectorConsoleAgent();57 InspectorConsoleAgent(InstrumentingAgents*, InspectorState*, InjectedScriptManager*); 58 virtual ~InspectorConsoleAgent(); 61 59 62 60 void enable(ErrorString*); 63 61 void disable(ErrorString*); 64 v oid clearMessages(ErrorString*);62 virtual void clearMessages(ErrorString*); 65 63 void reset(); 66 64 void restore(); … … 85 83 #endif 86 84 void setMonitoringXHREnabled(ErrorString* error, bool enabled); 87 v oid addInspectedNode(ErrorString*, int nodeId);85 virtual void addInspectedNode(ErrorString*, int nodeId) = 0; 88 86 89 pr ivate:87 protected: 90 88 void addConsoleMessage(PassOwnPtr<ConsoleMessage>); 91 89 90 virtual bool developerExtrasEnabled() = 0; 91 92 92 InstrumentingAgents* m_instrumentingAgents; 93 InspectorAgent* m_inspectorAgent;94 93 InspectorState* m_inspectorState; 95 94 InjectedScriptManager* m_injectedScriptManager; 96 InspectorDOMAgent* m_inspectorDOMAgent;97 95 InspectorFrontend::Console* m_frontend; 98 96 ConsoleMessage* m_previousMessage; -
trunk/Source/WebCore/inspector/InspectorController.cpp
r100995 r101081 44 44 #include "InspectorCSSAgent.h" 45 45 #include "InspectorClient.h" 46 #include "InspectorConsoleAgent.h"47 46 #include "InspectorDOMAgent.h" 48 47 #include "InspectorDOMDebuggerAgent.h" … … 56 55 #include "InspectorProfilerAgent.h" 57 56 #include "InspectorResourceAgent.h" 58 #include "InspectorRuntimeAgent.h"59 57 #include "InspectorState.h" 60 58 #include "InspectorTimelineAgent.h" 61 59 #include "InspectorWorkerAgent.h" 62 60 #include "InstrumentingAgents.h" 61 #include "PageConsoleAgent.h" 63 62 #include "PageDebuggerAgent.h" 63 #include "PageRuntimeAgent.h" 64 64 #include "Page.h" 65 65 #include "ScriptObject.h" … … 68 68 69 69 namespace WebCore { 70 71 namespace {72 73 class PageRuntimeAgent : public InspectorRuntimeAgent {74 public:75 PageRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, Page* page, InspectorPageAgent* pageAgent)76 : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager)77 , m_inspectedPage(page)78 , m_pageAgent(pageAgent) { }79 virtual ~PageRuntimeAgent() { }80 81 private:82 virtual ScriptState* scriptStateForFrameId(const String& frameId)83 {84 Frame* frame = m_pageAgent->frameForId(frameId);85 if (!frame)86 return 0;87 return mainWorldScriptState(frame);88 }89 virtual ScriptState* getDefaultInspectedState() { return mainWorldScriptState(m_inspectedPage->mainFrame()); }90 Page* m_inspectedPage;91 InspectorPageAgent* m_pageAgent;92 };93 94 }95 70 96 71 InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient) … … 110 85 , m_resourceAgent(InspectorResourceAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), inspectorClient, m_state.get())) 111 86 , m_runtimeAgent(adoptPtr(new PageRuntimeAgent(m_instrumentingAgents.get(), m_injectedScriptManager.get(), page, m_pageAgent.get()))) 112 , m_consoleAgent(adoptPtr(new InspectorConsoleAgent(m_instrumentingAgents.get(), m_inspectorAgent.get(), m_state.get(), m_injectedScriptManager.get(), m_domAgent.get())))87 , m_consoleAgent(adoptPtr(new PageConsoleAgent(m_instrumentingAgents.get(), m_inspectorAgent.get(), m_state.get(), m_injectedScriptManager.get(), m_domAgent.get()))) 113 88 #if ENABLE(JAVASCRIPT_DEBUGGER) 114 89 , m_debuggerAgent(PageDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), page, m_injectedScriptManager.get())) -
trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp
- Property svn:executable deleted
-
trunk/Source/WebCore/inspector/InspectorStyleTextEditor.h
- Property svn:executable deleted
-
trunk/Source/WebCore/inspector/PageConsoleAgent.cpp
- Property svn:executable deleted
r101080 r101081 30 30 31 31 #include "config.h" 32 #include "PageDebuggerAgent.h"33 32 34 #i f ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)33 #include "PageConsoleAgent.h" 35 34 36 #include "PageScriptDebugServer.h" 35 #if ENABLE(INSPECTOR) 36 37 #include "DOMWindow.h" 38 #include "InjectedScriptHost.h" 39 #include "InjectedScriptManager.h" 40 #include "InspectorAgent.h" 41 #include "InspectorDOMAgent.h" 37 42 38 43 namespace WebCore { 39 44 40 PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, Page* inspectedPage, InjectedScriptManager* injectedScriptManager) 41 { 42 return adoptPtr(new PageDebuggerAgent(instrumentingAgents, inspectorState, inspectedPage, injectedScriptManager)); 43 } 44 45 PageDebuggerAgent::PageDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, Page* inspectedPage, InjectedScriptManager* injectedScriptManager) 46 : InspectorDebuggerAgent(instrumentingAgents, inspectorState, injectedScriptManager) 47 , m_inspectedPage(inspectedPage) 45 PageConsoleAgent::PageConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorAgent* inspectorAgent, InspectorState* state, InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent) 46 : InspectorConsoleAgent(instrumentingAgents, state, injectedScriptManager) 47 , m_inspectorAgent(inspectorAgent) 48 , m_inspectorDOMAgent(domAgent) 48 49 { 49 50 } 50 51 51 Page DebuggerAgent::~PageDebuggerAgent()52 PageConsoleAgent::~PageConsoleAgent() 52 53 { 54 m_inspectorAgent = 0; 55 m_inspectorDOMAgent = 0; 53 56 } 54 57 55 void Page DebuggerAgent::startListeningScriptDebugServer()58 void PageConsoleAgent::clearMessages(ErrorString* errorString) 56 59 { 57 scriptDebugServer().addListener(this, m_inspectedPage); 60 m_inspectorDOMAgent->releaseDanglingNodes(); 61 InspectorConsoleAgent::clearMessages(errorString); 58 62 } 59 63 60 void Page DebuggerAgent::stopListeningScriptDebugServer()64 void PageConsoleAgent::addInspectedNode(ErrorString*, int nodeId) 61 65 { 62 scriptDebugServer().removeListener(this, m_inspectedPage); 66 Node* node = m_inspectorDOMAgent->nodeForId(nodeId); 67 if (!node) 68 return; 69 m_injectedScriptManager->injectedScriptHost()->addInspectedNode(node); 63 70 } 64 71 65 PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()72 bool PageConsoleAgent::developerExtrasEnabled() 66 73 { 67 return PageScriptDebugServer::shared();74 return m_inspectorAgent->enabled(); 68 75 } 76 69 77 70 78 } // namespace WebCore 71 79 72 #endif // ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)80 #endif // ENABLE(INSPECTOR) -
trunk/Source/WebCore/inspector/PageConsoleAgent.h
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef Page DebuggerAgent_h32 #define Page DebuggerAgent_h31 #ifndef PageConsoleAgent_h 32 #define PageConsoleAgent_h 33 33 34 #i f ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)35 #include "InspectorDebuggerAgent.h" 36 #i nclude "PageScriptDebugServer.h"34 #include "InspectorConsoleAgent.h" 35 36 #if ENABLE(INSPECTOR) 37 37 38 38 namespace WebCore { 39 39 40 class Page;41 class PageScriptDebugServer;40 class InspectorAgent; 41 class InspectorDOMAgent; 42 42 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 43 class PageConsoleAgent : public InspectorConsoleAgent { 44 WTF_MAKE_NONCOPYABLE(PageConsoleAgent); 46 45 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);48 virtual ~Page DebuggerAgent();46 PageConsoleAgent(InstrumentingAgents*, InspectorAgent*, InspectorState*, InjectedScriptManager*, InspectorDOMAgent*); 47 virtual ~PageConsoleAgent(); 49 48 50 49 private: 51 virtual void startListeningScriptDebugServer();52 virtual void stopListeningScriptDebugServer();53 virtual PageScriptDebugServer& scriptDebugServer();50 virtual void clearMessages(ErrorString*); 51 virtual void addInspectedNode(ErrorString*, int nodeId); 52 virtual bool developerExtrasEnabled(); 54 53 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);56 Page* const m_inspectedPage;54 InspectorAgent* m_inspectorAgent; 55 InspectorDOMAgent* m_inspectorDOMAgent; 57 56 }; 58 57 59 58 } // namespace WebCore 60 59 61 #endif // ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)60 #endif // ENABLE(INSPECTOR) 62 61 63 #endif // !defined(Page DebuggerAgent_h)62 #endif // !defined(PageConsoleAgent_h) -
trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp
- Property svn:executable deleted
-
trunk/Source/WebCore/inspector/PageDebuggerAgent.h
- Property svn:executable deleted
-
trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef PageDebuggerAgent_h 32 #define PageDebuggerAgent_h 31 #include "config.h" 33 32 34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 35 #include "InspectorDebuggerAgent.h" 36 #include "PageScriptDebugServer.h" 33 #include "PageRuntimeAgent.h" 34 35 #if ENABLE(INSPECTOR) 36 37 #include "InspectorPageAgent.h" 38 #include "Page.h" 39 #include "ScriptState.h" 37 40 38 41 namespace WebCore { 39 42 40 class Page; 41 class PageScriptDebugServer; 43 PageRuntimeAgent::PageRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, Page* page, InspectorPageAgent* pageAgent) 44 : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager) 45 , m_inspectedPage(page) 46 , m_pageAgent(pageAgent) 47 { 48 } 42 49 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 46 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 48 virtual ~PageDebuggerAgent(); 50 PageRuntimeAgent::~PageRuntimeAgent() 51 { 52 } 49 53 50 private: 51 virtual void startListeningScriptDebugServer(); 52 virtual void stopListeningScriptDebugServer(); 53 virtual PageScriptDebugServer& scriptDebugServer(); 54 ScriptState* PageRuntimeAgent::scriptStateForFrameId(const String& frameId) 55 { 56 Frame* frame = m_pageAgent->frameForId(frameId); 57 if (!frame) 58 return 0; 59 return mainWorldScriptState(frame); 60 } 54 61 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 56 Page* const m_inspectedPage; 57 }; 62 ScriptState* PageRuntimeAgent::getDefaultInspectedState() 63 { 64 return mainWorldScriptState(m_inspectedPage->mainFrame()); 65 } 58 66 59 67 } // namespace WebCore 60 68 61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 62 63 #endif // !defined(PageDebuggerAgent_h) 69 #endif // ENABLE(INSPECTOR) -
trunk/Source/WebCore/inspector/PageRuntimeAgent.h
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef Page DebuggerAgent_h32 #define Page DebuggerAgent_h31 #ifndef PageRuntimeAgent_h 32 #define PageRuntimeAgent_h 33 33 34 #if ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)35 #include "InspectorDebuggerAgent.h" 36 #include " PageScriptDebugServer.h"34 #if ENABLE(INSPECTOR) 35 36 #include "InspectorRuntimeAgent.h" 37 37 38 38 namespace WebCore { 39 39 40 class InspectorPageAgent; 40 41 class Page; 41 class PageScriptDebugServer;42 42 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 43 class PageRuntimeAgent : public InspectorRuntimeAgent { 46 44 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);48 virtual ~Page DebuggerAgent();45 PageRuntimeAgent(InstrumentingAgents*, InjectedScriptManager*, Page*, InspectorPageAgent*); 46 virtual ~PageRuntimeAgent(); 49 47 50 48 private: 51 virtual void startListeningScriptDebugServer(); 52 virtual void stopListeningScriptDebugServer(); 53 virtual PageScriptDebugServer& scriptDebugServer(); 54 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 56 Page* const m_inspectedPage; 49 virtual ScriptState* scriptStateForFrameId(const String& frameId); 50 virtual ScriptState* getDefaultInspectedState(); 51 Page* m_inspectedPage; 52 InspectorPageAgent* m_pageAgent; 57 53 }; 58 54 59 55 } // namespace WebCore 60 56 61 #endif // ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)57 #endif // ENABLE(INSPECTOR) 62 58 63 #endif // !defined( PageDebuggerAgent_h)59 #endif // !defined(InspectorPagerAgent_h) -
trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef PageDebuggerAgent_h 32 #define PageDebuggerAgent_h 31 #include "config.h" 33 32 34 #i f ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)35 #include "InspectorDebuggerAgent.h" 36 #i nclude "PageScriptDebugServer.h"33 #include "WorkerConsoleAgent.h" 34 35 #if ENABLE(INSPECTOR) 37 36 38 37 namespace WebCore { 39 38 40 class Page; 41 class PageScriptDebugServer; 39 WorkerConsoleAgent::WorkerConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, InjectedScriptManager* injectedScriptManager) 40 : InspectorConsoleAgent(instrumentingAgents, state, injectedScriptManager) 41 { 42 } 42 43 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 46 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 48 virtual ~PageDebuggerAgent(); 44 WorkerConsoleAgent::~WorkerConsoleAgent() 45 { 46 } 49 47 50 private: 51 virtual void startListeningScriptDebugServer(); 52 virtual void stopListeningScriptDebugServer();53 virtual PageScriptDebugServer& scriptDebugServer(); 48 void WorkerConsoleAgent::addInspectedNode(ErrorString* error, int) 49 { 50 *error = "addInspectedNode is not supported for workers"; 51 } 54 52 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 56 Page* const m_inspectedPage; 57 }; 53 bool WorkerConsoleAgent::developerExtrasEnabled() 54 { 55 return true; 56 } 58 57 59 58 } // namespace WebCore 60 59 61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 62 63 #endif // !defined(PageDebuggerAgent_h) 60 #endif // ENABLE(INSPECTOR) -
trunk/Source/WebCore/inspector/WorkerConsoleAgent.h
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef PageDebuggerAgent_h32 #define PageDebuggerAgent_h31 #ifndef WorkerConsoleAgent_h 32 #define WorkerConsoleAgent_h 33 33 34 #i f ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)35 #include "InspectorDebuggerAgent.h" 36 #i nclude "PageScriptDebugServer.h"34 #include "InspectorConsoleAgent.h" 35 36 #if ENABLE(INSPECTOR) 37 37 38 38 namespace WebCore { 39 39 40 class Page; 41 class PageScriptDebugServer; 42 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 40 class WorkerConsoleAgent : public InspectorConsoleAgent { 41 WTF_MAKE_NONCOPYABLE(WorkerConsoleAgent); 46 42 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);48 virtual ~ PageDebuggerAgent();43 WorkerConsoleAgent(InstrumentingAgents*, InspectorState*, InjectedScriptManager*); 44 virtual ~WorkerConsoleAgent(); 49 45 50 46 private: 51 virtual void startListeningScriptDebugServer(); 52 virtual void stopListeningScriptDebugServer(); 53 virtual PageScriptDebugServer& scriptDebugServer(); 54 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 56 Page* const m_inspectedPage; 47 virtual void addInspectedNode(ErrorString*, int nodeId); 48 virtual bool developerExtrasEnabled(); 57 49 }; 58 50 59 51 } // namespace WebCore 60 52 61 #endif // ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)53 #endif // ENABLE(INSPECTOR) 62 54 63 #endif // !defined( PageDebuggerAgent_h)55 #endif // !defined(WorkerConsoleAgent_h) -
trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp
- Property svn:executable deleted
-
trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h
- Property svn:executable deleted
-
trunk/Source/WebCore/inspector/WorkerInspectorController.cpp
r98237 r101081 41 41 #include "InspectorFrontend.h" 42 42 #include "InspectorFrontendChannel.h" 43 #include "InspectorRuntimeAgent.h"44 43 #include "InspectorState.h" 45 44 #include "InspectorStateClient.h" 46 45 #include "InstrumentingAgents.h" 46 #include "WorkerConsoleAgent.h" 47 47 #include "WorkerContext.h" 48 48 #include "WorkerDebuggerAgent.h" 49 49 #include "WorkerReportingProxy.h" 50 #include "WorkerRuntimeAgent.h" 50 51 #include "WorkerThread.h" 51 52 #include <wtf/PassOwnPtr.h> … … 54 55 55 56 namespace { 56 57 class WorkerRuntimeAgent : public InspectorRuntimeAgent {58 public:59 WorkerRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, WorkerContext* workerContext)60 : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager)61 , m_workerContext(workerContext) { }62 virtual ~WorkerRuntimeAgent() { }63 64 private:65 virtual ScriptState* scriptStateForFrameId(const String&)66 {67 return 0;68 }69 70 virtual ScriptState* getDefaultInspectedState()71 {72 return scriptStateFromWorkerContext(m_workerContext);73 }74 75 WorkerContext* m_workerContext;76 };77 57 78 58 class PageInspectorProxy : public InspectorFrontendChannel { … … 115 95 #endif 116 96 , m_runtimeAgent(adoptPtr(new WorkerRuntimeAgent(m_instrumentingAgents.get(), m_injectedScriptManager.get(), workerContext))) 97 , m_consoleAgent(adoptPtr(new WorkerConsoleAgent(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()))) 117 98 { 118 99 m_injectedScriptManager->injectedScriptHost()->init(0 -
trunk/Source/WebCore/inspector/WorkerInspectorController.h
r97449 r101081 47 47 #endif 48 48 class InspectorBackendDispatcher; 49 class InspectorConsoleAgent; 49 50 class InspectorFrontend; 50 51 class InspectorFrontendChannel; … … 83 84 #endif 84 85 OwnPtr<InspectorRuntimeAgent> m_runtimeAgent; 86 OwnPtr<InspectorConsoleAgent> m_consoleAgent; 85 87 86 88 OwnPtr<InspectorFrontendChannel> m_frontendChannel; -
trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef PageDebuggerAgent_h 32 #define PageDebuggerAgent_h 31 #include "config.h" 33 32 34 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 35 #include "InspectorDebuggerAgent.h" 36 #include "PageScriptDebugServer.h" 33 #include "WorkerRuntimeAgent.h" 34 35 #if ENABLE(INSPECTOR) 36 37 #include "ScriptState.h" 37 38 38 39 namespace WebCore { 39 40 40 class Page; 41 class PageScriptDebugServer; 41 WorkerRuntimeAgent::WorkerRuntimeAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, WorkerContext* workerContext) 42 : InspectorRuntimeAgent(instrumentingAgents, injectedScriptManager) 43 , m_workerContext(workerContext) 44 { 45 } 42 46 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 46 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 48 virtual ~PageDebuggerAgent(); 47 WorkerRuntimeAgent::~WorkerRuntimeAgent() 48 { 49 } 49 50 50 private: 51 virtual void startListeningScriptDebugServer(); 52 virtual void stopListeningScriptDebugServer();53 virtual PageScriptDebugServer& scriptDebugServer(); 51 ScriptState* WorkerRuntimeAgent::scriptStateForFrameId(const String&) 52 { 53 return 0; 54 } 54 55 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 56 Page* const m_inspectedPage; 57 }; 56 ScriptState* WorkerRuntimeAgent::getDefaultInspectedState() 57 { 58 return scriptStateFromWorkerContext(m_workerContext); 59 } 58 60 59 61 } // namespace WebCore 60 62 61 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 62 63 #endif // !defined(PageDebuggerAgent_h) 63 #endif // ENABLE(INSPECTOR) -
trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h
- Property svn:executable deleted
r101080 r101081 29 29 */ 30 30 31 #ifndef PageDebuggerAgent_h32 #define PageDebuggerAgent_h31 #ifndef WorkerRuntimeAgent_h 32 #define WorkerRuntimeAgent_h 33 33 34 #if ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)35 #include "InspectorDebuggerAgent.h" 36 #include " PageScriptDebugServer.h"34 #if ENABLE(INSPECTOR) 35 36 #include "InspectorRuntimeAgent.h" 37 37 38 38 namespace WebCore { 39 39 40 class Page; 41 class PageScriptDebugServer; 40 class WorkerContext; 42 41 43 class PageDebuggerAgent : public InspectorDebuggerAgent { 44 WTF_MAKE_NONCOPYABLE(PageDebuggerAgent); 45 WTF_MAKE_FAST_ALLOCATED; 42 class WorkerRuntimeAgent : public InspectorRuntimeAgent { 46 43 public: 47 static PassOwnPtr<PageDebuggerAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*);48 virtual ~ PageDebuggerAgent();44 WorkerRuntimeAgent(InstrumentingAgents*, InjectedScriptManager*, WorkerContext*); 45 virtual ~WorkerRuntimeAgent(); 49 46 50 47 private: 51 virtual void startListeningScriptDebugServer(); 52 virtual void stopListeningScriptDebugServer(); 53 virtual PageScriptDebugServer& scriptDebugServer(); 54 55 PageDebuggerAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*); 56 Page* const m_inspectedPage; 48 virtual ScriptState* scriptStateForFrameId(const String& frameId); 49 virtual ScriptState* getDefaultInspectedState(); 50 WorkerContext* m_workerContext; 57 51 }; 58 52 59 53 } // namespace WebCore 60 54 61 #endif // ENABLE( JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)55 #endif // ENABLE(INSPECTOR) 62 56 63 #endif // !defined( PageDebuggerAgent_h)57 #endif // !defined(InspectorPagerAgent_h)
Note: See TracChangeset
for help on using the changeset viewer.