2011-05-05 Ilya Tikhonovsky <loislo@chromium.org>
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 May 2011 13:20:24 +0000 (13:20 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 May 2011 13:20:24 +0000 (13:20 +0000)
        Reviewed by Yury Semikhatsky.

        Web Inspector: rename BrowserDebugger to DOMDebugger.

        https://bugs.webkit.org/show_bug.cgi?id=60256
        InspectorBrowserDebuggerAgent => InspectorDOMDebuggerAgent
        browserDebugger => domDebugger

        * CMakeLists.txt:
        * GNUmakefile.list.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * inspector/CodeGeneratorInspector.pm:
        * inspector/InspectorAgent.cpp:
        (WebCore::InspectorAgent::InspectorAgent):
        (WebCore::InspectorAgent::inspectedPageDestroyed):
        (WebCore::InspectorAgent::disconnectFrontend):
        * inspector/InspectorAgent.h:
        (WebCore::InspectorAgent::DOMDebuggerAgent):
        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::connectFrontend):
        * inspector/InspectorDOMDebuggerAgent.cpp: Renamed from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp.
        (WebCore::InspectorDOMDebuggerAgent::create):
        (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
        (WebCore::InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent):
        (WebCore::InspectorDOMDebuggerAgent::debuggerWasEnabled):
        (WebCore::InspectorDOMDebuggerAgent::debuggerWasDisabled):
        (WebCore::InspectorDOMDebuggerAgent::disable):
        (WebCore::InspectorDOMDebuggerAgent::clearFrontend):
        (WebCore::InspectorDOMDebuggerAgent::discardBindings):
        (WebCore::InspectorDOMDebuggerAgent::setEventListenerBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::removeEventListenerBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::didInsertDOMNode):
        (WebCore::InspectorDOMDebuggerAgent::didRemoveDOMNode):
        (WebCore::InspectorDOMDebuggerAgent::setDOMBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::removeDOMBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::willInsertDOMNode):
        (WebCore::InspectorDOMDebuggerAgent::willRemoveDOMNode):
        (WebCore::InspectorDOMDebuggerAgent::willModifyDOMAttr):
        (WebCore::InspectorDOMDebuggerAgent::descriptionForDOMEvent):
        (WebCore::InspectorDOMDebuggerAgent::hasBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::updateSubtreeBreakpoints):
        (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
        (WebCore::InspectorDOMDebuggerAgent::setXHRBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::removeXHRBreakpoint):
        (WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
        (WebCore::InspectorDOMDebuggerAgent::clear):
        * inspector/InspectorDOMDebuggerAgent.h: Renamed from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h.
        * inspector/InspectorInstrumentation.cpp:
        (WebCore::InspectorInstrumentation::willInsertDOMNodeImpl):
        (WebCore::InspectorInstrumentation::didInsertDOMNodeImpl):
        (WebCore::InspectorInstrumentation::willRemoveDOMNodeImpl):
        (WebCore::InspectorInstrumentation::didRemoveDOMNodeImpl):
        (WebCore::InspectorInstrumentation::willModifyDOMAttrImpl):
        (WebCore::InspectorInstrumentation::willSendXMLHttpRequestImpl):
        (WebCore::InspectorInstrumentation::pauseOnNativeEventIfNeeded):
        * inspector/InstrumentingAgents.h:
        (WebCore::InstrumentingAgents::InstrumentingAgents):
        (WebCore::InstrumentingAgents::inspectorDOMDebuggerAgent):
        (WebCore::InstrumentingAgents::setInspectorDOMDebuggerAgent):
        * inspector/WorkerInspectorController.cpp:
        (WebCore::WorkerInspectorController::connectFrontend):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/inspector/CodeGeneratorInspector.pm
Source/WebCore/inspector/InspectorAgent.cpp
Source/WebCore/inspector/InspectorAgent.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp [moved from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp with 75% similarity]
Source/WebCore/inspector/InspectorDOMDebuggerAgent.h [moved from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h with 84% similarity]
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/WorkerInspectorController.cpp

index 9279b0ff0c20143dcadb32cb56867a07fc52d331..e1bf99503423c1bb0c6e471d2b366113aa45139a 100644 (file)
@@ -887,12 +887,12 @@ SET(WebCore_SOURCES
     inspector/InspectorAgent.cpp
     inspector/InspectorApplicationCacheAgent.cpp
     inspector/InspectorPageAgent.cpp
-    inspector/InspectorBrowserDebuggerAgent.cpp
     inspector/InspectorCSSAgent.cpp
     inspector/InspectorClient.cpp
     inspector/InspectorConsoleAgent.cpp
     inspector/InspectorController.cpp
     inspector/InspectorDOMAgent.cpp
+    inspector/InspectorDOMDebuggerAgent.cpp
     inspector/InspectorDOMStorageAgent.cpp
     inspector/InspectorDOMStorageResource.cpp
     inspector/InspectorDatabaseAgent.cpp
index 7ca88d6077a0b6a4eb9c771adda182b1f2f7ae00..65581b58d90e683b91d249d5f7ac8cc23b78e427 100644 (file)
@@ -1,3 +1,70 @@
+2011-05-05  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: rename BrowserDebugger to DOMDebugger.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60256
+        InspectorBrowserDebuggerAgent => InspectorDOMDebuggerAgent
+        browserDebugger => domDebugger
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent):
+        (WebCore::InspectorAgent::inspectedPageDestroyed):
+        (WebCore::InspectorAgent::disconnectFrontend):
+        * inspector/InspectorAgent.h:
+        (WebCore::InspectorAgent::DOMDebuggerAgent):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::connectFrontend):
+        * inspector/InspectorDOMDebuggerAgent.cpp: Renamed from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp.
+        (WebCore::InspectorDOMDebuggerAgent::create):
+        (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
+        (WebCore::InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent):
+        (WebCore::InspectorDOMDebuggerAgent::debuggerWasEnabled):
+        (WebCore::InspectorDOMDebuggerAgent::debuggerWasDisabled):
+        (WebCore::InspectorDOMDebuggerAgent::disable):
+        (WebCore::InspectorDOMDebuggerAgent::clearFrontend):
+        (WebCore::InspectorDOMDebuggerAgent::discardBindings):
+        (WebCore::InspectorDOMDebuggerAgent::setEventListenerBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::removeEventListenerBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::didInsertDOMNode):
+        (WebCore::InspectorDOMDebuggerAgent::didRemoveDOMNode):
+        (WebCore::InspectorDOMDebuggerAgent::setDOMBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::removeDOMBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::willInsertDOMNode):
+        (WebCore::InspectorDOMDebuggerAgent::willRemoveDOMNode):
+        (WebCore::InspectorDOMDebuggerAgent::willModifyDOMAttr):
+        (WebCore::InspectorDOMDebuggerAgent::descriptionForDOMEvent):
+        (WebCore::InspectorDOMDebuggerAgent::hasBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::updateSubtreeBreakpoints):
+        (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
+        (WebCore::InspectorDOMDebuggerAgent::setXHRBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::removeXHRBreakpoint):
+        (WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
+        (WebCore::InspectorDOMDebuggerAgent::clear):
+        * inspector/InspectorDOMDebuggerAgent.h: Renamed from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h.
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::willInsertDOMNodeImpl):
+        (WebCore::InspectorInstrumentation::didInsertDOMNodeImpl):
+        (WebCore::InspectorInstrumentation::willRemoveDOMNodeImpl):
+        (WebCore::InspectorInstrumentation::didRemoveDOMNodeImpl):
+        (WebCore::InspectorInstrumentation::willModifyDOMAttrImpl):
+        (WebCore::InspectorInstrumentation::willSendXMLHttpRequestImpl):
+        (WebCore::InspectorInstrumentation::pauseOnNativeEventIfNeeded):
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::InstrumentingAgents):
+        (WebCore::InstrumentingAgents::inspectorDOMDebuggerAgent):
+        (WebCore::InstrumentingAgents::setInspectorDOMDebuggerAgent):
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::connectFrontend):
+
 2011-05-04  Yury Semikhatsky  <yurys@chromium.org>
 
         Reviewed by Pavel Feldman.
index ad3126ccb9ef2c3d6f9236d444566db40b14e416..e771d2eed1e04cfd45e8da54cc260333a56cf7e4 100644 (file)
@@ -1909,8 +1909,6 @@ webcore_sources += \
        Source/WebCore/inspector/InspectorAgent.h \
        Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp \
        Source/WebCore/inspector/InspectorApplicationCacheAgent.h \
-       Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp \
-       Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h \
        Source/WebCore/inspector/InspectorClient.cpp \
        Source/WebCore/inspector/InspectorClient.h \
        Source/WebCore/inspector/InspectorController.cpp \
@@ -1929,6 +1927,8 @@ webcore_sources += \
        Source/WebCore/inspector/InspectorDebuggerAgent.h \
        Source/WebCore/inspector/InspectorDOMAgent.cpp \
        Source/WebCore/inspector/InspectorDOMAgent.h \
+       Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp \
+       Source/WebCore/inspector/InspectorDOMDebuggerAgent.h \
        Source/WebCore/inspector/InspectorDOMStorageAgent.cpp \
        Source/WebCore/inspector/InspectorDOMStorageAgent.h \
        Source/WebCore/inspector/InspectorDOMStorageResource.cpp \
index e185af86735144e969b0521255bc6ad2ebcfe6cb..842966aaf5e8dbf352a7f1fcfca90012811ec473 100644 (file)
             'inspector/InspectorAgent.cpp',
             'inspector/InspectorApplicationCacheAgent.cpp',
             'inspector/InspectorApplicationCacheAgent.h',
-            'inspector/InspectorBrowserDebuggerAgent.cpp',
-            'inspector/InspectorBrowserDebuggerAgent.h',
             'inspector/InspectorCSSAgent.cpp',
             'inspector/InspectorCSSAgent.h',
             'inspector/InspectorClient.cpp',
             'inspector/InspectorConsoleInstrumentation.h',
             'inspector/InspectorController.cpp',
             'inspector/InspectorDOMAgent.cpp',
+            'inspector/InspectorDOMDebuggerAgent.cpp',
+            'inspector/InspectorDOMDebuggerAgent.h',
             'inspector/InspectorDOMStorageAgent.cpp',
             'inspector/InspectorDOMStorageAgent.h',
             'inspector/InspectorDOMStorageResource.cpp',
index b3c0561cf08cc6438cb96f61f607143335e3a5fe..d2b5c428a87a2f21f9cea2da76b1786249d2c435 100644 (file)
@@ -805,7 +805,6 @@ SOURCES += \
     inspector/InjectedScriptManager.cpp \
     inspector/InspectorAgent.cpp \
     inspector/InspectorApplicationCacheAgent.cpp \
-    inspector/InspectorBrowserDebuggerAgent.cpp \
     inspector/InspectorCSSAgent.cpp \
     inspector/InspectorClient.cpp \
     inspector/InspectorConsoleAgent.cpp \
@@ -814,6 +813,7 @@ SOURCES += \
     inspector/InspectorDatabaseResource.cpp \
     inspector/InspectorDebuggerAgent.cpp \
     inspector/InspectorDOMAgent.cpp \
+    inspector/InspectorDOMDebuggerAgent.cpp \
     inspector/InspectorDOMStorageAgent.cpp \
     inspector/InspectorDOMStorageResource.cpp \
     inspector/InspectorFrontendClientLocal.cpp \
@@ -1744,7 +1744,6 @@ HEADERS += \
     inspector/InjectedScriptManager.h \
     inspector/InspectorAgent.h \
     inspector/InspectorApplicationCacheAgent.h \
-    inspector/InspectorBrowserDebuggerAgent.h \
     inspector/InspectorConsoleAgent.h \
     inspector/InspectorConsoleInstrumentation.h \
     inspector/InspectorController.h \
@@ -1753,6 +1752,7 @@ HEADERS += \
     inspector/InspectorDatabaseInstrumentation.h \
     inspector/InspectorDatabaseResource.h \
     inspector/InspectorDebuggerAgent.h \
+    inspector/InspectorDOMDebuggerAgent.h \
     inspector/InspectorDOMStorageAgent.h \
     inspector/InspectorDOMStorageResource.h \
     inspector/InspectorFrontendChannel.h \
index e53bdf62840e0b617ef0518677b481ca38fbf4cc..9ab104a16b5e528c7c3a012f32141c7806c9411b 100755 (executable)
                                RelativePath="..\inspector\InspectorApplicationCacheAgent.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\inspector\InspectorBrowserDebuggerAgent.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\inspector\InspectorBrowserDebuggerAgent.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\inspector\InspectorClient.cpp"
                                >
                                RelativePath="..\inspector\InspectorDOMAgent.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\inspector\InspectorDOMDebuggerAgent.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\inspector\InspectorDOMDebuggerAgent.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\inspector\InspectorDOMStorageAgent.cpp"
                                >
index d0cf696aec0d16d4ac5983e6f56ef52908445de0..02421b5e891993420683f4b1c3dcbecec178cf25 100644 (file)
                F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */; };
                F3D461481161D53200CA0D09 /* JSErrorHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */; };
                F3D461491161D53200CA0D09 /* JSErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D461471161D53200CA0D09 /* JSErrorHandler.h */; };
