Commit 1c50cf22 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

2010-12-29 Pavel Feldman <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: extract Database & DOM Storage
        agents; remove InspectorBackend.
        https://bugs.webkit.org/show_bug.cgi?id=51707

        This change brushes up storage agents + removes redundant
        InspectorBackend class.

        * CMakeLists.txt:
        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * inspector/CodeGeneratorInspector.pm:
        * inspector/InjectedScriptHost.cpp:
        (WebCore::InjectedScriptHost::databaseForId):
        (WebCore::InjectedScriptHost::selectDatabase):
        (WebCore::InjectedScriptHost::selectDOMStorage):
        (WebCore::InjectedScriptHost::inspectorDOMAgent):
        * inspector/Inspector.idl:
        * inspector/InspectorBackend.cpp: Removed.
        * inspector/InspectorBackend.h: Removed.
        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::InspectorController):
        (WebCore::InspectorController::~InspectorController):
        (WebCore::InspectorController::connectFrontend):
        (WebCore::InspectorController::releaseFrontendLifetimeAgents):
        (WebCore::InspectorController::didUseDOMStorage):
        (WebCore::InspectorController::setInjectedScriptSource):
        (WebCore::InspectorController::dispatchOnInjectedScript):
        (WebCore::InspectorController::releaseWrapperObjectGroup):
        * inspector/InspectorController.h:
        * inspector/InspectorDOMStorageAgent.cpp: Added.
        (WebCore::InspectorDOMStorageAgent::~InspectorDOMStorageAgent):
        (WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
        (WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
        (WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
        (WebCore::InspectorDOMStorageAgent::selectDOMStorage):
        (WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent):
        (WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):
        * inspector/InspectorDOMStorageAgent.h: Copied from WebCore/inspector/InspectorStorageAgent.h.
        (WebCore::InspectorDOMStorageAgent::create):
        (WebCore::InspectorDOMStorageAgent::frontend):
        * inspector/InspectorDatabaseAgent.cpp: Renamed from WebCore/inspector/InspectorStorageAgent.cpp.
        (WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
        (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
        (WebCore::InspectorDatabaseAgent::executeSQL):
        (WebCore::InspectorDatabaseAgent::databaseForId):
        (WebCore::InspectorDatabaseAgent::selectDatabase):
        (WebCore::InspectorDatabaseAgent::clearFrontend):
        (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
        * inspector/InspectorDatabaseAgent.h: Renamed from WebCore/inspector/InspectorStorageAgent.h.
        (WebCore::InspectorDatabaseAgent::create):
        (WebCore::InspectorDatabaseAgent::frontend):
        * inspector/InspectorFrontendClientLocal.cpp:
        * inspector/InspectorFrontendClientLocal.h:
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel.prototype.show):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 23251680
......@@ -44,7 +44,7 @@ Tests that InspectorBackendDispatcher is catching incorrect messages.
}
{
seq : 2
domain : "Resources"
domain : "Network"
success : false
errors : {
0 : "Protocol Error: 'arguments' property with type 'object' was not found."
......@@ -52,7 +52,7 @@ Tests that InspectorBackendDispatcher is catching incorrect messages.
}
{
seq : 3
domain : "Resources"
domain : "Network"
success : false
errors : {
0 : "Protocol Error: 'arguments' property with type 'object' was not found."
......@@ -60,7 +60,7 @@ Tests that InspectorBackendDispatcher is catching incorrect messages.
}
{
seq : 4
domain : "Resources"
domain : "Network"
success : false
errors : {
0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
......@@ -70,7 +70,7 @@ Tests that InspectorBackendDispatcher is catching incorrect messages.
}
{
seq : 5
domain : "Resources"
domain : "Network"
success : false
errors : {
0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
......
......@@ -1153,12 +1153,13 @@ SET(WebCore_SOURCES
inspector/InjectedScript.cpp
inspector/InjectedScriptHost.cpp
inspector/InspectorApplicationCacheAgent.cpp
inspector/InspectorBackend.cpp
inspector/InspectorCSSAgent.cpp
inspector/InspectorClient.cpp
inspector/InspectorController.cpp
inspector/InspectorDOMAgent.cpp
inspector/InspectorDOMStorageAgent.cpp
inspector/InspectorDOMStorageResource.cpp
inspector/InspectorDatabaseAgent.cpp
inspector/InspectorDatabaseResource.cpp
inspector/InspectorDebuggerAgent.cpp
inspector/InspectorFileSystemAgent.cpp
......@@ -1170,7 +1171,6 @@ SET(WebCore_SOURCES
inspector/InspectorStyleSheet.cpp
inspector/InspectorValues.cpp
inspector/InspectorState.cpp
inspector/InspectorStorageAgent.cpp
inspector/InspectorTimelineAgent.cpp
inspector/ScriptArguments.cpp
inspector/ScriptBreakpoint.cpp
......
2010-12-29 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: extract Database & DOM Storage
agents; remove InspectorBackend.
https://bugs.webkit.org/show_bug.cgi?id=51707
This change brushes up storage agents + removes redundant
InspectorBackend class.
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* inspector/CodeGeneratorInspector.pm:
* inspector/InjectedScriptHost.cpp:
(WebCore::InjectedScriptHost::databaseForId):
(WebCore::InjectedScriptHost::selectDatabase):
(WebCore::InjectedScriptHost::selectDOMStorage):
(WebCore::InjectedScriptHost::inspectorDOMAgent):
* inspector/Inspector.idl:
* inspector/InspectorBackend.cpp: Removed.
* inspector/InspectorBackend.h: Removed.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::~InspectorController):
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::releaseFrontendLifetimeAgents):
(WebCore::InspectorController::didUseDOMStorage):
(WebCore::InspectorController::setInjectedScriptSource):
(WebCore::InspectorController::dispatchOnInjectedScript):
(WebCore::InspectorController::releaseWrapperObjectGroup):
* inspector/InspectorController.h:
* inspector/InspectorDOMStorageAgent.cpp: Added.
(WebCore::InspectorDOMStorageAgent::~InspectorDOMStorageAgent):
(WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
(WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::selectDOMStorage):
(WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent):
(WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):
* inspector/InspectorDOMStorageAgent.h: Copied from WebCore/inspector/InspectorStorageAgent.h.
(WebCore::InspectorDOMStorageAgent::create):
(WebCore::InspectorDOMStorageAgent::frontend):
* inspector/InspectorDatabaseAgent.cpp: Renamed from WebCore/inspector/InspectorStorageAgent.cpp.
(WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
(WebCore::InspectorDatabaseAgent::executeSQL):
(WebCore::InspectorDatabaseAgent::databaseForId):
(WebCore::InspectorDatabaseAgent::selectDatabase):
(WebCore::InspectorDatabaseAgent::clearFrontend):
(WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
* inspector/InspectorDatabaseAgent.h: Renamed from WebCore/inspector/InspectorStorageAgent.h.
(WebCore::InspectorDatabaseAgent::create):
(WebCore::InspectorDatabaseAgent::frontend):
* inspector/InspectorFrontendClientLocal.cpp:
* inspector/InspectorFrontendClientLocal.h:
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.show):
2010-12-29 Tony Gentilcore <tonyg@chromium.org>
Reviewed by Eric Seidel.
......
......@@ -1945,20 +1945,22 @@ webcore_sources += \
WebCore/inspector/InjectedScriptHost.h \
WebCore/inspector/InspectorApplicationCacheAgent.cpp \
WebCore/inspector/InspectorApplicationCacheAgent.h \
WebCore/inspector/InspectorBackend.cpp \
WebCore/inspector/InspectorBackend.h \
WebCore/inspector/InspectorClient.cpp \
WebCore/inspector/InspectorClient.h \
WebCore/inspector/InspectorController.cpp \
WebCore/inspector/InspectorController.h \
WebCore/inspector/InspectorCSSAgent.cpp \
WebCore/inspector/InspectorCSSAgent.h \
WebCore/inspector/InspectorDatabaseAgent.cpp \
WebCore/inspector/InspectorDatabaseAgent.h \
WebCore/inspector/InspectorDatabaseResource.cpp \
WebCore/inspector/InspectorDatabaseResource.h \
WebCore/inspector/InspectorDebuggerAgent.cpp \
WebCore/inspector/InspectorDebuggerAgent.h \
WebCore/inspector/InspectorDOMAgent.cpp \
WebCore/inspector/InspectorDOMAgent.h \
WebCore/inspector/InspectorDOMStorageAgent.cpp \
WebCore/inspector/InspectorDOMStorageAgent.h \
WebCore/inspector/InspectorDOMStorageResource.cpp \
WebCore/inspector/InspectorDOMStorageResource.h \
WebCore/inspector/InspectorFileSystemAgent.cpp \
......@@ -1976,8 +1978,6 @@ webcore_sources += \
WebCore/inspector/InspectorResourceAgent.h \
WebCore/inspector/InspectorState.cpp \
WebCore/inspector/InspectorState.h \
WebCore/inspector/InspectorStorageAgent.cpp \
WebCore/inspector/InspectorStorageAgent.h \
WebCore/inspector/InspectorStyleSheet.cpp \
WebCore/inspector/InspectorStyleSheet.h \
WebCore/inspector/InspectorTimelineAgent.cpp \
......
......@@ -1999,20 +1999,22 @@
'inspector/InjectedScriptHost.h',
'inspector/InspectorApplicationCacheAgent.cpp',
'inspector/InspectorApplicationCacheAgent.h',
'inspector/InspectorBackend.cpp',
'inspector/InspectorBackend.h',
'inspector/InspectorClient.cpp',
'inspector/InspectorClient.h',
'inspector/InspectorController.cpp',
'inspector/InspectorController.h',
'inspector/InspectorCSSAgent.cpp',
'inspector/InspectorCSSAgent.h',
'inspector/InspectorDatabaseAgent.cpp',
'inspector/InspectorDatabaseAgent.h',
'inspector/InspectorDatabaseResource.cpp',
'inspector/InspectorDatabaseResource.h',
'inspector/InspectorDebuggerAgent.cpp',
'inspector/InspectorDebuggerAgent.h',
'inspector/InspectorDOMAgent.cpp',
'inspector/InspectorDOMAgent.h',
'inspector/InspectorDOMStorageAgent.cpp',
'inspector/InspectorDOMStorageAgent.h',
'inspector/InspectorDOMStorageResource.cpp',
'inspector/InspectorDOMStorageResource.h',
'inspector/InspectorFileSystemAgent.cpp',
......@@ -2028,8 +2030,6 @@
'inspector/InspectorResourceAgent.h',
'inspector/InspectorState.cpp',
'inspector/InspectorState.h',
'inspector/InspectorStorageAgent.cpp',
'inspector/InspectorStorageAgent.h',
'inspector/InspectorStyleSheet.cpp',
'inspector/InspectorStyleSheet.h',
'inspector/InspectorTimelineAgent.cpp',
......
......@@ -1039,13 +1039,14 @@ SOURCES += \
inspector/InjectedScript.cpp \
inspector/InjectedScriptHost.cpp \
inspector/InspectorApplicationCacheAgent.cpp \
inspector/InspectorBackend.cpp \
inspector/InspectorCSSAgent.cpp \
inspector/InspectorClient.cpp \
inspector/InspectorController.cpp \
inspector/InspectorDatabaseAgent.cpp \
inspector/InspectorDatabaseResource.cpp \
inspector/InspectorDebuggerAgent.cpp \
inspector/InspectorDOMAgent.cpp \
inspector/InspectorDOMStorageAgent.cpp \
inspector/InspectorDOMStorageResource.cpp \
inspector/InspectorFileSystemAgent.cpp \
inspector/InspectorFrontendClientLocal.cpp \
......@@ -1054,7 +1055,6 @@ SOURCES += \
inspector/InspectorProfilerAgent.cpp \
inspector/InspectorResourceAgent.cpp \
inspector/InspectorState.cpp \
inspector/InspectorStorageAgent.cpp \
inspector/InspectorStyleSheet.cpp \
inspector/InspectorTimelineAgent.cpp \
inspector/InspectorValues.cpp \
......@@ -1930,11 +1930,12 @@ HEADERS += \
inspector/InjectedScript.h \
inspector/InjectedScriptHost.h \
inspector/InspectorApplicationCacheAgent.h \
inspector/InspectorBackend.h \
inspector/InspectorController.h \
inspector/InspectorCSSAgent.h \
inspector/InspectorDatabaseAgent.h \
inspector/InspectorDatabaseResource.h \
inspector/InspectorDebuggerAgent.h \
inspector/InspectorDOMStorageAgent.h \
inspector/InspectorDOMStorageResource.h \
inspector/InspectorFileSystemAgent.h \
inspector/InspectorFrontendClient.h \
......@@ -1944,7 +1945,6 @@ HEADERS += \
inspector/InspectorProfilerAgent.h \
inspector/InspectorResourceAgent.h \
inspector/InspectorState.h \
inspector/InspectorStorageAgent.h \
inspector/InspectorStyleSheet.h \
inspector/InspectorTimelineAgent.h \
inspector/ScriptGCEventListener.h \
......
......@@ -65093,14 +65093,6 @@
RelativePath="..\inspector\InspectorApplicationCacheAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorBackend.cpp"
>
</File>
<File
RelativePath="..\inspector\InspectorBackend.h"
>
</File>
<File
RelativePath="..\inspector\InspectorClient.cpp"
>
......@@ -65125,6 +65117,14 @@
RelativePath="..\inspector\InspectorCSSAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorDatabaseAgent.cpp"
>
</File>
<File
RelativePath="..\inspector\InspectorDatabaseAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorDatabaseResource.cpp"
>
......@@ -65149,6 +65149,14 @@
RelativePath="..\inspector\InspectorDOMAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorDOMStorageAgent.cpp"
>
</File>
<File
RelativePath="..\inspector\InspectorDOMStorageAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorDOMStorageResource.cpp"
>
......@@ -65217,14 +65225,6 @@
RelativePath="..\inspector\InspectorState.h"
>
</File>
<File
RelativePath="..\inspector\InspectorStorageAgent.cpp"
>
</File>
<File
RelativePath="..\inspector\InspectorStorageAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorStyleSheet.cpp"
>
......@@ -1604,11 +1604,11 @@
7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; };
7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */; };
7A74ECBA101839A600BF939E /* InspectorBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */; };
7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorBackend.h */; };
7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */; };
7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */; };
7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; };
7AB0B1C01211A62200A76940 /* InspectorStorageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB0B1BE1211A62200A76940 /* InspectorStorageAgent.cpp */; };
7AB0B1C11211A62200A76940 /* InspectorStorageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB0B1BF1211A62200A76940 /* InspectorStorageAgent.h */; };
7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */; };
7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */; };
7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; };
7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -7989,11 +7989,11 @@
7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMAgent.h; sourceTree = "<group>"; };
7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; };
7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroupLoadDeferrer.h; sourceTree = "<group>"; };
7A74ECB8101839A500BF939E /* InspectorBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackend.cpp; sourceTree = "<group>"; };
7A74ECB9101839A600BF939E /* InspectorBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackend.h; sourceTree = "<group>"; };
7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMStorageAgent.cpp; sourceTree = "<group>"; };
7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMStorageAgent.h; sourceTree = "<group>"; };
7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; };
7AB0B1BE1211A62200A76940 /* InspectorStorageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorStorageAgent.cpp; sourceTree = "<group>"; };
7AB0B1BF1211A62200A76940 /* InspectorStorageAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorStorageAgent.h; sourceTree = "<group>"; };
7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseAgent.cpp; sourceTree = "<group>"; };
7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseAgent.h; sourceTree = "<group>"; };
7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; };
7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; };
7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; };
......@@ -12800,20 +12800,22 @@
7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */,
B885E8D211E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp */,
B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */,
7A74ECB8101839A500BF939E /* InspectorBackend.cpp */,
7A74ECB9101839A600BF939E /* InspectorBackend.h */,
7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
1C81B9580E97330800266E07 /* InspectorClient.h */,
1C81B9570E97330800266E07 /* InspectorController.cpp */,
1C81B9560E97330800266E07 /* InspectorController.h */,
82AB1741124B99EC00C5069D /* InspectorCSSAgent.cpp */,
82AB1742124B99EC00C5069D /* InspectorCSSAgent.h */,
7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */,
7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */,
41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */,
41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */,
F33F053B120B0DA500E5743A /* InspectorDebuggerAgent.cpp */,
F33F053C120B0DA500E5743A /* InspectorDebuggerAgent.h */,
7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */,
7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */,
7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */,
7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */,
41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */,
......@@ -12832,8 +12834,6 @@
82AB1772125C826700C5069D /* InspectorResourceAgent.h */,
4FA3B908125CD12100300BAD /* InspectorState.cpp */,
4FA3B909125CD12200300BAD /* InspectorState.h */,
7AB0B1BE1211A62200A76940 /* InspectorStorageAgent.cpp */,
7AB0B1BF1211A62200A76940 /* InspectorStorageAgent.h */,
82AB176F125C826700C5069D /* InspectorStyleSheet.cpp */,
82AB1770125C826700C5069D /* InspectorStyleSheet.h */,
754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */,
......@@ -20657,14 +20657,15 @@
93309DF0099E64920056E581 /* InsertParagraphSeparatorCommand.h in Headers */,
93309DF2099E64920056E581 /* InsertTextCommand.h in Headers */,
B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */,
4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */,
1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
1C81B95A0E97330800266E07 /* InspectorController.h in Headers */,
82AB1744124B99EC00C5069D /* InspectorCSSAgent.h in Headers */,
7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */,
41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */,
F33F053E120B0DA500E5743A /* InspectorDebuggerAgent.h in Headers */,
7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */,
F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
......@@ -20674,7 +20675,6 @@
9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */,
82AB1776125C826700C5069D /* InspectorResourceAgent.h in Headers */,
4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */,
7AB0B1C11211A62200A76940 /* InspectorStorageAgent.h in Headers */,
82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */,
......@@ -23381,14 +23381,15 @@
93309DEF099E64920056E581 /* InsertParagraphSeparatorCommand.cpp in Sources */,
93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */,
B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
7A74ECBA101839A600BF939E /* InspectorBackend.cpp in Sources */,
4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */,
7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
82AB1743124B99EC00C5069D /* InspectorCSSAgent.cpp in Sources */,
7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */,
41F062150F5F192600A07EAC /* InspectorDatabaseResource.cpp in Sources */,
F33F053D120B0DA500E5743A /* InspectorDebuggerAgent.cpp in Sources */,
7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */,
4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
......@@ -23398,7 +23399,6 @@
9F0D6B2E121BFEBA006C0288 /* InspectorProfilerAgent.cpp in Sources */,
82AB1775125C826700C5069D /* InspectorResourceAgent.cpp in Sources */,
4FA3B90A125CD12200300BAD /* InspectorState.cpp in Sources */,
7AB0B1C01211A62200A76940 /* InspectorStorageAgent.cpp in Sources */,
82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */,
......@@ -10,72 +10,64 @@ use Class::Struct;
use File::stat;
my %typeTransform;
$typeTransform{"InspectorClient"} = {
"forward" => "InspectorClient",
"header" => "InspectorClient.h",
};
$typeTransform{"Backend"} = {
"forward" => "InspectorBackend",
"header" => "InspectorBackend.h",
"domainAccessor" => "m_inspectorController->inspectorBackend()",
$typeTransform{"ApplicationCache"} = {
"forward" => "InspectorApplicationCacheAgent",
"header" => "InspectorApplicationCacheAgent.h",
"domainAccessor" => "m_inspectorController->m_applicationCacheAgent",
};
$typeTransform{"Inspector"} = {
"forwardHeader" => "InspectorController.h",
"domainAccessor" => "m_inspectorController",
$typeTransform{"CSS"} = {
"forward" => "InspectorCSSAgent",
"header" => "InspectorCSSAgent.h",
"domainAccessor" => "m_inspectorController->m_cssAgent",
};
$typeTransform{"Debugger"} = {
"forward" => "InspectorDebuggerAgent",
"header" => "InspectorDebuggerAgent.h",
"domainAccessor" => "m_inspectorController->debuggerAgent()",
};
$typeTransform{"Resources"} = {
"forward" => "InspectorResourceAgent",
"header" => "InspectorResourceAgent.h",
"domainAccessor" => "m_inspectorController->m_resourceAgent",
};
$typeTransform{"Network"} = {
"forward" => "InspectorResourceAgent",
"header" => "InspectorResourceAgent.h",
"domainAccessor" => "m_inspectorController->m_resourceAgent",
};
$typeTransform{"DOMStorage"} = {
"forwardHeader" => "InspectorController.h",
"domainAccessor" => "m_inspectorController",
"domainAccessor" => "m_inspectorController->m_debuggerAgent",
};
$typeTransform{"Database"} = {
"forward" => "InspectorBackend",
"header" => "InspectorBackend.h",
"domainAccessor" => "m_inspectorController->inspectorBackend()",
"forward" => "InspectorDatabaseAgent",
"header" => "InspectorDatabaseAgent.h",
"domainAccessor" => "m_inspectorController->m_databaseAgent",
};
$typeTransform{"DOM"} = {
"forward" => "InspectorDOMAgent",
"header" => "InspectorDOMAgent.h",
"domainAccessor" => "m_inspectorController->domAgent()",
};
$typeTransform{"CSS"} = {
"forward" => "InspectorCSSAgent",
"header" => "InspectorCSSAgent.h",
"domainAccessor" => "m_inspectorController->cssAgent()",
"domainAccessor" => "m_inspectorController->m_domAgent",
};
$typeTransform{"ApplicationCache"} = {
"forward" => "InspectorApplicationCacheAgent",
"header" => "InspectorApplicationCacheAgent.h",
"domainAccessor" => "m_inspectorController->applicationCacheAgent()",
$typeTransform{"DOMStorage"} = {
"forward" => "InspectorDOMStorageAgent",
"header" => "InspectorDOMStorageAgent.h",
"domainAccessor" => "m_inspectorController->m_domStorageAgent",
};
$typeTransform{"FileSystem"} = {
"forward" => "InspectorFileSystemAgent",
"header" => "InspectorFileSystemAgent.h",
"domainAccessor" => "m_inspectorController->fileSystemAgent()",
"domainAccessor" => "m_inspectorController->m_fileSystemAgent",
};
$typeTransform{"Inspector"} = {
"forwardHeader" => "InspectorController.h",
"domainAccessor" => "m_inspectorController",
};
$typeTransform{"Network"} = {
"forward" => "InspectorResourceAgent",
"header" => "InspectorResourceAgent.h",
"domainAccessor" => "m_inspectorController->m_resourceAgent",
};
$typeTransform{"Profiler"} = {
"forward" => "InspectorProfilerAgent",
"header" => "InspectorProfilerAgent.h",
"domainAccessor" => "m_inspectorController->profilerAgent()",
"domainAccessor" => "m_inspectorController->m_profilerAgent",
};
$typeTransform{"Frontend"} = {
"forward" => "InspectorFrontend",
"header" => "InspectorFrontend.h",
};
$typeTransform{"InspectorClient"} = {
"forward" => "InspectorClient",
"header" => "InspectorClient.h",
};
$typeTransform{"PassRefPtr"} = {
"forwardHeader" => "wtf/PassRefPtr.h",
};
......
......@@ -30,6 +30,8 @@
#include "config.h"
#include "InjectedScriptHost.h"
#include "InspectorDatabaseAgent.h"
#include "InspectorDOMStorageAgent.h"
#if ENABLE(INSPECTOR)
......@@ -120,23 +122,23 @@ long InjectedScriptHost::inspectedNode(unsigned long num)
#if ENABLE(DATABASE)
Database* InjectedScriptHost::databaseForId(long databaseId)
{
if (m_inspectorController)
return m_inspectorController->databaseForId(databaseId);
if (m_inspectorController && m_inspectorController->m_databaseAgent)
return m_inspectorController->m_databaseAgent->databaseForId(databaseId);
return 0;
}
void InjectedScriptHost::selectDatabase(Database* database)
{
if (m_inspectorController)
m_inspectorController->selectDatabase(database);
if (m_inspectorController && m_inspectorController->m_databaseAgent)
m_inspectorController->m_databaseAgent->selectDatabase(database);
}
#endif
#if ENABLE(DOM_STORAGE)
void InjectedScriptHost::selectDOMStorage(Storage* storage)
{
if (m_inspectorController)
m_inspectorController->selectDOMStorage(storage);
if (m_inspectorController && m_inspectorController->m_domStorageAgent)
m_inspectorController->m_domStorageAgent->selectDOMStorage(storage);
}
#endif
......@@ -170,7 +172,7 @@ InspectorDOMAgent* InjectedScriptHost::inspectorDOMAgent()
{
if (!m_inspectorController)
return 0;
return m_inspectorController->domAgent();
return m_inspectorController->m_domAgent.get();
}
InspectorFrontend* InjectedScriptHost::frontend()
......
......@@ -36,12 +36,12 @@ module core {
// generic Inspector's methods
///////////////////////////////////////////////////////////////////////
[domain=Backend] void setInjectedScriptSource(in String scriptSource);
// HUGE FIXME: we need to expose InjectedScript methods here. Or document InjectedScript capabilities.
[domain=Backend] void dispatchOnInjectedScript(in long injectedScriptId, in String methodName, in String arguments, out Value result, out boolean isException);
[domain=Inspector] void setInjectedScriptSource(in String scriptSource);
[domain=Inspector] void dispatchOnInjectedScript(in long injectedScriptId, in String methodName, in String arguments, out Value result, out boolean isException);
[domain=Inspector] void addScriptToEvaluateOnLoad(in String scriptSource);
[domain=Inspector] void removeAllScriptsToEvaluateOnLoad();
[domain=Backend] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
[domain=Inspector] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
[domain=Inspector] void getInspectorState(out Object state);
[domain=Inspector] void setMonitoringXHREnabled(in boolean enable, out boolean newState);
[domain=Inspector] void reloadPage();
......@@ -69,6 +69,9 @@ module core {
[domain=Inspector] void setExtraHeaders(in Object headers);
[domain=Inspector] void getCookies(out Array cookies, out String cookiesString);
[domain=Inspector] void deleteCookie(in String cookieName, in String domain);
///////////////////////////////////////////////////////////////////////
// Console API
///////////////////////////////////////////////////////////////////////
......@@ -84,6 +87,10 @@ module core {
// Network API
///////////////////////////////////////////////////////////////////////
[domain=Network] void cachedResources(out Object resources);
[domain=Network] void resourceContent(in unsigned long frameId, in String url, in boolean base64Encode, out String content);
[notify, domain=Network] void frameDetachedFromParent(out unsigned long frameId);
[notify, domain=Network] void identifierForInitialRequest(out long identifier, out String url, out Object loader, out Value callStack);
[notify, domain=Network] void willSendRequest(out long identifier, out double time, out Object request, out Object redirectResponse);
[notify, domain=Network] void markResourceAsCached(out long identifier);
......@@ -99,18 +106,12 @@ module core {
[notify, domain=Network] void didReceiveWebSocketHandshakeResponse(out unsigned long identifier, out double time, out Object response);
[notify, domain=Network] void didCloseWebSocket(out unsigned long identifier, out double time);
#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
///////////////////////////////////////////////////////////////////////
// Resources API
// Database API
///////////////////////////////////////////////////////////////////////
[domain=Resources] void cachedResources(out Object resources);
[domain=Resources] void resourceContent(in unsigned long frameId, in String url, in boolean base64Encode, out String content);
[notify, domain=Resources] void frameDetachedFromParent(out unsigned long frameId);
// FIXME: Introduce new StorageDomain.
[domain=Inspector] void getCookies(out Array cookies, out String cookiesString);
[domain=Inspector] void deleteCookie(in String cookieName, in String domain);
#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
[notify, domain=Database] void addDatabase(out Object database);
[notify, domain=Database] void selectDatabase(out int databaseId);
[domain=Database] void getDatabaseTableNames(in long databaseId, out Array tableNames);
......@@ -118,7 +119,13 @@ module core {
[notify, domain=Database] void sqlTransactionSucceeded(out long transactionId, out Value columnNames, out Value values);
[notify, domain=Database] void sqlTransactionFailed(out long transactionId, out Value sqlError);
#endif
#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
///////////////////////////////////////////////////////////////////////
// DOM Storage API
///////////////////////////////////////////////////////////////////////
[domain=DOMStorage] void getDOMStorageEntries(in long storageId, out Array entries);
[domain=DOMStorage] void setDOMStorageItem(in long storageId, in String key, in String value, out boolean success);
[domain=DOMStorage] void removeDOMStorageItem(in long storageId, in String key, out boolean success);
......@@ -126,12 +133,24 @@ module core {
[notify, domain=DOMStorage] void updateDOMStorage(out int storageId);
[notify, domain=DOMStorage] void selectDOMStorage(out int storageId);
#endif
#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
///////////////////////////////////////////////////////////////////////
// AppCache API
///////////////////////////////////////////////////////////////////////