Changeset 74785 in webkit


Ignore:
Timestamp:
Dec 29, 2010 11:41:53 PM (13 years ago)
Author:
pfeldman@chromium.org
Message:

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/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.show): (WebInspector.ScriptsPanel.prototype.attachDebuggerWhenShown): (WebInspector.ScriptsPanel.prototype._toggleDebugging):
Location:
trunk
Files:
1 added
2 deleted
15 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/inspector/report-protocol-errors-expected.txt

    r74761 r74785  
    4545{
    4646    seq : 2
    47     domain : "Resources"
     47    domain : "Network"
    4848    success : false
    4949    errors : {
    … …  
    5353{
    5454    seq : 3
    55     domain : "Resources"
     55    domain : "Network"
    5656    success : false
    5757    errors : {
    … …  
    6161{
    6262    seq : 4
    63     domain : "Resources"
     63    domain : "Network"
    6464    success : false
    6565    errors : {
    … …  
    7171{
    7272    seq : 5
    73     domain : "Resources"
     73    domain : "Network"
    7474    success : false
    7575    errors : {

  • trunk/WebCore/CMakeLists.txt

    r74761 r74785  
    11541154    inspector/InjectedScriptHost.cpp
    11551155    inspector/InspectorApplicationCacheAgent.cpp
    1156     inspector/InspectorBackend.cpp
    11571156    inspector/InspectorCSSAgent.cpp
    11581157    inspector/InspectorClient.cpp
    11591158    inspector/InspectorController.cpp
    11601159    inspector/InspectorDOMAgent.cpp
     1160    inspector/InspectorDOMStorageAgent.cpp
    11611161    inspector/InspectorDOMStorageResource.cpp
     1162    inspector/InspectorDatabaseAgent.cpp
    11621163    inspector/InspectorDatabaseResource.cpp
    11631164    inspector/InspectorDebuggerAgent.cpp
    … …  
    11711172    inspector/InspectorValues.cpp
    11721173    inspector/InspectorState.cpp
    1173     inspector/InspectorStorageAgent.cpp
    11741174    inspector/InspectorTimelineAgent.cpp
    11751175    inspector/ScriptArguments.cpp

  • trunk/WebCore/ChangeLog

    r74783 r74785  
     12010-12-29  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: extract Database & DOM Storage agents; remove InspectorBackend.
     6        https://bugs.webkit.org/show_bug.cgi?id=51707
     7
     8        This change brushes up storage agents + removes redundant InspectorBackend class.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.am:
     12        * WebCore.gypi:
     13        * WebCore.pro:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * inspector/CodeGeneratorInspector.pm:
     17        * inspector/InjectedScriptHost.cpp:
     18        (WebCore::InjectedScriptHost::databaseForId):
     19        (WebCore::InjectedScriptHost::selectDatabase):
     20        (WebCore::InjectedScriptHost::selectDOMStorage):
     21        (WebCore::InjectedScriptHost::inspectorDOMAgent):
     22        * inspector/Inspector.idl:
     23        * inspector/InspectorBackend.cpp: Removed.
     24        * inspector/InspectorBackend.h: Removed.
     25        * inspector/InspectorController.cpp:
     26        (WebCore::InspectorController::InspectorController):
     27        (WebCore::InspectorController::~InspectorController):
     28        (WebCore::InspectorController::connectFrontend):
     29        (WebCore::InspectorController::releaseFrontendLifetimeAgents):
     30        (WebCore::InspectorController::didUseDOMStorage):
     31        (WebCore::InspectorController::setInjectedScriptSource):
     32        (WebCore::InspectorController::dispatchOnInjectedScript):
     33        (WebCore::InspectorController::releaseWrapperObjectGroup):
     34        * inspector/InspectorController.h:
     35        * inspector/InspectorDOMStorageAgent.cpp: Added.
     36        (WebCore::InspectorDOMStorageAgent::~InspectorDOMStorageAgent):
     37        (WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
     38        (WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
     39        (WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
     40        (WebCore::InspectorDOMStorageAgent::selectDOMStorage):
     41        (WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent):
     42        (WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):
     43        * inspector/InspectorDOMStorageAgent.h: Copied from WebCore/inspector/InspectorStorageAgent.h.
     44        (WebCore::InspectorDOMStorageAgent::create):
     45        (WebCore::InspectorDOMStorageAgent::frontend):
     46        * inspector/InspectorDatabaseAgent.cpp: Renamed from WebCore/inspector/InspectorStorageAgent.cpp.
     47        (WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
     48        (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
     49        (WebCore::InspectorDatabaseAgent::executeSQL):
     50        (WebCore::InspectorDatabaseAgent::databaseForId):
     51        (WebCore::InspectorDatabaseAgent::selectDatabase):
     52        (WebCore::InspectorDatabaseAgent::clearFrontend):
     53        (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
     54        * inspector/InspectorDatabaseAgent.h: Renamed from WebCore/inspector/InspectorStorageAgent.h.
     55        (WebCore::InspectorDatabaseAgent::create):
     56        (WebCore::InspectorDatabaseAgent::frontend):
     57        * inspector/front-end/ScriptsPanel.js:
     58        (WebInspector.ScriptsPanel.prototype.show):
     59        (WebInspector.ScriptsPanel.prototype.attachDebuggerWhenShown):
     60        (WebInspector.ScriptsPanel.prototype._toggleDebugging):
     61
    1622010-12-29  Dirk Schulze  <krit@webkit.org>
    263

  • trunk/WebCore/GNUmakefile.am

    r74766 r74785  
    19311931        WebCore/inspector/InspectorApplicationCacheAgent.cpp \
    19321932        WebCore/inspector/InspectorApplicationCacheAgent.h \
    1933         WebCore/inspector/InspectorBackend.cpp \
    1934         WebCore/inspector/InspectorBackend.h \
    19351933        WebCore/inspector/InspectorClient.cpp \
    19361934        WebCore/inspector/InspectorClient.h \
    … …  
    19391937        WebCore/inspector/InspectorCSSAgent.cpp \
    19401938        WebCore/inspector/InspectorCSSAgent.h \
     1939        WebCore/inspector/InspectorDatabaseAgent.cpp \
     1940        WebCore/inspector/InspectorDatabaseAgent.h \
    19411941        WebCore/inspector/InspectorDatabaseResource.cpp \
    19421942        WebCore/inspector/InspectorDatabaseResource.h \
    … …  
    19451945        WebCore/inspector/InspectorDOMAgent.cpp \
    19461946        WebCore/inspector/InspectorDOMAgent.h \
     1947        WebCore/inspector/InspectorDOMStorageAgent.cpp \
     1948        WebCore/inspector/InspectorDOMStorageAgent.h \
    19471949        WebCore/inspector/InspectorDOMStorageResource.cpp \
    19481950        WebCore/inspector/InspectorDOMStorageResource.h \
    … …  
    19621964        WebCore/inspector/InspectorState.cpp \
    19631965        WebCore/inspector/InspectorState.h \
    1964         WebCore/inspector/InspectorStorageAgent.cpp \
    1965         WebCore/inspector/InspectorStorageAgent.h \
    19661966        WebCore/inspector/InspectorStyleSheet.cpp \
    19671967        WebCore/inspector/InspectorStyleSheet.h \

  • trunk/WebCore/WebCore.gypi

    r74761 r74785  
    20002000            'inspector/InspectorApplicationCacheAgent.cpp',
    20012001            'inspector/InspectorApplicationCacheAgent.h',
    2002             'inspector/InspectorBackend.cpp',
    2003             'inspector/InspectorBackend.h',
    20042002            'inspector/InspectorClient.cpp',
    20052003            'inspector/InspectorClient.h',
    … …  
    20082006            'inspector/InspectorCSSAgent.cpp',
    20092007            'inspector/InspectorCSSAgent.h',
     2008            'inspector/InspectorDatabaseAgent.cpp',
     2009            'inspector/InspectorDatabaseAgent.h',
    20102010            'inspector/InspectorDatabaseResource.cpp',
    20112011            'inspector/InspectorDatabaseResource.h',
    … …  
    20142014            'inspector/InspectorDOMAgent.cpp',
    20152015            'inspector/InspectorDOMAgent.h',
     2016            'inspector/InspectorDOMStorageAgent.cpp',
     2017            'inspector/InspectorDOMStorageAgent.h',
    20162018            'inspector/InspectorDOMStorageResource.cpp',
    20172019            'inspector/InspectorDOMStorageResource.h',
    … …  
    20292031            'inspector/InspectorState.cpp',
    20302032            'inspector/InspectorState.h',
    2031             'inspector/InspectorStorageAgent.cpp',
    2032             'inspector/InspectorStorageAgent.h',
    20332033            'inspector/InspectorStyleSheet.cpp',
    20342034            'inspector/InspectorStyleSheet.h',

  • trunk/WebCore/WebCore.pro

    r74761 r74785  
    10401040    inspector/InjectedScriptHost.cpp \
    10411041    inspector/InspectorApplicationCacheAgent.cpp \
    1042     inspector/InspectorBackend.cpp \
    10431042    inspector/InspectorCSSAgent.cpp \
    10441043    inspector/InspectorClient.cpp \
    10451044    inspector/InspectorController.cpp \
     1045    inspector/InspectorDatabaseAgent.cpp \
    10461046    inspector/InspectorDatabaseResource.cpp \
    10471047    inspector/InspectorDebuggerAgent.cpp \
    10481048    inspector/InspectorDOMAgent.cpp \
     1049    inspector/InspectorDOMStorageAgent.cpp \
    10491050    inspector/InspectorDOMStorageResource.cpp \
    10501051    inspector/InspectorFileSystemAgent.cpp \
    … …  
    10551056    inspector/InspectorResourceAgent.cpp \
    10561057    inspector/InspectorState.cpp \
    1057     inspector/InspectorStorageAgent.cpp \
    10581058    inspector/InspectorStyleSheet.cpp \
    10591059    inspector/InspectorTimelineAgent.cpp \
    … …  
    19311931    inspector/InjectedScriptHost.h \
    19321932    inspector/InspectorApplicationCacheAgent.h \
    1933     inspector/InspectorBackend.h \
    19341933    inspector/InspectorController.h \
    19351934    inspector/InspectorCSSAgent.h \
     1935    inspector/InspectorDatabaseAgent.h \
    19361936    inspector/InspectorDatabaseResource.h \
    19371937    inspector/InspectorDebuggerAgent.h \
     1938    inspector/InspectorDOMStorageAgent.h \
    19381939    inspector/InspectorDOMStorageResource.h \
    19391940    inspector/InspectorFileSystemAgent.h \
    … …  
    19451946    inspector/InspectorResourceAgent.h \
    19461947    inspector/InspectorState.h \
    1947     inspector/InspectorStorageAgent.h \
    19481948    inspector/InspectorStyleSheet.h \
    19491949    inspector/InspectorTimelineAgent.h \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r74761 r74785  
    6509565095                        </File>
    6509665096                        <File
    65097                                 RelativePath="..\inspector\InspectorBackend.cpp"
    65098                                 >
    65099                         </File>
    65100                         <File
    65101                                 RelativePath="..\inspector\InspectorBackend.h"
    65102                                 >
    65103                         </File>
    65104                         <File
    6510565097                                RelativePath="..\inspector\InspectorClient.cpp"
    6510665098                                >
    … …  
    6512765119                        </File>
    6512865120                        <File
     65121                                RelativePath="..\inspector\InspectorDatabaseAgent.cpp"
     65122                                >
     65123                        </File>
     65124                        <File
     65125                                RelativePath="..\inspector\InspectorDatabaseAgent.h"
     65126                                >
     65127                        </File>
     65128                        <File
    6512965129                                RelativePath="..\inspector\InspectorDatabaseResource.cpp"
    6513065130                                >
    … …  
    6515165151                        </File>
    6515265152                        <File
     65153                                RelativePath="..\inspector\InspectorDOMStorageAgent.cpp"
     65154                                >
     65155                        </File>
     65156                        <File
     65157                                RelativePath="..\inspector\InspectorDOMStorageAgent.h"
     65158                                >
     65159                        </File>
     65160                        <File
    6515365161                                RelativePath="..\inspector\InspectorDOMStorageResource.cpp"
    6515465162                                >
    … …  
    6521665224                        <File
    6521765225                                RelativePath="..\inspector\InspectorState.h"
    65218                                 >
    65219                         </File>
    65220                         <File
    65221                                 RelativePath="..\inspector\InspectorStorageAgent.cpp"
    65222                                 >
    65223                         </File>
    65224                         <File
    65225                                 RelativePath="..\inspector\InspectorStorageAgent.h"
    6522665226                                >
    6522765227                        </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r74764 r74785  
    16051605                7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; };
    16061606                7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */; };
    1607                 7A74ECBA101839A600BF939E /* InspectorBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */; };
    1608                 7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorBackend.h */; };
     1607                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */; };
     1608                7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */; };
    16091609                7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; };
    1610                 7AB0B1C01211A62200A76940 /* InspectorStorageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB0B1BE1211A62200A76940 /* InspectorStorageAgent.cpp */; };
    1611                 7AB0B1C11211A62200A76940 /* InspectorStorageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB0B1BF1211A62200A76940 /* InspectorStorageAgent.h */; };
     1610                7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */; };
     1611                7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */; };
    16121612                7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; };
    16131613                7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    79917991                7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; };
    79927992                7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroupLoadDeferrer.h; sourceTree = "<group>"; };
    7993                 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackend.cpp; sourceTree = "<group>"; };
    7994                 7A74ECB9101839A600BF939E /* InspectorBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackend.h; sourceTree = "<group>"; };
     7993                7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMStorageAgent.cpp; sourceTree = "<group>"; };
     7994                7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMStorageAgent.h; sourceTree = "<group>"; };
    79957995                7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; };
    7996                 7AB0B1BE1211A62200A76940 /* InspectorStorageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorStorageAgent.cpp; sourceTree = "<group>"; };
    7997                 7AB0B1BF1211A62200A76940 /* InspectorStorageAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorStorageAgent.h; sourceTree = "<group>"; };
     7996                7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseAgent.cpp; sourceTree = "<group>"; };
     7997                7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseAgent.h; sourceTree = "<group>"; };
    79987998                7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; };
    79997999                7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; };
    … …  
    1280312803                                B885E8D211E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp */,
    1280412804                                B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */,
    12805                                 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */,
    12806                                 7A74ECB9101839A600BF939E /* InspectorBackend.h */,
    1280712805                                7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
    1280812806                                1C81B9580E97330800266E07 /* InspectorClient.h */,
    … …  
    1281112809                                82AB1741124B99EC00C5069D /* InspectorCSSAgent.cpp */,
    1281212810                                82AB1742124B99EC00C5069D /* InspectorCSSAgent.h */,
     12811                                7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */,
     12812                                7AB0B1BF1211A62200A76940 /* InspectorDatabaseAgent.h */,
    1281312813                                41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */,
    1281412814                                41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */,
    … …  
    1281712817                                7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */,
    1281812818                                7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */,
     12819                                7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */,
     12820                                7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */,
    1281912821                                41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
    1282012822                                41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
    … …  
    1283512837                                4FA3B908125CD12100300BAD /* InspectorState.cpp */,
    1283612838                                4FA3B909125CD12200300BAD /* InspectorState.h */,
    12837                                 7AB0B1BE1211A62200A76940 /* InspectorStorageAgent.cpp */,
    12838                                 7AB0B1BF1211A62200A76940 /* InspectorStorageAgent.h */,
    1283912839                                82AB176F125C826700C5069D /* InspectorStyleSheet.cpp */,
    1284012840                                82AB1770125C826700C5069D /* InspectorStyleSheet.h */,
    … …  
    2071320713                                93309DF2099E64920056E581 /* InsertTextCommand.h in Headers */,
    2071420714                                B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
    20715                                 7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */,
    2071620715                                4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */,
    2071720716                                1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
    2071820717                                1C81B95A0E97330800266E07 /* InspectorController.h in Headers */,
    2071920718                                82AB1744124B99EC00C5069D /* InspectorCSSAgent.h in Headers */,
     20719                                7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */,
    2072020720                                41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */,
    2072120721                                F33F053E120B0DA500E5743A /* InspectorDebuggerAgent.h in Headers */,
    2072220722                                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
     20723                                7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
    2072320724                                41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
    2072420725                                3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */,
    … …  
    2073020731                                82AB1776125C826700C5069D /* InspectorResourceAgent.h in Headers */,
    2073120732                                4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */,
    20732                                 7AB0B1C11211A62200A76940 /* InspectorStorageAgent.h in Headers */,
    2073320733                                82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
    2073420734                                754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
    … …  
    2343023430                                93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */,
    2343123431                                B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
    23432                                 7A74ECBA101839A600BF939E /* InspectorBackend.cpp in Sources */,
    2343323432                                4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */,
    2343423433                                7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
    2343523434                                1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
    2343623435                                82AB1743124B99EC00C5069D /* InspectorCSSAgent.cpp in Sources */,
     23436                                7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */,
    2343723437                                41F062150F5F192600A07EAC /* InspectorDatabaseResource.cpp in Sources */,
    2343823438                                F33F053D120B0DA500E5743A /* InspectorDebuggerAgent.cpp in Sources */,
    2343923439                                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
     23440                                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
    2344023441                                41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
    2344123442                                3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */,
    … …  
    2344723448                                82AB1775125C826700C5069D /* InspectorResourceAgent.cpp in Sources */,
    2344823449                                4FA3B90A125CD12200300BAD /* InspectorState.cpp in Sources */,
    23449                                 7AB0B1C01211A62200A76940 /* InspectorStorageAgent.cpp in Sources */,
    2345023450                                82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
    2345123451                                754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,

  • trunk/WebCore/inspector/CodeGeneratorInspector.pm

    r74761 r74785  
    1111
    1212my %typeTransform;
    13 $typeTransform{"InspectorClient"} = {
    14     "forward" => "InspectorClient",
    15     "header" => "InspectorClient.h",
    16 };
    17 $typeTransform{"Backend"} = {
    18     "forward" => "InspectorBackend",
    19     "header" => "InspectorBackend.h",
    20     "domainAccessor" => "m_inspectorController->inspectorBackend()",
     13$typeTransform{"ApplicationCache"} = {
     14    "forward" => "InspectorApplicationCacheAgent",
     15    "header" => "InspectorApplicationCacheAgent.h",
     16    "domainAccessor" => "m_inspectorController->m_applicationCacheAgent",
     17};
     18$typeTransform{"CSS"} = {
     19    "forward" => "InspectorCSSAgent",
     20    "header" => "InspectorCSSAgent.h",
     21    "domainAccessor" => "m_inspectorController->m_cssAgent",
     22};
     23$typeTransform{"Debugger"} = {
     24    "forward" => "InspectorDebuggerAgent",
     25    "header" => "InspectorDebuggerAgent.h",
     26    "domainAccessor" => "m_inspectorController->m_debuggerAgent",
     27};
     28$typeTransform{"Database"} = {
     29    "forward" => "InspectorDatabaseAgent",
     30    "header" => "InspectorDatabaseAgent.h",
     31    "domainAccessor" => "m_inspectorController->m_databaseAgent",
     32};
     33$typeTransform{"DOM"} = {
     34    "forward" => "InspectorDOMAgent",
     35    "header" => "InspectorDOMAgent.h",
     36    "domainAccessor" => "m_inspectorController->m_domAgent",
     37};
     38$typeTransform{"DOMStorage"} = {
     39    "forward" => "InspectorDOMStorageAgent",
     40    "header" => "InspectorDOMStorageAgent.h",
     41    "domainAccessor" => "m_inspectorController->m_domStorageAgent",
     42};
     43$typeTransform{"FileSystem"} = {
     44    "forward" => "InspectorFileSystemAgent",
     45    "header" => "InspectorFileSystemAgent.h",
     46    "domainAccessor" => "m_inspectorController->m_fileSystemAgent",
    2147};
    2248$typeTransform{"Inspector"} = {
    2349    "forwardHeader" => "InspectorController.h",
    2450    "domainAccessor" => "m_inspectorController",
    25 };
    26 $typeTransform{"Debugger"} = {
    27     "forward" => "InspectorDebuggerAgent",
    28     "header" => "InspectorDebuggerAgent.h",
    29     "domainAccessor" => "m_inspectorController->debuggerAgent()",
    30 };
    31 $typeTransform{"Resources"} = {
    32     "forward" => "InspectorResourceAgent",
    33     "header" => "InspectorResourceAgent.h",
    34     "domainAccessor" => "m_inspectorController->m_resourceAgent",
    3551};
    3652$typeTransform{"Network"} = {
    … …  
    3955    "domainAccessor" => "m_inspectorController->m_resourceAgent",
    4056};
    41 $typeTransform{"DOMStorage"} = {
    42     "forwardHeader" => "InspectorController.h",
    43     "domainAccessor" => "m_inspectorController",
    44 };
    45 $typeTransform{"Database"} = {
    46     "forward" => "InspectorBackend",
    47     "header" => "InspectorBackend.h",
    48     "domainAccessor" => "m_inspectorController->inspectorBackend()",
    49 };
    50 $typeTransform{"DOM"} = {
    51     "forward" => "InspectorDOMAgent",
    52     "header" => "InspectorDOMAgent.h",
    53     "domainAccessor" => "m_inspectorController->domAgent()",
    54 };
    55 $typeTransform{"CSS"} = {
    56     "forward" => "InspectorCSSAgent",
    57     "header" => "InspectorCSSAgent.h",
    58     "domainAccessor" => "m_inspectorController->cssAgent()",
    59 };
    60 $typeTransform{"ApplicationCache"} = {
    61     "forward" => "InspectorApplicationCacheAgent",
    62     "header" => "InspectorApplicationCacheAgent.h",
    63     "domainAccessor" => "m_inspectorController->applicationCacheAgent()",
    64 };
    65 $typeTransform{"FileSystem"} = {
    66     "forward" => "InspectorFileSystemAgent",
    67     "header" => "InspectorFileSystemAgent.h",
    68     "domainAccessor" => "m_inspectorController->fileSystemAgent()",
    69 };
    7057$typeTransform{"Profiler"} = {
    7158    "forward" => "InspectorProfilerAgent",
    7259    "header" => "InspectorProfilerAgent.h",
    73     "domainAccessor" => "m_inspectorController->profilerAgent()",
    74 };
     60    "domainAccessor" => "m_inspectorController->m_profilerAgent",
     61};
     62
    7563$typeTransform{"Frontend"} = {
    7664    "forward" => "InspectorFrontend",
    7765    "header" => "InspectorFrontend.h",
     66};
     67$typeTransform{"InspectorClient"} = {
     68    "forward" => "InspectorClient",
     69    "header" => "InspectorClient.h",
    7870};
    7971$typeTransform{"PassRefPtr"} = {

  • trunk/WebCore/inspector/InjectedScriptHost.cpp

    r74761 r74785  
    3131#include "config.h"
    3232#include "InjectedScriptHost.h"
     33#include "InspectorDatabaseAgent.h"
     34#include "InspectorDOMStorageAgent.h"
    3335
    3436#if ENABLE(INSPECTOR)
    … …  
    121123Database* InjectedScriptHost::databaseForId(long databaseId)
    122124{
    123     if (m_inspectorController)
    124         return m_inspectorController->databaseForId(databaseId);
     125    if (m_inspectorController && m_inspectorController->m_databaseAgent)
     126        return m_inspectorController->m_databaseAgent->databaseForId(databaseId);
    125127    return 0;
    126128}
    … …  
    128130void InjectedScriptHost::selectDatabase(Database* database)
    129131{
    130     if (m_inspectorController)
    131         m_inspectorController->selectDatabase(database);
     132    if (m_inspectorController && m_inspectorController->m_databaseAgent)
     133        m_inspectorController->m_databaseAgent->selectDatabase(database);
    132134}
    133135#endif
    … …  
    136138void InjectedScriptHost::selectDOMStorage(Storage* storage)
    137139{
    138     if (m_inspectorController)
    139         m_inspectorController->selectDOMStorage(storage);
     140    if (m_inspectorController && m_inspectorController->m_domStorageAgent)
     141        m_inspectorController->m_domStorageAgent->selectDOMStorage(storage);
    140142}
    141143#endif
    … …  
    171173    if (!m_inspectorController)
    172174        return 0;
    173     return m_inspectorController->domAgent();
     175    return m_inspectorController->m_domAgent.get();
    174176}
    175177

  • trunk/WebCore/inspector/Inspector.idl

    r74761 r74785  
    3737        ///////////////////////////////////////////////////////////////////////
    3838
    39         [domain=Backend] void setInjectedScriptSource(in String scriptSource);
    4039        // HUGE FIXME: we need to expose InjectedScript methods here. Or document InjectedScript capabilities.
    41         [domain=Backend] void dispatchOnInjectedScript(in long injectedScriptId, in String methodName, in String arguments, out Value result, out boolean isException);
     40        [domain=Inspector] void setInjectedScriptSource(in String scriptSource);
     41        [domain=Inspector] void dispatchOnInjectedScript(in long injectedScriptId, in String methodName, in String arguments, out Value result, out boolean isException);
    4242        [domain=Inspector] void addScriptToEvaluateOnLoad(in String scriptSource);
    4343        [domain=Inspector] void removeAllScriptsToEvaluateOnLoad();
    44         [domain=Backend] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
     44        [domain=Inspector] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
    4545        [domain=Inspector] void getInspectorState(out Object state);
    4646        [domain=Inspector] void setMonitoringXHREnabled(in boolean enable, out boolean newState);
    … …  
    7070        [domain=Inspector] void setExtraHeaders(in Object headers);
    7171
     72        [domain=Inspector] void getCookies(out Array cookies, out String cookiesString);
     73        [domain=Inspector] void deleteCookie(in String cookieName, in String domain);
     74
    7275        ///////////////////////////////////////////////////////////////////////
    7376        // Console API
    … …  
    8487        // Network API
    8588        ///////////////////////////////////////////////////////////////////////
     89
     90        [domain=Network] void cachedResources(out Object resources);
     91        [domain=Network] void resourceContent(in unsigned long frameId, in String url, in boolean base64Encode, out String content);
     92        [notify, domain=Network] void frameDetachedFromParent(out unsigned long frameId);
    8693
    8794        [notify, domain=Network] void identifierForInitialRequest(out long identifier, out String url, out Object loader, out Value callStack);
    … …  
    100107        [notify, domain=Network] void didCloseWebSocket(out unsigned long identifier, out double time);
    101108
    102         ///////////////////////////////////////////////////////////////////////
    103         // Resources API
    104         ///////////////////////////////////////////////////////////////////////
    105 
    106         [domain=Resources] void cachedResources(out Object resources);
    107         [domain=Resources] void resourceContent(in unsigned long frameId, in String url, in boolean base64Encode, out String content);
    108         [notify, domain=Resources] void frameDetachedFromParent(out unsigned long frameId);
    109 
    110         // FIXME: Introduce new StorageDomain.
    111         [domain=Inspector] void getCookies(out Array cookies, out String cookiesString);
    112         [domain=Inspector] void deleteCookie(in String cookieName, in String domain);
    113109#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
     110
     111        ///////////////////////////////////////////////////////////////////////
     112        // Database API
     113        ///////////////////////////////////////////////////////////////////////
     114
    114115        [notify, domain=Database] void addDatabase(out Object database);
    115116        [notify, domain=Database] void selectDatabase(out int databaseId);
    … …  
    119120        [notify, domain=Database] void sqlTransactionFailed(out long transactionId, out Value sqlError);
    120121#endif
     122
    121123#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
     124
     125        ///////////////////////////////////////////////////////////////////////
     126        // DOM Storage API
     127        ///////////////////////////////////////////////////////////////////////
     128
    122129        [domain=DOMStorage] void getDOMStorageEntries(in long storageId, out Array entries);
    123130        [domain=DOMStorage] void setDOMStorageItem(in long storageId, in String key, in String value, out boolean success);
    … …  
    127134        [notify, domain=DOMStorage] void selectDOMStorage(out int storageId);
    128135#endif
     136
    129137#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
     138
     139        ///////////////////////////////////////////////////////////////////////
     140        // AppCache API
     141        ///////////////////////////////////////////////////////////////////////
     142
    130143        [domain=ApplicationCache] void getApplicationCaches(out Value applicationCaches);
    131144        [notify, domain=ApplicationCache] void updateApplicationCacheStatus(out int status);
    132145        [notify, domain=ApplicationCache] void updateNetworkState(out boolean isNowOnline);
    133146#endif
     147
    134148#if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM
     149
     150        ///////////////////////////////////////////////////////////////////////
     151        // Filesystem API
     152        ///////////////////////////////////////////////////////////////////////
     153
    135154        [domain=FileSystem] void getFileSystemPathAsync(in unsigned int type, in String origin);
    136155        [domain=FileSystem] void revealFolderInOS(in String path);
    … …  
    204223        ///////////////////////////////////////////////////////////////////////
    205224
    206         [domain=Backend] void enableDebugger(in boolean always);
    207         [domain=Inspector] void disableDebugger(in boolean always); // FIXME: should be on the same domain as enableDebugger.
     225        [domain=Inspector] void enableDebuggerFromFrontend(in boolean always);
     226        [domain=Inspector] void disableDebugger(in boolean always);
    208227        [notify, domain=Debugger] void debuggerWasEnabled();
    209228        [notify, domain=Debugger] void debuggerWasDisabled();

  • trunk/WebCore/inspector/InspectorController.cpp

    r74761 r74785  
    5858#include "InjectedScript.h"
    5959#include "InjectedScriptHost.h"
    60 #include "InspectorBackend.h"
    6160#include "InspectorBackendDispatcher.h"
    6261#include "InspectorCSSAgent.h"
    … …  
    7271#include "InspectorResourceAgent.h"
    7372#include "InspectorState.h"
    74 #include "InspectorStorageAgent.h"
    7573#include "InspectorTimelineAgent.h"
    7674#include "InspectorValues.h"
    … …  
    107105#if ENABLE(DATABASE)
    108106#include "Database.h"
     107#include "InspectorDatabaseAgent.h"
     108#endif
     109
     110#if ENABLE(DOM_STORAGE)
     111#include "InspectorDOMStorageAgent.h"
     112#include "Storage.h"
     113#include "StorageArea.h"
    109114#endif
    110115
    … …  
    115120#if ENABLE(FILE_SYSTEM)
    116121#include "InspectorFileSystemAgent.h"
    117 #endif
    118 
    119 #if ENABLE(DOM_STORAGE)
    120 #include "Storage.h"
    121 #include "StorageArea.h"
    122122#endif
    123123
    … …  
    145145    , m_previousMessage(0)
    146146    , m_settingsLoaded(false)
    147     , m_inspectorBackend(InspectorBackend::create(this))
    148147    , m_inspectorBackendDispatcher(new InspectorBackendDispatcher(this))
    149148    , m_injectedScriptHost(InjectedScriptHost::create(this))
    … …  
    168167    releaseFrontendLifetimeAgents();
    169168
    170     m_inspectorBackend->disconnectController();
    171169    m_injectedScriptHost->disconnectController();
    172170}
    … …  
    477475
    478476#if ENABLE(DATABASE)
    479     m_storageAgent = InspectorStorageAgent::create(m_frontend.get());
     477    m_databaseAgent = InspectorDatabaseAgent::create(&m_databaseResources, m_frontend.get());
     478#endif
     479
     480#if ENABLE(DOM_STORAGE)
     481    m_domStorageAgent = InspectorDOMStorageAgent::create(&m_domStorageResources, m_frontend.get());
    480482#endif
    481483
    … …  
    593595
    594596#if ENABLE(DATABASE)
    595     if (m_storageAgent)
    596         m_storageAgent->clearFrontend();
    597     m_storageAgent.clear();
     597    if (m_databaseAgent)
     598        m_databaseAgent->clearFrontend();
     599    m_databaseAgent.clear();
     600#endif
     601
     602#if ENABLE(DOM_STORAGE)
     603    m_domStorageAgent.clear();
    598604#endif
    599605
    … …  
    10361042
    10371043#if ENABLE(DATABASE)
    1038 void InspectorController::selectDatabase(Database* database)
    1039 {
    1040     if (!m_frontend)
    1041         return;
    1042 
    1043     for (DatabaseResourcesMap::iterator it = m_databaseResources.begin(); it != m_databaseResources.end(); ++it) {
    1044         if (it->second->database() == database) {
    1045             m_frontend->selectDatabase(it->first);
    1046             break;
    1047         }
    1048     }
    1049 }
    1050 
    1051 Database* InspectorController::databaseForId(long databaseId)
    1052 {
    1053     DatabaseResourcesMap::iterator it = m_databaseResources.find(databaseId);
    1054     if (it == m_databaseResources.end())
    1055         return 0;
    1056     return it->second->database();
    1057 }
    1058 
    10591044void InspectorController::didOpenDatabase(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
    10601045{
    … …  
    11751160    if (m_frontend)
    11761161        resource->bind(m_frontend.get());
    1177 }
    1178 
    1179 void InspectorController::selectDOMStorage(Storage* storage)
    1180 {
    1181     ASSERT(storage);
    1182     if (!m_frontend)
    1183         return;
    1184 
    1185     Frame* frame = storage->frame();
    1186     ExceptionCode ec = 0;
    1187     bool isLocalStorage = (frame->domWindow()->localStorage(ec) == storage && !ec);
    1188     long storageResourceId = 0;
    1189     DOMStorageResourcesMap::iterator domStorageEnd = m_domStorageResources.end();
    1190     for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it) {
    1191         if (it->second->isSameHostAndType(frame, isLocalStorage)) {
    1192             storageResourceId = it->first;
    1193             break;
    1194         }
    1195     }
    1196     if (storageResourceId)
    1197         m_frontend->selectDOMStorage(storageResourceId);
    1198 }
    1199 
    1200 void InspectorController::getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries)
    1201 {
    1202     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
    1203     if (storageResource) {
    1204         storageResource->startReportingChangesToFrontend();
    1205         Storage* domStorage = storageResource->domStorage();
    1206         for (unsigned i = 0; i < domStorage->length(); ++i) {
    1207             String name(domStorage->key(i));
    1208             String value(domStorage->getItem(name));
    1209             RefPtr<InspectorArray> entry = InspectorArray::create();
    1210             entry->pushString(name);
    1211             entry->pushString(value);
    1212             (*entries)->pushArray(entry);
    1213         }
    1214     }
    1215 }
    1216 
    1217 void InspectorController::setDOMStorageItem(long storageId, const String& key, const String& value, bool* success)
    1218 {
    1219     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
    1220     if (storageResource) {
    1221         ExceptionCode exception = 0;
    1222         storageResource->domStorage()->setItem(key, value, exception);
    1223         *success = !exception;
    1224     }
    1225 }
    1226 
    1227 void InspectorController::removeDOMStorageItem(long storageId, const String& key, bool* success)
    1228 {
    1229     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
    1230     if (storageResource) {
    1231         storageResource->domStorage()->removeItem(key);
    1232         *success = true;
    1233     }
    1234 }
    1235 
    1236 InspectorDOMStorageResource* InspectorController::getDOMStorageResourceForId(long storageId)
    1237 {
    1238     DOMStorageResourcesMap::iterator it = m_domStorageResources.find(storageId);
    1239     if (it == m_domStorageResources.end())
    1240         return 0;
    1241     return it->second.get();
    12421162}
    12431163#endif
    … …  
    15081428#endif
    15091429
     1430void InspectorController::setInjectedScriptSource(const String& source)
     1431{
     1432     injectedScriptHost()->setInjectedScriptSource(source);
     1433}
     1434
     1435void InspectorController::dispatchOnInjectedScript(long injectedScriptId, const String& methodName, const String& arguments, RefPtr<InspectorValue>* result, bool* hadException)
     1436{
     1437    if (!m_frontend)
     1438        return;
     1439
     1440    // FIXME: explicitly pass injectedScriptId along with node id to the frontend.
     1441    bool injectedScriptIdIsNodeId = injectedScriptId <= 0;
     1442
     1443    InjectedScript injectedScript;
     1444    if (injectedScriptIdIsNodeId)
     1445        injectedScript = injectedScriptForNodeId(-injectedScriptId);
     1446    else
     1447        injectedScript = injectedScriptHost()->injectedScriptForId(injectedScriptId);
     1448
     1449    if (injectedScript.hasNoValue())
     1450        return;
     1451
     1452    injectedScript.dispatch(methodName, arguments, result, hadException);
     1453}
     1454
     1455void InspectorController::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
     1456{
     1457    injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
     1458}
     1459
    15101460void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
    15111461{

  • trunk/WebCore/inspector/InspectorController.h

    r74761 r74785  
    5757class InjectedScriptHost;
    5858class InspectorArray;
    59 class InspectorBackend;
    6059class InspectorBackendDispatcher;
    6160class InspectorClient;
    6261class InspectorCSSAgent;
    6362class InspectorDOMAgent;
     63class InspectorDOMStorageAgent;
    6464class InspectorDOMStorageResource;
     65class InspectorDatabaseAgent;
    6566class InspectorDatabaseResource;
    6667class InspectorDebuggerAgent;
    … …  
    8687class ScriptProfile;
    8788class SharedBuffer;
    88 class Storage;
    8989class StorageArea;
    9090
    … …  
    104104class InspectorController : public Noncopyable {
    105105public:
    106     typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
    107     typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
    108 
    109106    static const char* const ConsolePanel;
    110107    static const char* const ElementsPanel;
    … …  
    115112    ~InspectorController();
    116113
    117     InspectorBackend* inspectorBackend() { return m_inspectorBackend.get(); }
    118114    InspectorBackendDispatcher* inspectorBackendDispatcher() { return m_inspectorBackendDispatcher.get(); }
    119115    InspectorClient* inspectorClient() { return m_client; }
    … …  
    190186#endif
    191187
    192 #if ENABLE(FILE_SYSTEM)
    193     InspectorFileSystemAgent* fileSystemAgent() { return m_fileSystemAgent.get(); }
    194 #endif
    195 
    196188    void mainResourceFiredLoadEvent(DocumentLoader*, const KURL&);
    197189    void mainResourceFiredDOMContentEvent(DocumentLoader*, const KURL&);
    … …  
    208200    void didOpenDatabase(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
    209201#endif
     202
    210203#if ENABLE(DOM_STORAGE)
    211204    void didUseDOMStorage(StorageArea* storageArea, bool isLocalStorage, Frame* frame);
    212     void selectDOMStorage(Storage* storage);
    213     void getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries);
    214     void setDOMStorageItem(long storageId, const String& key, const String& value, bool* success);
    215     void removeDOMStorageItem(long storageId, const String& key, bool* success);
    216 #endif
     205#endif
     206
    217207#if ENABLE(WEB_SOCKETS)
    218208    void didCreateWebSocket(unsigned long identifier, const KURL& requestURL, const KURL& documentURL);
    … …  
    251241    void disableProfiler(bool always = false);
    252242    bool profilerEnabled() const;
    253     InspectorProfilerAgent* profilerAgent() const { return m_profilerAgent.get(); }
    254243
    255244    void enableDebugger();
    256245    void disableDebugger(bool always = false);
    257246    bool debuggerEnabled() const { return m_debuggerAgent; }
    258     InspectorDebuggerAgent* debuggerAgent() const { return m_debuggerAgent.get(); }
    259247    void resume();
    260248
    … …  
    267255    bool hasXHRBreakpoint(const String& url, String* breakpointURL);
    268256#endif
     257
     258    void setInjectedScriptSource(const String& source);
     259    void dispatchOnInjectedScript(long injectedScriptId, const String& methodName, const String& arguments, RefPtr<InspectorValue>* result, bool* hadException);
     260
     261    // Generic code called from custom implementations.
     262    void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
    269263
    270264    void evaluateForTestInFrontend(long testCallId, const String& script);
    … …  
    307301
    308302    void setMonitoringXHREnabled(bool enabled, bool* newState);
    309     InspectorCSSAgent* cssAgent() { return m_cssAgent.get(); }
    310     InspectorDOMAgent* domAgent() { return m_domAgent.get(); }
    311303    void releaseFrontendLifetimeAgents();
    312304
    … …  
    316308    void restoreStickyBreakpoints();
    317309    void restoreStickyBreakpoint(PassRefPtr<InspectorObject> breakpoint);
    318 #endif
    319 #if ENABLE(DATABASE)
    320     void selectDatabase(Database* database);
    321     Database* databaseForId(long databaseId);
    322 #endif
    323 #if ENABLE(DOM_STORAGE)
    324     InspectorDOMStorageResource* getDOMStorageResourceForId(long storageId);
    325310#endif
    326311
    … …  
    343328    OwnPtr<InspectorCSSAgent> m_cssAgent;
    344329    RefPtr<InspectorDOMAgent> m_domAgent;
    345     RefPtr<InspectorStorageAgent> m_storageAgent;
     330
     331#if ENABLE(DATABASE)
     332    RefPtr<InspectorDatabaseAgent> m_databaseAgent;
     333#endif
     334
     335#if ENABLE(DOM_STORAGE)
     336    RefPtr<InspectorDOMStorageAgent> m_domStorageAgent;
     337#endif
     338
    346339    OwnPtr<InspectorTimelineAgent> m_timelineAgent;
    347340    OwnPtr<InspectorState> m_state;
    … …  
    362355    HashMap<String, double> m_times;
    363356    HashMap<String, unsigned> m_counts;
     357
    364358#if ENABLE(DATABASE)
     359    typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
    365360    DatabaseResourcesMap m_databaseResources;
    366361#endif
    367362#if ENABLE(DOM_STORAGE)
     363    typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
    368364    DOMStorageResourcesMap m_domStorageResources;
    369365#endif
     366
    370367    String m_showAfterVisible;
    371368    RefPtr<Node> m_highlightedNode;
    372369    ConsoleMessage* m_previousMessage;
    373370    bool m_settingsLoaded;
    374     RefPtr<InspectorBackend> m_inspectorBackend;
    375371    OwnPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
    376372    RefPtr<InjectedScriptHost> m_injectedScriptHost;

  • trunk/WebCore/inspector/InspectorDOMStorageAgent.h

    r74784 r74785  
    2727 */
    2828
    29 #ifndef InspectorStorageAgent_h
    30 #define InspectorStorageAgent_h
     29#ifndef InspectorDOMStorageAgent_h
     30#define InspectorDOMStorageAgent_h
    3131
    3232#include "PlatformString.h"
     33#include "wtf/HashMap.h"
    3334#include "wtf/PassRefPtr.h"
    3435
    3536namespace WebCore {
    3637
    37 class Database;
     38class InspectorArray;
     39class InspectorController;
     40class InspectorDOMStorageResource;
    3841class InspectorFrontend;
     42class Storage;
    3943
    40 class InspectorStorageAgent : public RefCounted<InspectorStorageAgent> {
     44class InspectorDOMStorageAgent : public RefCounted<InspectorDOMStorageAgent> {
    4145public:
    42     static PassRefPtr<InspectorStorageAgent> create(InspectorFrontend* frontend)
     46    typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
     47
     48    static PassRefPtr<InspectorDOMStorageAgent> create(DOMStorageResourcesMap* domStorageResources, InspectorFrontend* frontend)
    4349    {
    44         return adoptRef(new InspectorStorageAgent(frontend));
     50        return adoptRef(new InspectorDOMStorageAgent(domStorageResources, frontend));
    4551    }
    4652
    47     virtual ~InspectorStorageAgent();
     53    virtual ~InspectorDOMStorageAgent();
    4854
    49     long executeSQL(Database*, const String& query);
     55    // Called from the front-end.
     56    void getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries);
     57    void setDOMStorageItem(long storageId, const String& key, const String& value, bool* success);
     58    void removeDOMStorageItem(long storageId, const String& key, bool* success);
     59
     60    // Called from the injected script.
     61    void selectDOMStorage(Storage* storage);
    5062
    5163    InspectorFrontend* frontend() { return m_frontend; }
    52     void clearFrontend();
    5364
    5465private:
    55     InspectorStorageAgent(InspectorFrontend*);
     66    InspectorDOMStorageAgent(DOMStorageResourcesMap*, InspectorFrontend*);
    5667
     68    InspectorDOMStorageResource* getDOMStorageResourceForId(long storageId);
     69
     70    DOMStorageResourcesMap* m_domStorageResources;
    5771    InspectorFrontend* m_frontend;
    5872};
    … …  
    6074} // namespace WebCore
    6175
    62 #endif // !defined(InspectorStorageAgent_h)
     76#endif // !defined(InspectorDOMStorageAgent_h)

  • trunk/WebCore/inspector/InspectorDatabaseAgent.cpp

    r74784 r74785  
    2929#include "config.h"
    3030
    31 #include "InspectorStorageAgent.h"
     31#include "InspectorDatabaseAgent.h"
    3232
    3333#if ENABLE(INSPECTOR) && ENABLE(DATABASE)
    … …  
    3636#include "ExceptionCode.h"
    3737#include "InspectorFrontend.h"
     38#include "InspectorController.h"
     39#include "InspectorDatabaseResource.h"
    3840#include "InspectorValues.h"
    3941#include "SQLError.h"
    … …  
    5557long lastTransactionId = 0;
    5658
    57 void reportTransactionFailed(InspectorStorageAgent* agent, long transactionId, SQLError* error)
     59void reportTransactionFailed(InspectorDatabaseAgent* agent, long transactionId, SQLError* error)
    5860{
    5961    if (!agent->frontend())
    … …  
    6769class StatementCallback : public SQLStatementCallback {
    6870public:
    69     static PassRefPtr<StatementCallback> create(long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     71    static PassRefPtr<StatementCallback> create(long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    7072    {
    7173        return adoptRef(new StatementCallback(transactionId, agent));
    … …  
    101103
    102104private:
    103     StatementCallback(long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     105    StatementCallback(long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    104106        : m_transactionId(transactionId)
    105107        , m_agent(agent) { }
    106108    long m_transactionId;
    107     RefPtr<InspectorStorageAgent> m_agent;
     109    RefPtr<InspectorDatabaseAgent> m_agent;
    108110};
    109111
    110112class StatementErrorCallback : public SQLStatementErrorCallback {
    111113public:
    112     static PassRefPtr<StatementErrorCallback> create(long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     114    static PassRefPtr<StatementErrorCallback> create(long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    113115    {
    114116        return adoptRef(new StatementErrorCallback(transactionId, agent));
    … …  
    124126
    125127private:
    126     StatementErrorCallback(long transactionId, RefPtr<InspectorStorageAgent> agent)
     128    StatementErrorCallback(long transactionId, RefPtr<InspectorDatabaseAgent> agent)
    127129        : m_transactionId(transactionId)
    128130        , m_agent(agent) { }
    129131    long m_transactionId;
    130     RefPtr<InspectorStorageAgent> m_agent;
     132    RefPtr<InspectorDatabaseAgent> m_agent;
    131133};
    132134
    133135class TransactionCallback : public SQLTransactionCallback {
    134136public:
    135     static PassRefPtr<TransactionCallback> create(const String& sqlStatement, long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     137    static PassRefPtr<TransactionCallback> create(const String& sqlStatement, long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    136138    {
    137139        return adoptRef(new TransactionCallback(sqlStatement, transactionId, agent));
    … …  
    153155    }
    154156private:
    155     TransactionCallback(const String& sqlStatement, long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     157    TransactionCallback(const String& sqlStatement, long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    156158        : m_sqlStatement(sqlStatement)
    157159        , m_transactionId(transactionId)
    … …  
    159161    String m_sqlStatement;
    160162    long m_transactionId;
    161     RefPtr<InspectorStorageAgent> m_agent;
     163    RefPtr<InspectorDatabaseAgent> m_agent;
    162164};
    163165
    164166class TransactionErrorCallback : public SQLTransactionErrorCallback {
    165167public:
    166     static PassRefPtr<TransactionErrorCallback> create(long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     168    static PassRefPtr<TransactionErrorCallback> create(long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    167169    {
    168170        return adoptRef(new TransactionErrorCallback(transactionId, agent));
    … …  
    177179    }
    178180private:
    179     TransactionErrorCallback(long transactionId, PassRefPtr<InspectorStorageAgent> agent)
     181    TransactionErrorCallback(long transactionId, PassRefPtr<InspectorDatabaseAgent> agent)
    180182        : m_transactionId(transactionId)
    181183        , m_agent(agent) { }
    182184    long m_transactionId;
    183     RefPtr<InspectorStorageAgent> m_agent;
     185    RefPtr<InspectorDatabaseAgent> m_agent;
    184186};
    185187
    … …  
    201203} // namespace
    202204
    203 InspectorStorageAgent::InspectorStorageAgent(InspectorFrontend* frontend)
    204     : m_frontend(frontend)
    205 {
    206 }
    207 
    208 InspectorStorageAgent::~InspectorStorageAgent()
    209 {
    210 }
    211 
    212 long InspectorStorageAgent::executeSQL(Database* database, const String& query)
    213 {
    214     long transactionId = ++lastTransactionId;
    215     RefPtr<SQLTransactionCallback> callback(TransactionCallback::create(query, transactionId, this));
    216     RefPtr<SQLTransactionErrorCallback> errorCallback(TransactionErrorCallback::create(transactionId, this));
     205InspectorDatabaseAgent::~InspectorDatabaseAgent()
     206{
     207}
     208
     209void InspectorDatabaseAgent::getDatabaseTableNames(long databaseId, RefPtr<InspectorArray>* names)
     210{
     211    Database* database = databaseForId(databaseId);
     212    if (database) {
     213        Vector<String> tableNames = database->tableNames();
     214        unsigned length = tableNames.size();
     215        for (unsigned i = 0; i < length; ++i)
     216            (*names)->pushString(tableNames[i]);
     217    }
     218}
     219
     220void InspectorDatabaseAgent::executeSQL(long databaseId, const String& query, bool* success, long* transactionId)
     221{
     222    Database* database = databaseForId(databaseId);
     223    if (!database) {
     224        *success = false;
     225        return;
     226    }
     227
     228    *transactionId = ++lastTransactionId;
     229    RefPtr<SQLTransactionCallback> callback(TransactionCallback::create(query, *transactionId, this));
     230    RefPtr<SQLTransactionErrorCallback> errorCallback(TransactionErrorCallback::create(*transactionId, this));
    217231    RefPtr<VoidCallback> successCallback(TransactionSuccessCallback::create());
    218232    database->transaction(callback.release(), errorCallback.release(), successCallback.release());
    219     return transactionId;
    220 }
    221 
    222 void InspectorStorageAgent::clearFrontend()
     233    *success = true;
     234}
     235
     236Database* InspectorDatabaseAgent::databaseForId(long databaseId)
     237{
     238    DatabaseResourcesMap::iterator it = m_databaseResources->find(databaseId);
     239    if (it == m_databaseResources->end())
     240        return 0;
     241    return it->second->database();
     242}
     243
     244void InspectorDatabaseAgent::selectDatabase(Database* database)
     245{
     246    if (!m_frontend)
     247        return;
     248
     249    for (DatabaseResourcesMap::iterator it = m_databaseResources->begin(); it != m_databaseResources->end(); ++it) {
     250        if (it->second->database() == database) {
     251            m_frontend->selectDatabase(it->first);
     252            break;
     253        }
     254    }
     255}
     256
     257void InspectorDatabaseAgent::clearFrontend()
    223258{
    224259    m_frontend = 0;
    225260}
    226261
     262InspectorDatabaseAgent::InspectorDatabaseAgent(DatabaseResourcesMap* databaseResources, InspectorFrontend* frontend)
     263    : m_databaseResources(databaseResources)
     264    , m_frontend(frontend)
     265{
     266}
     267
    227268} // namespace WebCore
    228269

  • trunk/WebCore/inspector/InspectorDatabaseAgent.h

    r74784 r74785  
    2727 */
    2828
    29 #ifndef InspectorStorageAgent_h
    30 #define InspectorStorageAgent_h
     29#ifndef InspectorDatabaseAgent_h
     30#define InspectorDatabaseAgent_h
    3131
    3232#include "PlatformString.h"
     33#include "wtf/HashMap.h"
    3334#include "wtf/PassRefPtr.h"
    3435
    … …  
    3637
    3738class Database;
     39class InspectorArray;
     40class InspectorController;
     41class InspectorDatabaseResource;
    3842class InspectorFrontend;
    3943
    40 class InspectorStorageAgent : public RefCounted<InspectorStorageAgent> {
     44class InspectorDatabaseAgent : public RefCounted<InspectorDatabaseAgent> {
    4145public:
    42     static PassRefPtr<InspectorStorageAgent> create(InspectorFrontend* frontend)
     46    typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
     47
     48    static PassRefPtr<InspectorDatabaseAgent> create(DatabaseResourcesMap* databaseResources, InspectorFrontend* frontend)
    4349    {
    44         return adoptRef(new InspectorStorageAgent(frontend));
     50        return adoptRef(new InspectorDatabaseAgent(databaseResources, frontend));
    4551    }
    4652
    47     virtual ~InspectorStorageAgent();
     53    virtual ~InspectorDatabaseAgent();
    4854
    49     long executeSQL(Database*, const String& query);
     55    // Called from the front-end.
     56    void getDatabaseTableNames(long databaseId, RefPtr<InspectorArray>* names);
     57    void executeSQL(long databaseId, const String& query, bool* success, long* transactionId);
     58
     59    // Called from the injected script.
     60    Database* databaseForId(long databaseId);
     61    void selectDatabase(Database* database);
    5062
    5163    InspectorFrontend* frontend() { return m_frontend; }
    … …  
    5365
    5466private:
    55     InspectorStorageAgent(InspectorFrontend*);
     67    InspectorDatabaseAgent(DatabaseResourcesMap*, InspectorFrontend*);
    5668
     69    DatabaseResourcesMap* m_databaseResources;
    5770    InspectorFrontend* m_frontend;
    5871};
    … …  
    6073} // namespace WebCore
    6174
    62 #endif // !defined(InspectorStorageAgent_h)
     75#endif // !defined(InspectorDatabaseAgent_h)

  • trunk/WebCore/inspector/front-end/ScriptsPanel.js

    r74761 r74785  
    221221
    222222        if (this._attachDebuggerWhenShown) {
    223             InspectorBackend.enableDebugger(false);
     223            InspectorBackend.enableDebuggerFromFrontend(false);
    224224            delete this._attachDebuggerWhenShown;
    225225        }
    … …  
    393393    {
    394394        if (this.element.parentElement) {
    395             InspectorBackend.enableDebugger(false);
     395            InspectorBackend.enableDebuggerFromFrontend(false);
    396396        } else {
    397397            this._attachDebuggerWhenShown = true;
    … …  
    863863            InspectorBackend.disableDebugger(true);
    864864        else
    865             InspectorBackend.enableDebugger(!!optionalAlways);
     865            InspectorBackend.enableDebuggerFromFrontend(!!optionalAlways);
    866866    },
    867867

  • trunk/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp

    r74761 r74785  
    3939#include "Event.h"
    4040#include "Frame.h"
    41 #include "InspectorBackend.h"
    4241#include "InspectorController.h"
    4342#include "InspectorFrontendClientImpl.h"
Note: See TracChangeset for help on using the changeset viewer.