-               F3D4C47812E07663003DA150 /* InspectorBrowserDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D4C47612E07663003DA150 /* InspectorBrowserDebuggerAgent.cpp */; };
-               F3D4C47912E07663003DA150 /* InspectorBrowserDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D4C47712E07663003DA150 /* InspectorBrowserDebuggerAgent.h */; };
+               F3D4C47812E07663003DA150 /* InspectorDOMDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D4C47612E07663003DA150 /* InspectorDOMDebuggerAgent.cpp */; };
+               F3D4C47912E07663003DA150 /* InspectorDOMDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D4C47712E07663003DA150 /* InspectorDOMDebuggerAgent.h */; };
                F3F5CF1112ED81A80084C569 /* InspectorConsoleInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F5CF1012ED81A80084C569 /* InspectorConsoleInstrumentation.h */; };
                F3F5CF1312ED81B30084C569 /* InspectorDatabaseInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F5CF1212ED81B30084C569 /* InspectorDatabaseInstrumentation.h */; };
                F4EAF4AE10C742B1009100D3 /* OpenTypeSanitizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4EAF4AC10C742B1009100D3 /* OpenTypeSanitizer.cpp */; };
                F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstrumentingAgents.h; sourceTree = "<group>"; };
                F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorHandler.cpp; sourceTree = "<group>"; };
                F3D461471161D53200CA0D09 /* JSErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorHandler.h; sourceTree = "<group>"; };
-               F3D4C47612E07663003DA150 /* InspectorBrowserDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBrowserDebuggerAgent.cpp; sourceTree = "<group>"; };
-               F3D4C47712E07663003DA150 /* InspectorBrowserDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBrowserDebuggerAgent.h; sourceTree = "<group>"; };
+               F3D4C47612E07663003DA150 /* InspectorDOMDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMDebuggerAgent.cpp; sourceTree = "<group>"; };
+               F3D4C47712E07663003DA150 /* InspectorDOMDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMDebuggerAgent.h; sourceTree = "<group>"; };
                F3F5CF1012ED81A80084C569 /* InspectorConsoleInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorConsoleInstrumentation.h; sourceTree = "<group>"; };
                F3F5CF1212ED81B30084C569 /* InspectorDatabaseInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseInstrumentation.h; sourceTree = "<group>"; };
                F4EAF4AC10C742B1009100D3 /* OpenTypeSanitizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenTypeSanitizer.cpp; path = opentype/OpenTypeSanitizer.cpp; sourceTree = "<group>"; };
                                4F2D205212EAE7B3005C2874 /* InspectorAgent.h */,
                                B885E8D211E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp */,
                                B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */,
-                               F3D4C47612E07663003DA150 /* InspectorBrowserDebuggerAgent.cpp */,
-                               F3D4C47712E07663003DA150 /* InspectorBrowserDebuggerAgent.h */,
                                7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
                                1C81B9580E97330800266E07 /* InspectorClient.h */,
                                F3335BF612E07DC300D33011 /* InspectorConsoleAgent.cpp */,
                                F33F053C120B0DA500E5743A /* InspectorDebuggerAgent.h */,
                                7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */,
                                7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */,
+                               F3D4C47612E07663003DA150 /* InspectorDOMDebuggerAgent.cpp */,
+                               F3D4C47712E07663003DA150 /* InspectorDOMDebuggerAgent.h */,
                                7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */,
                                7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */,
                                41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
                                4F2D205412EAE7B3005C2874 /* InspectorAgent.h in Headers */,
                                B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
                                4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */,
-                               F3D4C47912E07663003DA150 /* InspectorBrowserDebuggerAgent.h in Headers */,
                                1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
                                F3335BF912E07DC300D33011 /* InspectorConsoleAgent.h in Headers */,
                                F3F5CF1112ED81A80084C569 /* InspectorConsoleInstrumentation.h in Headers */,
                                41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */,
                                F33F053E120B0DA500E5743A /* InspectorDebuggerAgent.h in Headers */,
                                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
+                               F3D4C47912E07663003DA150 /* InspectorDOMDebuggerAgent.h in Headers */,
                                7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
                                41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
                                227777601345DEA9008EA455 /* InspectorFrontendChannel.h in Headers */,
                                4F2D205512EAE7B3005C2874 /* InspectorAgent.cpp in Sources */,
                                B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
                                4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */,
-                               F3D4C47812E07663003DA150 /* InspectorBrowserDebuggerAgent.cpp in Sources */,
                                7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
                                F3335BF812E07DC300D33011 /* InspectorConsoleAgent.cpp in Sources */,
                                1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
                                41F062150F5F192600A07EAC /* InspectorDatabaseResource.cpp in Sources */,
                                F33F053D120B0DA500E5743A /* InspectorDebuggerAgent.cpp in Sources */,
                                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
+                               F3D4C47812E07663003DA150 /* InspectorDOMDebuggerAgent.cpp in Sources */,
                                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
                                41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
                                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
index 8e84df25f86b798f81395ff026ed0e485f76dcee..c8d7c2e73ac53282b91012b65ce133467302aedc 100644 (file)
@@ -36,9 +36,9 @@ $typeTransform{"Debugger"} = {
     "domainAccessor" => "m_debuggerAgent",
 };
 $typeTransform{"DOMDebugger"} = {
-    "forward" => "InspectorBrowserDebuggerAgent",
-    "header" => "InspectorBrowserDebuggerAgent.h",
-    "domainAccessor" => "m_browserDebuggerAgent",
+    "forward" => "InspectorDOMDebuggerAgent",
+    "header" => "InspectorDOMDebuggerAgent.h",
+    "domainAccessor" => "m_domDebuggerAgent",
 };
 $typeTransform{"Database"} = {
     "forward" => "InspectorDatabaseAgent",
index 0941ab723759e889e1677216d10d74cb9b51bdc4..7230e012bb13848c181feb272aee5126bf66da9c 100644 (file)
@@ -39,7 +39,7 @@
 #include "GraphicsContext.h"
 #include "InjectedScriptHost.h"
 #include "InjectedScriptManager.h"
-#include "InspectorBrowserDebuggerAgent.h"
+#include "InspectorDOMDebuggerAgent.h"
 #include "InspectorCSSAgent.h"
 #include "InspectorClient.h"
 #include "InspectorConsoleAgent.h"
@@ -131,7 +131,7 @@ InspectorAgent::InspectorAgent(Page* page, InspectorClient* client, InjectedScri
     , m_consoleAgent(adoptPtr(new InspectorConsoleAgent(m_instrumentingAgents.get(), this, m_state.get(), injectedScriptManager, m_domAgent.get())))
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     , m_debuggerAgent(PageDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), page, injectedScriptManager))
-    , m_browserDebuggerAgent(InspectorBrowserDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_domAgent.get(), m_debuggerAgent.get(), this))
+    , m_domDebuggerAgent(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_domAgent.get(), m_debuggerAgent.get(), this))
     , m_profilerAgent(InspectorProfilerAgent::create(m_instrumentingAgents.get(), m_consoleAgent.get(), page, m_state.get()))
 #endif
 #if ENABLE(WORKERS)
@@ -172,7 +172,7 @@ void InspectorAgent::inspectedPageDestroyed()
     }
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    m_browserDebuggerAgent.clear();
+    m_domDebuggerAgent.clear();
     m_debuggerAgent.clear();
 #endif
 
@@ -280,7 +280,7 @@ void InspectorAgent::disconnectFrontend()
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     m_debuggerAgent->clearFrontend();
-    m_browserDebuggerAgent->clearFrontend();
+    m_domDebuggerAgent->clearFrontend();
     m_profilerAgent->clearFrontend();
 #endif
 
index 55bcb5ad8a752d881139f5a67cd4d4f141cb210e..509ad70fbfa8c5387d94a47b0df04c56170ee94e 100644 (file)
@@ -50,7 +50,7 @@ class HTTPHeaderMap;
 class InjectedScript;
 class InjectedScriptManager;
 class InspectorArray;
-class InspectorBrowserDebuggerAgent;
+class InspectorDOMDebuggerAgent;
 class InspectorClient;
 class InspectorConsoleAgent;
 class InspectorCSSAgent;
@@ -133,7 +133,7 @@ public:
     InspectorDOMStorageAgent* domStorageAgent() { return m_domStorageAgent.get(); }
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    InspectorBrowserDebuggerAgent* browserDebuggerAgent() const { return m_browserDebuggerAgent.get(); }
+    InspectorDOMDebuggerAgent* domDebuggerAgent() const { return m_domDebuggerAgent.get(); }
     InspectorDebuggerAgent* debuggerAgent() const { return m_debuggerAgent.get(); }
     InspectorProfilerAgent* profilerAgent() const { return m_profilerAgent.get(); }
 #endif
@@ -220,7 +220,7 @@ private:
     String m_inspectorExtensionAPI;
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     OwnPtr<InspectorDebuggerAgent> m_debuggerAgent;
-    OwnPtr<InspectorBrowserDebuggerAgent> m_browserDebuggerAgent;
+    OwnPtr<InspectorDOMDebuggerAgent> m_domDebuggerAgent;
     OwnPtr<InspectorProfilerAgent> m_profilerAgent;
 #endif
 #if ENABLE(WORKERS)
index 5c37b2645bfe1a68bf2324b609cf017703cca753..5f23c5a17f1975ef37b2f5acb7a2120d6b753b6a 100644 (file)
@@ -39,7 +39,6 @@
 #include "InjectedScriptManager.h"
 #include "InspectorAgent.h"
 #include "InspectorBackendDispatcher.h"
-#include "InspectorBrowserDebuggerAgent.h"
 #include "InspectorDebuggerAgent.h"
 #include "InspectorClient.h"
 #include "InspectorDOMAgent.h"
@@ -123,7 +122,7 @@ void InspectorController::connectFrontend()
         m_inspectorAgent->consoleAgent(),
         m_inspectorAgent->domAgent(),
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-        m_inspectorAgent->browserDebuggerAgent(),
+        m_inspectorAgent->domDebuggerAgent(),
 #endif
 #if ENABLE(DOM_STORAGE)
         m_inspectorAgent->domStorageAgent(),
similarity index 75%
rename from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp
rename to Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
index 1cf2a252c16b5155aef4e7ba2de4434958a30b31..c3e6a98cf20d110a3b14361f1729e0fd6dd19136 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#include "InspectorBrowserDebuggerAgent.h"
+#include "InspectorDOMDebuggerAgent.h"
 
 #if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
 
@@ -63,18 +63,18 @@ const int domBreakpointDerivedTypeShift = 16;
 
 namespace WebCore {
 
-namespace BrowserDebuggerAgentState {
+namespace DOMDebuggerAgentState {
 static const char eventListenerBreakpoints[] = "eventListenerBreakpoints";
 static const char pauseOnAllXHRs[] = "pauseOnAllXHRs";
 static const char xhrBreakpoints[] = "xhrBreakpoints";
 }
 
-PassOwnPtr<InspectorBrowserDebuggerAgent> InspectorBrowserDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
+PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
 {
-    return adoptPtr(new InspectorBrowserDebuggerAgent(instrumentingAgents, inspectorState, domAgent, debuggerAgent, inspectorAgent));
+    return adoptPtr(new InspectorDOMDebuggerAgent(instrumentingAgents, inspectorState, domAgent, debuggerAgent, inspectorAgent));
 }
 
-InspectorBrowserDebuggerAgent::InspectorBrowserDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
+InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
     : m_instrumentingAgents(instrumentingAgents)
     , m_inspectorState(inspectorState)
     , m_domAgent(domAgent)
@@ -84,64 +84,64 @@ InspectorBrowserDebuggerAgent::InspectorBrowserDebuggerAgent(InstrumentingAgents
     m_debuggerAgent->setListener(this);
 }
 
-InspectorBrowserDebuggerAgent::~InspectorBrowserDebuggerAgent()
+InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent()
 {
     m_debuggerAgent->setListener(0);
-    ASSERT(!m_instrumentingAgents->inspectorBrowserDebuggerAgent());
+    ASSERT(!m_instrumentingAgents->inspectorDOMDebuggerAgent());
 }
 
 // Browser debugger agent enabled only when JS debugger is enabled.
-void InspectorBrowserDebuggerAgent::debuggerWasEnabled()
+void InspectorDOMDebuggerAgent::debuggerWasEnabled()
 {
-    m_instrumentingAgents->setInspectorBrowserDebuggerAgent(this);
+    m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
 }
 
-void InspectorBrowserDebuggerAgent::debuggerWasDisabled()
+void InspectorDOMDebuggerAgent::debuggerWasDisabled()
 {
     disable();
 }
 
-void InspectorBrowserDebuggerAgent::disable()
+void InspectorDOMDebuggerAgent::disable()
 {
-    m_instrumentingAgents->setInspectorBrowserDebuggerAgent(0);
+    m_instrumentingAgents->setInspectorDOMDebuggerAgent(0);
     clear();
 }
 
-void InspectorBrowserDebuggerAgent::clearFrontend()
+void InspectorDOMDebuggerAgent::clearFrontend()
 {
     disable();
 }
 
-void InspectorBrowserDebuggerAgent::discardBindings()
+void InspectorDOMDebuggerAgent::discardBindings()
 {
     m_domBreakpoints.clear();
 }
 
-void InspectorBrowserDebuggerAgent::setEventListenerBreakpoint(ErrorString* error, const String& eventName)
+void InspectorDOMDebuggerAgent::setEventListenerBreakpoint(ErrorString* error, const String& eventName)
 {
     if (eventName.isEmpty()) {
         *error = "Event name is empty";
         return;
     }
 
-    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::eventListenerBreakpoints);
+    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
     eventListenerBreakpoints->setBoolean(eventName, true);
-    m_inspectorState->setObject(BrowserDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints);
+    m_inspectorState->setObject(DOMDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints);
 }
 
-void InspectorBrowserDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const String& eventName)
+void InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const String& eventName)
 {
     if (eventName.isEmpty()) {
         *error = "Event name is empty";
         return;
     }
 
-    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::eventListenerBreakpoints);
+    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
     eventListenerBreakpoints->remove(eventName);
-    m_inspectorState->setObject(BrowserDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints);
+    m_inspectorState->setObject(DOMDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints);
 }
 
-void InspectorBrowserDebuggerAgent::didInsertDOMNode(Node* node)
+void InspectorDOMDebuggerAgent::didInsertDOMNode(Node* node)
 {
     if (m_domBreakpoints.size()) {
         uint32_t mask = m_domBreakpoints.get(InspectorDOMAgent::innerParentNode(node));
@@ -151,7 +151,7 @@ void InspectorBrowserDebuggerAgent::didInsertDOMNode(Node* node)
     }
 }
 
-void InspectorBrowserDebuggerAgent::didRemoveDOMNode(Node* node)
+void InspectorDOMDebuggerAgent::didRemoveDOMNode(Node* node)
 {
     if (m_domBreakpoints.size()) {
         // Remove subtree breakpoints.
@@ -169,7 +169,7 @@ void InspectorBrowserDebuggerAgent::didRemoveDOMNode(Node* node)
     }
 }
 
-void InspectorBrowserDebuggerAgent::setDOMBreakpoint(ErrorString*, int nodeId, int type)
+void InspectorDOMDebuggerAgent::setDOMBreakpoint(ErrorString*, int nodeId, int type)
 {
     Node* node = m_domAgent->nodeForId(nodeId);
     if (!node)
@@ -183,7 +183,7 @@ void InspectorBrowserDebuggerAgent::setDOMBreakpoint(ErrorString*, int nodeId, i
     }
 }
 
-void InspectorBrowserDebuggerAgent::removeDOMBreakpoint(ErrorString*, int nodeId, int type)
+void InspectorDOMDebuggerAgent::removeDOMBreakpoint(ErrorString*, int nodeId, int type)
 {
     Node* node = m_domAgent->nodeForId(nodeId);
     if (!node)
@@ -202,7 +202,7 @@ void InspectorBrowserDebuggerAgent::removeDOMBreakpoint(ErrorString*, int nodeId
     }
 }
 
-void InspectorBrowserDebuggerAgent::willInsertDOMNode(Node*, Node* parent)
+void InspectorDOMDebuggerAgent::willInsertDOMNode(Node*, Node* parent)
 {
     InspectorDebuggerAgent* debuggerAgent = m_debuggerAgent;
     if (!debuggerAgent)
@@ -216,7 +216,7 @@ void InspectorBrowserDebuggerAgent::willInsertDOMNode(Node*, Node* parent)
     }
 }
 
-void InspectorBrowserDebuggerAgent::willRemoveDOMNode(Node* node)
+void InspectorDOMDebuggerAgent::willRemoveDOMNode(Node* node)
 {
     InspectorDebuggerAgent* debuggerAgent = m_debuggerAgent;
     if (!debuggerAgent)
@@ -236,7 +236,7 @@ void InspectorBrowserDebuggerAgent::willRemoveDOMNode(Node* node)
     }
 }
 
-void InspectorBrowserDebuggerAgent::willModifyDOMAttr(Element* element)
+void InspectorDOMDebuggerAgent::willModifyDOMAttr(Element* element)
 {
     InspectorDebuggerAgent* debuggerAgent = m_debuggerAgent;
     if (!debuggerAgent)
@@ -250,7 +250,7 @@ void InspectorBrowserDebuggerAgent::willModifyDOMAttr(Element* element)
     }
 }
 
-void InspectorBrowserDebuggerAgent::descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, InspectorObject* description)
+void InspectorDOMDebuggerAgent::descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, InspectorObject* description)
 {
     ASSERT(hasBreakpoint(target, breakpointType));
 
@@ -280,14 +280,14 @@ void InspectorBrowserDebuggerAgent::descriptionForDOMEvent(Node* target, int bre
     description->setNumber("type", breakpointType);
 }
 
-bool InspectorBrowserDebuggerAgent::hasBreakpoint(Node* node, int type)
+bool InspectorDOMDebuggerAgent::hasBreakpoint(Node* node, int type)
 {
     uint32_t rootBit = 1 << type;
     uint32_t derivedBit = rootBit << domBreakpointDerivedTypeShift;
     return m_domBreakpoints.get(node) & (rootBit | derivedBit);
 }
 
-void InspectorBrowserDebuggerAgent::updateSubtreeBreakpoints(Node* node, uint32_t rootMask, bool set)
+void InspectorDOMDebuggerAgent::updateSubtreeBreakpoints(Node* node, uint32_t rootMask, bool set)
 {
     uint32_t oldMask = m_domBreakpoints.get(node);
     uint32_t derivedMask = rootMask << domBreakpointDerivedTypeShift;
@@ -305,14 +305,14 @@ void InspectorBrowserDebuggerAgent::updateSubtreeBreakpoints(Node* node, uint32_
         updateSubtreeBreakpoints(child, newRootMask, set);
 }
 
-void InspectorBrowserDebuggerAgent::pauseOnNativeEventIfNeeded(const String& categoryType, const String& eventName, bool synchronous)
+void InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded(const String& categoryType, const String& eventName, bool synchronous)
 {
     InspectorDebuggerAgent* debuggerAgent = m_debuggerAgent;
     if (!debuggerAgent)
         return;
 
     String fullEventName = makeString(categoryType, ":", eventName);
-    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::eventListenerBreakpoints);
+    RefPtr<InspectorObject> eventListenerBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
     if (eventListenerBreakpoints->find(fullEventName) == eventListenerBreakpoints->end())
         return;
 
@@ -325,41 +325,41 @@ void InspectorBrowserDebuggerAgent::pauseOnNativeEventIfNeeded(const String& cat
         debuggerAgent->schedulePauseOnNextStatement(NativeBreakpointDebuggerEventType, eventData.release());
 }
 
-void InspectorBrowserDebuggerAgent::setXHRBreakpoint(ErrorString*, const String& url)
+void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString*, const String& url)
 {
     if (url.isEmpty()) {
-        m_inspectorState->setBoolean(BrowserDebuggerAgentState::pauseOnAllXHRs, true);
+        m_inspectorState->setBoolean(DOMDebuggerAgentState::pauseOnAllXHRs, true);
         return;
     }
 
-    RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::xhrBreakpoints);
+    RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::xhrBreakpoints);
     xhrBreakpoints->setBoolean(url, true);
-    m_inspectorState->setObject(BrowserDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
+    m_inspectorState->setObject(DOMDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
 }
 
-void InspectorBrowserDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
+void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
 {
     if (url.isEmpty()) {
-        m_inspectorState->setBoolean(BrowserDebuggerAgentState::pauseOnAllXHRs, false);
+        m_inspectorState->setBoolean(DOMDebuggerAgentState::pauseOnAllXHRs, false);
         return;
     }
 
-    RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::xhrBreakpoints);
+    RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::xhrBreakpoints);
     xhrBreakpoints->remove(url);
-    m_inspectorState->setObject(BrowserDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
+    m_inspectorState->setObject(DOMDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
 }
 
-void InspectorBrowserDebuggerAgent::willSendXMLHttpRequest(const String& url)
+void InspectorDOMDebuggerAgent::willSendXMLHttpRequest(const String& url)
 {
     InspectorDebuggerAgent* debuggerAgent = m_debuggerAgent;
     if (!debuggerAgent)
         return;
 
     String breakpointURL;
-    if (m_inspectorState->getBoolean(BrowserDebuggerAgentState::pauseOnAllXHRs))
+    if (m_inspectorState->getBoolean(DOMDebuggerAgentState::pauseOnAllXHRs))
         breakpointURL = "";
     else {
-        RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::xhrBreakpoints);
+        RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(DOMDebuggerAgentState::xhrBreakpoints);
         for (InspectorObject::iterator it = xhrBreakpoints->begin(); it != xhrBreakpoints->end(); ++it) {
             if (url.contains(it->first)) {
                 breakpointURL = it->first;
@@ -378,7 +378,7 @@ void InspectorBrowserDebuggerAgent::willSendXMLHttpRequest(const String& url)
     debuggerAgent->breakProgram(NativeBreakpointDebuggerEventType, eventData.release());
 }
 
-void InspectorBrowserDebuggerAgent::clear()
+void InspectorDOMDebuggerAgent::clear()
 {
     m_domBreakpoints.clear();
 }
similarity index 84%
rename from Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
rename to Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
index add0c05c5d51bb3e94209edcaefa22518a8e725d..4ce935e2013b00f3d510f3b4f772abf1fbb92774 100644 (file)
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef InspectorBrowserDebuggerAgent_h
-#define InspectorBrowserDebuggerAgent_h
+#ifndef InspectorDOMDebuggerAgent_h
+#define InspectorDOMDebuggerAgent_h
 
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 
@@ -53,16 +53,16 @@ class Node;
 
 typedef String ErrorString;
 
-class InspectorBrowserDebuggerAgent : public InspectorDebuggerAgent::Listener {
-    WTF_MAKE_NONCOPYABLE(InspectorBrowserDebuggerAgent);
+class InspectorDOMDebuggerAgent : public InspectorDebuggerAgent::Listener {
+    WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
 public:
-    static PassOwnPtr<InspectorBrowserDebuggerAgent> create(InstrumentingAgents*, InspectorState*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
+    static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorState*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
 
-    virtual ~InspectorBrowserDebuggerAgent();
+    virtual ~InspectorDOMDebuggerAgent();
 
     void clearFrontend();
 
-    // BrowserDebugger API for InspectorFrontend
+    // DOMDebugger API for InspectorFrontend
     void setXHRBreakpoint(ErrorString*, const String& url);
     void removeXHRBreakpoint(ErrorString*, const String& url);
     void setEventListenerBreakpoint(ErrorString*, const String& eventName);
@@ -80,7 +80,7 @@ public:
     void pauseOnNativeEventIfNeeded(const String& categoryType, const String& eventName, bool synchronous);
 
 private:
-    InspectorBrowserDebuggerAgent(InstrumentingAgents*, InspectorState*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
+    InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorState*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
 
     // InspectorDebuggerAgent::Listener implementation.
     virtual void debuggerWasEnabled();
@@ -106,4 +106,4 @@ private:
 
 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorBrowserDebuggerAgent_h)
+#endif // !defined(InspectorDOMDebuggerAgent_h)
index b02c13752691fdfb2a061522455e733d7fd28e08..2ae9972f578478059bdbb7007d6f599dbd20ce97 100644 (file)
@@ -40,7 +40,7 @@
 #include "EventContext.h"
 #include "InspectorAgent.h"
 #include "InspectorApplicationCacheAgent.h"
-#include "InspectorBrowserDebuggerAgent.h"
+#include "InspectorDOMDebuggerAgent.h"
 #include "InspectorCSSAgent.h"
 #include "InspectorConsoleAgent.h"
 #include "InspectorDatabaseAgent.h"
@@ -107,8 +107,8 @@ void InspectorInstrumentation::inspectedPageDestroyedImpl(InspectorAgent* inspec
 void InspectorInstrumentation::willInsertDOMNodeImpl(InspectorAgent* inspectorAgent, Node* node, Node* parent)
 {
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->willInsertDOMNode(node, parent);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->willInsertDOMNode(node, parent);
 #endif
 }
 
@@ -117,24 +117,24 @@ void InspectorInstrumentation::didInsertDOMNodeImpl(InspectorAgent* inspectorAge
     if (InspectorDOMAgent* domAgent = inspectorAgent->domAgent())
         domAgent->didInsertDOMNode(node);
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->didInsertDOMNode(node);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->didInsertDOMNode(node);
 #endif
 }
 
 void InspectorInstrumentation::willRemoveDOMNodeImpl(InspectorAgent* inspectorAgent, Node* node)
 {
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->willRemoveDOMNode(node);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->willRemoveDOMNode(node);
 #endif
 }
 
 void InspectorInstrumentation::didRemoveDOMNodeImpl(InspectorAgent* inspectorAgent, Node* node)
 {
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->didRemoveDOMNode(node);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->didRemoveDOMNode(node);
 #endif
     if (InspectorDOMAgent* domAgent = inspectorAgent->domAgent())
         domAgent->didRemoveDOMNode(node);
@@ -143,8 +143,8 @@ void InspectorInstrumentation::didRemoveDOMNodeImpl(InspectorAgent* inspectorAge
 void InspectorInstrumentation::willModifyDOMAttrImpl(InspectorAgent* inspectorAgent, Element* element)
 {
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->willModifyDOMAttr(element);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->willModifyDOMAttr(element);
 #endif
 }
 
@@ -182,8 +182,8 @@ void InspectorInstrumentation::characterDataModifiedImpl(InspectorAgent* inspect
 void InspectorInstrumentation::willSendXMLHttpRequestImpl(InspectorAgent* inspectorAgent, const String& url)
 {
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->willSendXMLHttpRequest(url);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->willSendXMLHttpRequest(url);
 #endif
 }
 
@@ -775,8 +775,8 @@ bool InspectorInstrumentation::hasFrontend(InspectorAgent* inspectorAgent)
 void InspectorInstrumentation::pauseOnNativeEventIfNeeded(InspectorAgent* inspectorAgent, const String& categoryType, const String& eventName, bool synchronous)
 {
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorBrowserDebuggerAgent* browserDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorBrowserDebuggerAgent())
-        browserDebuggerAgent->pauseOnNativeEventIfNeeded(categoryType, eventName, synchronous);
+    if (InspectorDOMDebuggerAgent* domDebuggerAgent = inspectorAgent->instrumentingAgents()->inspectorDOMDebuggerAgent())
+        domDebuggerAgent->pauseOnNativeEventIfNeeded(categoryType, eventName, synchronous);
 #endif
 }
 
index 31506f149b424f1f8f5f445312f9ecb7b2d83925..d1b0552f479ea7c34a43ce81acf77499a2f1b410 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 class InspectorAgent;
 class InspectorApplicationCacheAgent;
 class InspectorPageAgent;
-class InspectorBrowserDebuggerAgent;
+class InspectorDOMDebuggerAgent;
 class InspectorCSSAgent;
 class InspectorConsoleAgent;
 class InspectorDOMAgent;
@@ -76,7 +76,7 @@ public:
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         , m_inspectorDebuggerAgent(0)
-        , m_inspectorBrowserDebuggerAgent(0)
+        , m_inspectorDOMDebuggerAgent(0)
         , m_inspectorProfilerAgent(0)
 #endif
 #if ENABLE(WORKERS)
@@ -125,8 +125,8 @@ public:
     InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
     void setInspectorDebuggerAgent(InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
 
-    InspectorBrowserDebuggerAgent* inspectorBrowserDebuggerAgent() const { return m_inspectorBrowserDebuggerAgent; }
-    void setInspectorBrowserDebuggerAgent(InspectorBrowserDebuggerAgent* agent) { m_inspectorBrowserDebuggerAgent = agent; }
+    InspectorDOMDebuggerAgent* inspectorDOMDebuggerAgent() const { return m_inspectorDOMDebuggerAgent; }
+    void setInspectorDOMDebuggerAgent(InspectorDOMDebuggerAgent* agent) { m_inspectorDOMDebuggerAgent = agent; }
 
     InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
     void setInspectorProfilerAgent(InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
@@ -156,7 +156,7 @@ private:
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     InspectorDebuggerAgent* m_inspectorDebuggerAgent;
-    InspectorBrowserDebuggerAgent* m_inspectorBrowserDebuggerAgent;
+    InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
     InspectorProfilerAgent* m_inspectorProfilerAgent;
 #endif
 #if ENABLE(WORKERS)
index dbcb876d7c560b68ca78afbf65cbc9da6d9bfefd..623dec11f80a24670131d16a3a27c86dfb4abc9c 100644 (file)
@@ -104,7 +104,7 @@ void WorkerInspectorController::connectFrontend(InspectorFrontendChannel* channe
         0, // InspectorApplicationCacheAgent
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-        0, // InspectorBrowserDebuggerAgent
+        0, // InspectorDOMDebuggerAgent
 #endif
         0, // InspectorCSSAgent
         0, // InspectorConsoleAgent