Changeset 51528 in webkit


Ignore:
Timestamp:
Dec 1, 2009 12:07:16 AM (14 years ago)
Author:
pfeldman@chromium.org
Message:

2009-11-27 Pavel Feldman <​pfeldman@dhcp-172-28-174-220.spb.corp.google.com>

Reviewed by Timothy Hatcher.

Web Inspector: Split InspectorBackend into three parts: backend,
injected script host and frontend host.


​https://bugs.webkit.org/show_bug.cgi?id=31888

  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • WebCoreSources.bkl:
  • bindings/js/JSBindingsAllInOne.cpp:
  • bindings/js/JSInspectorBackendCustom.cpp: Removed.
  • bindings/js/JSInspectorFrontendHostCustom.cpp: Added. (WebCore::JSInspectorFrontendHost::search): (WebCore::JSInspectorFrontendHost::setting): (WebCore::JSInspectorFrontendHost::setSetting):
  • bindings/js/ScriptObject.cpp: (WebCore::ScriptGlobalObject::set):
  • bindings/js/ScriptObject.h:
  • bindings/v8/DOMObjectsInclude.h:
  • bindings/v8/DerivedSourcesAllInOne.cpp:
  • bindings/v8/ScriptObject.cpp: (WebCore::ScriptGlobalObject::set):
  • bindings/v8/ScriptObject.h:
  • bindings/v8/V8Index.cpp:
  • bindings/v8/V8Index.h:
  • bindings/v8/custom/V8CustomBinding.h:
  • bindings/v8/custom/V8InjectedScriptHostCustom.cpp: Added. (WebCore::CALLBACK_FUNC_DECL):
  • bindings/v8/custom/V8InspectorBackendCustom.cpp: Removed.
  • bindings/v8/custom/V8InspectorFrontendHostCustom.cpp: Added. (WebCore::CALLBACK_FUNC_DECL):
  • inspector/InjectedScriptHost.cpp: Added. (WebCore::InjectedScriptHost::InjectedScriptHost): (WebCore::InjectedScriptHost::~InjectedScriptHost): (WebCore::InjectedScriptHost::copyText): (WebCore::InjectedScriptHost::nodeForId): (WebCore::InjectedScriptHost::wrapObject): (WebCore::InjectedScriptHost::unwrapObject): (WebCore::InjectedScriptHost::pushNodePathToFrontend): (WebCore::InjectedScriptHost::addNodesToSearchResult): (WebCore::InjectedScriptHost::currentCallFrame): (WebCore::InjectedScriptHost::databaseForId): (WebCore::InjectedScriptHost::selectDatabase): (WebCore::InjectedScriptHost::selectDOMStorage): (WebCore::InjectedScriptHost::reportDidDispatchOnInjectedScript): (WebCore::InjectedScriptHost::inspectorDOMAgent): (WebCore::InjectedScriptHost::inspectorFrontend):
  • inspector/InjectedScriptHost.h: Added. (WebCore::InjectedScriptHost::create): (WebCore::InjectedScriptHost::inspectorController): (WebCore::InjectedScriptHost::disconnectController):
  • inspector/InjectedScriptHost.idl: Added.
  • inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::InspectorBackend): (WebCore::InspectorBackend::storeLastActivePanel): (WebCore::InspectorBackend::toggleNodeSearch): (WebCore::InspectorBackend::resourceTrackingEnabled): (WebCore::InspectorBackend::debuggerEnabled): (WebCore::InspectorBackend::enableDebugger): (WebCore::InspectorBackend::disableDebugger): (WebCore::InspectorBackend::addBreakpoint): (WebCore::InspectorBackend::updateBreakpoint): (WebCore::InspectorBackend::removeBreakpoint): (WebCore::InspectorBackend::pauseInDebugger): (WebCore::InspectorBackend::resumeDebugger): (WebCore::InspectorBackend::stepOverStatementInDebugger): (WebCore::InspectorBackend::stepIntoStatementInDebugger): (WebCore::InspectorBackend::stepOutOfFunctionInDebugger): (WebCore::InspectorBackend::pauseOnExceptions): (WebCore::InspectorBackend::setPauseOnExceptions): (WebCore::InspectorBackend::profilerEnabled): (WebCore::InspectorBackend::enableProfiler): (WebCore::InspectorBackend::disableProfiler): (WebCore::InspectorBackend::startProfiling): (WebCore::InspectorBackend::stopProfiling): (WebCore::InspectorBackend::getProfileHeaders): (WebCore::InspectorBackend::getProfile): (WebCore::InspectorBackend::currentCallFrame): (WebCore::InspectorBackend::highlightDOMNode): (WebCore::InspectorBackend::hideDOMNodeHighlight): (WebCore::InspectorBackend::getCookies): (WebCore::InspectorBackend::deleteCookie): (WebCore::InspectorBackend::didEvaluateForTestInFrontend): (WebCore::InspectorBackend::nodeForId):
  • inspector/InspectorBackend.h: (WebCore::InspectorBackend::create):
  • inspector/InspectorBackend.idl:
  • inspector/InspectorController.cpp: (WebCore::InspectorController::InspectorController): (WebCore::InspectorController::~InspectorController): (WebCore::InspectorController::inspectedPageDestroyed): (WebCore::InspectorController::windowScriptObjectAvailable):
  • inspector/InspectorController.h: (WebCore::InspectorController::inspectorFrontendHost): (WebCore::InspectorController::injectedScriptHost):
  • inspector/InspectorFrontendHost.cpp: Added. (WebCore::InspectorFrontendHost::InspectorFrontendHost): (WebCore::InspectorFrontendHost::~InspectorFrontendHost): (WebCore::InspectorFrontendHost::loaded): (WebCore::InspectorFrontendHost::attach): (WebCore::InspectorFrontendHost::detach): (WebCore::InspectorFrontendHost::closeWindow): (WebCore::InspectorFrontendHost::windowUnloading): (WebCore::InspectorFrontendHost::setAttachedWindowHeight): (WebCore::InspectorFrontendHost::moveWindowBy): (WebCore::InspectorFrontendHost::localizedStringsURL): (WebCore::InspectorFrontendHost::hiddenPanels): (WebCore::InspectorFrontendHost::platform): (WebCore::InspectorFrontendHost::port): (WebCore::InspectorFrontendHost::addResourceSourceToFrame): (WebCore::InspectorFrontendHost::addSourceToFrame):
  • inspector/InspectorFrontendHost.h: Added. (WebCore::InspectorFrontendHost::create): (WebCore::InspectorFrontendHost::inspectorController): (WebCore::InspectorFrontendHost::disconnectController):
  • inspector/InspectorFrontendHost.idl: Added.
  • inspector/front-end/Breakpoint.js: (WebInspector.Breakpoint.prototype.set condition):
  • inspector/front-end/BreakpointsSidebarPane.js: (WebInspector.BreakpointsSidebarPane.prototype.addBreakpoint): (WebInspector.BreakpointsSidebarPane.prototype.removeBreakpoint): (WebInspector.BreakpointsSidebarPane.prototype._breakpointEnableChanged):
  • inspector/front-end/ConsoleView.js: (WebInspector.ConsoleView.prototype.clearMessages):
  • inspector/front-end/CookieItemsView.js: (WebInspector.CookieItemsView.prototype._deleteCookieCallback):
  • inspector/front-end/DOMAgent.js: (WebInspector.DOMAgent.prototype.getChildNodesAsync): (WebInspector.DOMAgent.prototype.setAttributeAsync): (WebInspector.DOMAgent.prototype.removeAttributeAsync): (WebInspector.DOMAgent.prototype.setTextNodeValueAsync): (WebInspector.Cookies.getCookiesAsync): (WebInspector.EventListeners.getEventListenersForNodeAsync):
  • inspector/front-end/DOMStorage.js: (WebInspector.DOMStorage.prototype.getEntries): (WebInspector.DOMStorage.prototype.setItem): (WebInspector.DOMStorage.prototype.removeItem):
  • inspector/front-end/Database.js: (WebInspector.Database.prototype.getTableNames):
  • inspector/front-end/ElementsPanel.js: (WebInspector.ElementsPanel.this.treeOutline.focusedNodeChanged): (WebInspector.ElementsPanel.prototype.hide): (WebInspector.ElementsPanel.prototype.reset): (WebInspector.ElementsPanel.prototype.handleCopyEvent): (WebInspector.ElementsPanel.prototype._nodeSearchButtonClicked):
  • inspector/front-end/ElementsTreeOutline.js: (WebInspector.ElementsTreeOutline.prototype.set focusedDOMNode.restoreHighlightToHoveredNode): (WebInspector.ElementsTreeOutline.prototype.set focusedDOMNode): ():
  • inspector/front-end/EventListenersSidebarPane.js: (WebInspector.EventListenersSidebarPane.prototype):
  • inspector/front-end/InjectedScript.js: (InjectedScript._evaluateAndWrap): (InjectedScript.performSearch.addNodesToResults): (InjectedScript.getCallFrames): (InjectedScript._callFrameForId): (InjectedScript._clearConsoleMessages): (InjectedScript._inspectObject): (InjectedScript._copy): (InjectedScript._ensureCommandLineAPIInstalled): (InjectedScript._window): (InjectedScript._nodeForId): (InjectedScript._objectForId): (InjectedScript.pushNodeToFrontend): (InjectedScript.executeSql): (InjectedScript.executeSql.errorCallback): (InjectedScript.executeSql.queryTransaction):
  • inspector/front-end/InjectedScriptAccess.js: (InjectedScriptAccess._installHandler.InjectedScriptAccess.methodName): (InjectedScriptAccess._installHandler):
  • inspector/front-end/InspectorBackendStub.js: Added. (.WebInspector.InspectorBackendStub): (.WebInspector.InspectorBackendStub.prototype.wrapCallback): (.WebInspector.InspectorBackendStub.prototype.platform): (.WebInspector.InspectorBackendStub.prototype.port): (.WebInspector.InspectorBackendStub.prototype.closeWindow): (.WebInspector.InspectorBackendStub.prototype.attach): (.WebInspector.InspectorBackendStub.prototype.detach): (.WebInspector.InspectorBackendStub.prototype.storeLastActivePanel): (.WebInspector.InspectorBackendStub.prototype.clearMessages): (.WebInspector.InspectorBackendStub.prototype.searchingForNode): (.WebInspector.InspectorBackendStub.prototype.search): (.WebInspector.InspectorBackendStub.prototype.toggleNodeSearch): (.WebInspector.InspectorBackendStub.prototype.setAttachedWindowHeight): (.WebInspector.InspectorBackendStub.prototype.moveByUnrestricted): (.WebInspector.InspectorBackendStub.prototype.addResourceSourceToFrame): (.WebInspector.InspectorBackendStub.prototype.addSourceToFrame): (.WebInspector.InspectorBackendStub.prototype.getResourceDocumentNode): (.WebInspector.InspectorBackendStub.prototype.highlightDOMNode): (.WebInspector.InspectorBackendStub.prototype.hideDOMNodeHighlight): (.WebInspector.InspectorBackendStub.prototype.inspectedWindow): (.WebInspector.InspectorBackendStub.prototype.loaded): (.WebInspector.InspectorBackendStub.prototype.localizedStringsURL): (.WebInspector.InspectorBackendStub.prototype.windowUnloading): (.WebInspector.InspectorBackendStub.prototype.hiddenPanels): (.WebInspector.InspectorBackendStub.prototype.debuggerEnabled): (.WebInspector.InspectorBackendStub.prototype.enableResourceTracking): (.WebInspector.InspectorBackendStub.prototype.disableResourceTracking): (.WebInspector.InspectorBackendStub.prototype.resourceTrackingEnabled): (.WebInspector.InspectorBackendStub.prototype.enableDebugger): (.WebInspector.InspectorBackendStub.prototype.disableDebugger): (.WebInspector.InspectorBackendStub.prototype.addBreakpoint): (.WebInspector.InspectorBackendStub.prototype.removeBreakpoint): (.WebInspector.InspectorBackendStub.prototype.updateBreakpoint): (.WebInspector.InspectorBackendStub.prototype.pauseInDebugger): (.WebInspector.InspectorBackendStub.prototype.pauseOnExceptions): (.WebInspector.InspectorBackendStub.prototype.setPauseOnExceptions): (.WebInspector.InspectorBackendStub.prototype.resumeDebugger): (.WebInspector.InspectorBackendStub.prototype.profilerEnabled): (.WebInspector.InspectorBackendStub.prototype.enableProfiler): (.WebInspector.InspectorBackendStub.prototype.disableProfiler): (.WebInspector.InspectorBackendStub.prototype.startProfiling): (.WebInspector.InspectorBackendStub.prototype.stopProfiling): (.WebInspector.InspectorBackendStub.prototype.getProfileHeaders): (.WebInspector.InspectorBackendStub.prototype.getProfile): (.WebInspector.InspectorBackendStub.prototype.takeHeapSnapshot): (.WebInspector.InspectorBackendStub.prototype.databaseTableNames): (.WebInspector.InspectorBackendStub.prototype.stepIntoStatementInDebugger): (.WebInspector.InspectorBackendStub.prototype.stepOutOfFunctionInDebugger): (.WebInspector.InspectorBackendStub.prototype.stepOverStatementInDebugger): (.WebInspector.InspectorBackendStub.prototype.setSetting): (.WebInspector.InspectorBackendStub.prototype.dispatchOnInjectedScript): (.WebInspector.InspectorBackendStub.prototype.releaseWrapperObjectGroup): (.WebInspector.InspectorBackendStub.prototype.setting):
  • inspector/front-end/InspectorControllerStub.js:
  • inspector/front-end/InspectorFrontendHostStub.js: Added. (.WebInspector.InspectorFrontendHostStub): (.WebInspector.InspectorFrontendHostStub.prototype.platform): (.WebInspector.InspectorFrontendHostStub.prototype.port): (.WebInspector.InspectorFrontendHostStub.prototype.closeWindow): (.WebInspector.InspectorFrontendHostStub.prototype.attach): (.WebInspector.InspectorFrontendHostStub.prototype.detach): (.WebInspector.InspectorFrontendHostStub.prototype.search): (.WebInspector.InspectorFrontendHostStub.prototype.setAttachedWindowHeight): (.WebInspector.InspectorFrontendHostStub.prototype.moveWindowBy): (.WebInspector.InspectorFrontendHostStub.prototype.addResourceSourceToFrame): (.WebInspector.InspectorFrontendHostStub.prototype.addSourceToFrame): (.WebInspector.InspectorFrontendHostStub.prototype.loaded): (.WebInspector.InspectorFrontendHostStub.prototype.localizedStringsURL): (.WebInspector.InspectorFrontendHostStub.prototype.hiddenPanels): (.WebInspector.InspectorFrontendHostStub.prototype.setSetting): (.WebInspector.InspectorFrontendHostStub.prototype.setting):
  • inspector/front-end/ProfileView.js: (WebInspector.CPUProfileView): (WebInspector.CPUProfileType.prototype.buttonClicked):
  • inspector/front-end/ProfilesPanel.js: (WebInspector.ProfilesPanel.prototype._updateInterface): (WebInspector.ProfilesPanel.prototype._enableProfiling): (WebInspector.ProfilesPanel.prototype._toggleProfiling):
  • inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.reset): (WebInspector.ResourcesPanel.prototype._toggleLargerResources): (WebInspector.ResourcesPanel.prototype._enableResourceTracking): (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
  • inspector/front-end/ScriptView.js: (WebInspector.ScriptView.prototype.setupSourceFrameIfNeeded):
  • inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.show): (WebInspector.ScriptsPanel.prototype.addScript): (WebInspector.ScriptsPanel.prototype.attachDebuggerWhenShown): (WebInspector.ScriptsPanel.prototype.reset): (WebInspector.ScriptsPanel.prototype.canShowResource): (WebInspector.ScriptsPanel.prototype._showScriptOrResource): (WebInspector.ScriptsPanel.prototype._addScriptToFilesMenu): (WebInspector.ScriptsPanel.prototype._updatePauseOnExceptionsButton): (WebInspector.ScriptsPanel.prototype._updateDebuggerButtons): (WebInspector.ScriptsPanel.prototype._enableDebugging): (WebInspector.ScriptsPanel.prototype._toggleDebugging): (WebInspector.ScriptsPanel.prototype._togglePauseOnExceptions): (WebInspector.ScriptsPanel.prototype._togglePause): (WebInspector.ScriptsPanel.prototype._stepOverClicked): (WebInspector.ScriptsPanel.prototype._stepIntoClicked): (WebInspector.ScriptsPanel.prototype._stepOutClicked):
  • inspector/front-end/SourceView.js: (WebInspector.SourceView.prototype.setupSourceFrameIfNeeded): (WebInspector.SourceView.prototype.performSearch.findSearchMatches): (WebInspector.SourceView.prototype.performSearch):
  • inspector/front-end/StylesSidebarPane.js: (WebInspector.StylesSidebarPane.prototype._changeColorFormat):
  • inspector/front-end/TestController.js: (WebInspector.TestController.prototype.notifyDone):
  • inspector/front-end/TimelinePanel.js: (WebInspector.TimelinePanel.prototype._toggleTimelineButtonClicked):
  • inspector/front-end/WatchExpressionsSidebarPane.js: (WebInspector.WatchExpressionsSection.prototype.update): (WebInspector.WatchExpressionsSection.prototype.loadSavedExpressions): (WebInspector.WatchExpressionsSection.prototype.saveExpressions):
  • inspector/front-end/WebKit.qrc:
  • inspector/front-end/inspector.html:
  • inspector/front-end/inspector.js: (WebInspector.pendingDispatches.0.get platform): (WebInspector.get port): (WebInspector.set currentPanel): (WebInspector._createPanels): (WebInspector._loadPreferences): (WebInspector.set attached): (WebInspector._updateHoverHighlight): (WebInspector.loaded): (windowLoaded): (WebInspector.windowUnload): (WebInspector.close): (WebInspector.toolbarDrag): (WebInspector.UIString):
Location:
trunk/WebCore
Files:
7 added
2 deleted
49 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r51527 r51528  
     12009-11-27  Pavel Feldman  <pfeldman@dhcp-172-28-174-220.spb.corp.google.com>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: Split InspectorBackend into three parts: backend,
     6        injected script host and frontend host.
     7       
     8        https://bugs.webkit.org/show_bug.cgi?id=31888
     9
     10        * DerivedSources.make:
     11        * GNUmakefile.am:
     12        * WebCore.gypi:
     13        * WebCore.pro:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * WebCoreSources.bkl:
     17        * bindings/js/JSBindingsAllInOne.cpp:
     18        * bindings/js/JSInspectorBackendCustom.cpp: Removed.
     19        * bindings/js/JSInspectorFrontendHostCustom.cpp: Added.
     20        (WebCore::JSInspectorFrontendHost::search):
     21        (WebCore::JSInspectorFrontendHost::setting):
     22        (WebCore::JSInspectorFrontendHost::setSetting):
     23        * bindings/js/ScriptObject.cpp:
     24        (WebCore::ScriptGlobalObject::set):
     25        * bindings/js/ScriptObject.h:
     26        * bindings/v8/DOMObjectsInclude.h:
     27        * bindings/v8/DerivedSourcesAllInOne.cpp:
     28        * bindings/v8/ScriptObject.cpp:
     29        (WebCore::ScriptGlobalObject::set):
     30        * bindings/v8/ScriptObject.h:
     31        * bindings/v8/V8Index.cpp:
     32        * bindings/v8/V8Index.h:
     33        * bindings/v8/custom/V8CustomBinding.h:
     34        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp: Added.
     35        (WebCore::CALLBACK_FUNC_DECL):
     36        * bindings/v8/custom/V8InspectorBackendCustom.cpp: Removed.
     37        * bindings/v8/custom/V8InspectorFrontendHostCustom.cpp: Added.
     38        (WebCore::CALLBACK_FUNC_DECL):
     39        * inspector/InjectedScriptHost.cpp: Added.
     40        (WebCore::InjectedScriptHost::InjectedScriptHost):
     41        (WebCore::InjectedScriptHost::~InjectedScriptHost):
     42        (WebCore::InjectedScriptHost::copyText):
     43        (WebCore::InjectedScriptHost::nodeForId):
     44        (WebCore::InjectedScriptHost::wrapObject):
     45        (WebCore::InjectedScriptHost::unwrapObject):
     46        (WebCore::InjectedScriptHost::pushNodePathToFrontend):
     47        (WebCore::InjectedScriptHost::addNodesToSearchResult):
     48        (WebCore::InjectedScriptHost::currentCallFrame):
     49        (WebCore::InjectedScriptHost::databaseForId):
     50        (WebCore::InjectedScriptHost::selectDatabase):
     51        (WebCore::InjectedScriptHost::selectDOMStorage):
     52        (WebCore::InjectedScriptHost::reportDidDispatchOnInjectedScript):
     53        (WebCore::InjectedScriptHost::inspectorDOMAgent):
     54        (WebCore::InjectedScriptHost::inspectorFrontend):
     55        * inspector/InjectedScriptHost.h: Added.
     56        (WebCore::InjectedScriptHost::create):
     57        (WebCore::InjectedScriptHost::inspectorController):
     58        (WebCore::InjectedScriptHost::disconnectController):
     59        * inspector/InjectedScriptHost.idl: Added.
     60        * inspector/InspectorBackend.cpp:
     61        (WebCore::InspectorBackend::InspectorBackend):
     62        (WebCore::InspectorBackend::storeLastActivePanel):
     63        (WebCore::InspectorBackend::toggleNodeSearch):
     64        (WebCore::InspectorBackend::resourceTrackingEnabled):
     65        (WebCore::InspectorBackend::debuggerEnabled):
     66        (WebCore::InspectorBackend::enableDebugger):
     67        (WebCore::InspectorBackend::disableDebugger):
     68        (WebCore::InspectorBackend::addBreakpoint):
     69        (WebCore::InspectorBackend::updateBreakpoint):
     70        (WebCore::InspectorBackend::removeBreakpoint):
     71        (WebCore::InspectorBackend::pauseInDebugger):
     72        (WebCore::InspectorBackend::resumeDebugger):
     73        (WebCore::InspectorBackend::stepOverStatementInDebugger):
     74        (WebCore::InspectorBackend::stepIntoStatementInDebugger):
     75        (WebCore::InspectorBackend::stepOutOfFunctionInDebugger):
     76        (WebCore::InspectorBackend::pauseOnExceptions):
     77        (WebCore::InspectorBackend::setPauseOnExceptions):
     78        (WebCore::InspectorBackend::profilerEnabled):
     79        (WebCore::InspectorBackend::enableProfiler):
     80        (WebCore::InspectorBackend::disableProfiler):
     81        (WebCore::InspectorBackend::startProfiling):
     82        (WebCore::InspectorBackend::stopProfiling):
     83        (WebCore::InspectorBackend::getProfileHeaders):
     84        (WebCore::InspectorBackend::getProfile):
     85        (WebCore::InspectorBackend::currentCallFrame):
     86        (WebCore::InspectorBackend::highlightDOMNode):
     87        (WebCore::InspectorBackend::hideDOMNodeHighlight):
     88        (WebCore::InspectorBackend::getCookies):
     89        (WebCore::InspectorBackend::deleteCookie):
     90        (WebCore::InspectorBackend::didEvaluateForTestInFrontend):
     91        (WebCore::InspectorBackend::nodeForId):
     92        * inspector/InspectorBackend.h:
     93        (WebCore::InspectorBackend::create):
     94        * inspector/InspectorBackend.idl:
     95        * inspector/InspectorController.cpp:
     96        (WebCore::InspectorController::InspectorController):
     97        (WebCore::InspectorController::~InspectorController):
     98        (WebCore::InspectorController::inspectedPageDestroyed):
     99        (WebCore::InspectorController::windowScriptObjectAvailable):
     100        * inspector/InspectorController.h:
     101        (WebCore::InspectorController::inspectorFrontendHost):
     102        (WebCore::InspectorController::injectedScriptHost):
     103        * inspector/InspectorFrontendHost.cpp: Added.
     104        (WebCore::InspectorFrontendHost::InspectorFrontendHost):
     105        (WebCore::InspectorFrontendHost::~InspectorFrontendHost):
     106        (WebCore::InspectorFrontendHost::loaded):
     107        (WebCore::InspectorFrontendHost::attach):
     108        (WebCore::InspectorFrontendHost::detach):
     109        (WebCore::InspectorFrontendHost::closeWindow):
     110        (WebCore::InspectorFrontendHost::windowUnloading):
     111        (WebCore::InspectorFrontendHost::setAttachedWindowHeight):
     112        (WebCore::InspectorFrontendHost::moveWindowBy):
     113        (WebCore::InspectorFrontendHost::localizedStringsURL):
     114        (WebCore::InspectorFrontendHost::hiddenPanels):
     115        (WebCore::InspectorFrontendHost::platform):
     116        (WebCore::InspectorFrontendHost::port):
     117        (WebCore::InspectorFrontendHost::addResourceSourceToFrame):
     118        (WebCore::InspectorFrontendHost::addSourceToFrame):
     119        * inspector/InspectorFrontendHost.h: Added.
     120        (WebCore::InspectorFrontendHost::create):
     121        (WebCore::InspectorFrontendHost::inspectorController):
     122        (WebCore::InspectorFrontendHost::disconnectController):
     123        * inspector/InspectorFrontendHost.idl: Added.
     124        * inspector/front-end/Breakpoint.js:
     125        (WebInspector.Breakpoint.prototype.set condition):
     126        * inspector/front-end/BreakpointsSidebarPane.js:
     127        (WebInspector.BreakpointsSidebarPane.prototype.addBreakpoint):
     128        (WebInspector.BreakpointsSidebarPane.prototype.removeBreakpoint):
     129        (WebInspector.BreakpointsSidebarPane.prototype._breakpointEnableChanged):
     130        * inspector/front-end/ConsoleView.js:
     131        (WebInspector.ConsoleView.prototype.clearMessages):
     132        * inspector/front-end/CookieItemsView.js:
     133        (WebInspector.CookieItemsView.prototype._deleteCookieCallback):
     134        * inspector/front-end/DOMAgent.js:
     135        (WebInspector.DOMAgent.prototype.getChildNodesAsync):
     136        (WebInspector.DOMAgent.prototype.setAttributeAsync):
     137        (WebInspector.DOMAgent.prototype.removeAttributeAsync):
     138        (WebInspector.DOMAgent.prototype.setTextNodeValueAsync):
     139        (WebInspector.Cookies.getCookiesAsync):
     140        (WebInspector.EventListeners.getEventListenersForNodeAsync):
     141        * inspector/front-end/DOMStorage.js:
     142        (WebInspector.DOMStorage.prototype.getEntries):
     143        (WebInspector.DOMStorage.prototype.setItem):
     144        (WebInspector.DOMStorage.prototype.removeItem):
     145        * inspector/front-end/Database.js:
     146        (WebInspector.Database.prototype.getTableNames):
     147        * inspector/front-end/ElementsPanel.js:
     148        (WebInspector.ElementsPanel.this.treeOutline.focusedNodeChanged):
     149        (WebInspector.ElementsPanel.prototype.hide):
     150        (WebInspector.ElementsPanel.prototype.reset):
     151        (WebInspector.ElementsPanel.prototype.handleCopyEvent):
     152        (WebInspector.ElementsPanel.prototype._nodeSearchButtonClicked):
     153        * inspector/front-end/ElementsTreeOutline.js:
     154        (WebInspector.ElementsTreeOutline.prototype.set focusedDOMNode.restoreHighlightToHoveredNode):
     155        (WebInspector.ElementsTreeOutline.prototype.set focusedDOMNode):
     156        ():
     157        * inspector/front-end/EventListenersSidebarPane.js:
     158        (WebInspector.EventListenersSidebarPane.prototype):
     159        * inspector/front-end/InjectedScript.js:
     160        (InjectedScript._evaluateAndWrap):
     161        (InjectedScript.performSearch.addNodesToResults):
     162        (InjectedScript.getCallFrames):
     163        (InjectedScript._callFrameForId):
     164        (InjectedScript._clearConsoleMessages):
     165        (InjectedScript._inspectObject):
     166        (InjectedScript._copy):
     167        (InjectedScript._ensureCommandLineAPIInstalled):
     168        (InjectedScript._window):
     169        (InjectedScript._nodeForId):
     170        (InjectedScript._objectForId):
     171        (InjectedScript.pushNodeToFrontend):
     172        (InjectedScript.executeSql):
     173        (InjectedScript.executeSql.errorCallback):
     174        (InjectedScript.executeSql.queryTransaction):
     175        * inspector/front-end/InjectedScriptAccess.js:
     176        (InjectedScriptAccess._installHandler.InjectedScriptAccess.methodName):
     177        (InjectedScriptAccess._installHandler):
     178        * inspector/front-end/InspectorBackendStub.js: Added.
     179        (.WebInspector.InspectorBackendStub):
     180        (.WebInspector.InspectorBackendStub.prototype.wrapCallback):
     181        (.WebInspector.InspectorBackendStub.prototype.platform):
     182        (.WebInspector.InspectorBackendStub.prototype.port):
     183        (.WebInspector.InspectorBackendStub.prototype.closeWindow):
     184        (.WebInspector.InspectorBackendStub.prototype.attach):
     185        (.WebInspector.InspectorBackendStub.prototype.detach):
     186        (.WebInspector.InspectorBackendStub.prototype.storeLastActivePanel):
     187        (.WebInspector.InspectorBackendStub.prototype.clearMessages):
     188        (.WebInspector.InspectorBackendStub.prototype.searchingForNode):
     189        (.WebInspector.InspectorBackendStub.prototype.search):
     190        (.WebInspector.InspectorBackendStub.prototype.toggleNodeSearch):
     191        (.WebInspector.InspectorBackendStub.prototype.setAttachedWindowHeight):
     192        (.WebInspector.InspectorBackendStub.prototype.moveByUnrestricted):
     193        (.WebInspector.InspectorBackendStub.prototype.addResourceSourceToFrame):
     194        (.WebInspector.InspectorBackendStub.prototype.addSourceToFrame):
     195        (.WebInspector.InspectorBackendStub.prototype.getResourceDocumentNode):
     196        (.WebInspector.InspectorBackendStub.prototype.highlightDOMNode):
     197        (.WebInspector.InspectorBackendStub.prototype.hideDOMNodeHighlight):
     198        (.WebInspector.InspectorBackendStub.prototype.inspectedWindow):
     199        (.WebInspector.InspectorBackendStub.prototype.loaded):
     200        (.WebInspector.InspectorBackendStub.prototype.localizedStringsURL):
     201        (.WebInspector.InspectorBackendStub.prototype.windowUnloading):
     202        (.WebInspector.InspectorBackendStub.prototype.hiddenPanels):
     203        (.WebInspector.InspectorBackendStub.prototype.debuggerEnabled):
     204        (.WebInspector.InspectorBackendStub.prototype.enableResourceTracking):
     205        (.WebInspector.InspectorBackendStub.prototype.disableResourceTracking):
     206        (.WebInspector.InspectorBackendStub.prototype.resourceTrackingEnabled):
     207        (.WebInspector.InspectorBackendStub.prototype.enableDebugger):
     208        (.WebInspector.InspectorBackendStub.prototype.disableDebugger):
     209        (.WebInspector.InspectorBackendStub.prototype.addBreakpoint):
     210        (.WebInspector.InspectorBackendStub.prototype.removeBreakpoint):
     211        (.WebInspector.InspectorBackendStub.prototype.updateBreakpoint):
     212        (.WebInspector.InspectorBackendStub.prototype.pauseInDebugger):
     213        (.WebInspector.InspectorBackendStub.prototype.pauseOnExceptions):
     214        (.WebInspector.InspectorBackendStub.prototype.setPauseOnExceptions):
     215        (.WebInspector.InspectorBackendStub.prototype.resumeDebugger):
     216        (.WebInspector.InspectorBackendStub.prototype.profilerEnabled):
     217        (.WebInspector.InspectorBackendStub.prototype.enableProfiler):
     218        (.WebInspector.InspectorBackendStub.prototype.disableProfiler):
     219        (.WebInspector.InspectorBackendStub.prototype.startProfiling):
     220        (.WebInspector.InspectorBackendStub.prototype.stopProfiling):
     221        (.WebInspector.InspectorBackendStub.prototype.getProfileHeaders):
     222        (.WebInspector.InspectorBackendStub.prototype.getProfile):
     223        (.WebInspector.InspectorBackendStub.prototype.takeHeapSnapshot):
     224        (.WebInspector.InspectorBackendStub.prototype.databaseTableNames):
     225        (.WebInspector.InspectorBackendStub.prototype.stepIntoStatementInDebugger):
     226        (.WebInspector.InspectorBackendStub.prototype.stepOutOfFunctionInDebugger):
     227        (.WebInspector.InspectorBackendStub.prototype.stepOverStatementInDebugger):
     228        (.WebInspector.InspectorBackendStub.prototype.setSetting):
     229        (.WebInspector.InspectorBackendStub.prototype.dispatchOnInjectedScript):
     230        (.WebInspector.InspectorBackendStub.prototype.releaseWrapperObjectGroup):
     231        (.WebInspector.InspectorBackendStub.prototype.setting):
     232        * inspector/front-end/InspectorControllerStub.js:
     233        * inspector/front-end/InspectorFrontendHostStub.js: Added.
     234        (.WebInspector.InspectorFrontendHostStub):
     235        (.WebInspector.InspectorFrontendHostStub.prototype.platform):
     236        (.WebInspector.InspectorFrontendHostStub.prototype.port):
     237        (.WebInspector.InspectorFrontendHostStub.prototype.closeWindow):
     238        (.WebInspector.InspectorFrontendHostStub.prototype.attach):
     239        (.WebInspector.InspectorFrontendHostStub.prototype.detach):
     240        (.WebInspector.InspectorFrontendHostStub.prototype.search):
     241        (.WebInspector.InspectorFrontendHostStub.prototype.setAttachedWindowHeight):
     242        (.WebInspector.InspectorFrontendHostStub.prototype.moveWindowBy):
     243        (.WebInspector.InspectorFrontendHostStub.prototype.addResourceSourceToFrame):
     244        (.WebInspector.InspectorFrontendHostStub.prototype.addSourceToFrame):
     245        (.WebInspector.InspectorFrontendHostStub.prototype.loaded):
     246        (.WebInspector.InspectorFrontendHostStub.prototype.localizedStringsURL):
     247        (.WebInspector.InspectorFrontendHostStub.prototype.hiddenPanels):
     248        (.WebInspector.InspectorFrontendHostStub.prototype.setSetting):
     249        (.WebInspector.InspectorFrontendHostStub.prototype.setting):
     250        * inspector/front-end/ProfileView.js:
     251        (WebInspector.CPUProfileView):
     252        (WebInspector.CPUProfileType.prototype.buttonClicked):
     253        * inspector/front-end/ProfilesPanel.js:
     254        (WebInspector.ProfilesPanel.prototype._updateInterface):
     255        (WebInspector.ProfilesPanel.prototype._enableProfiling):
     256        (WebInspector.ProfilesPanel.prototype._toggleProfiling):
     257        * inspector/front-end/ResourcesPanel.js:
     258        (WebInspector.ResourcesPanel.prototype.reset):
     259        (WebInspector.ResourcesPanel.prototype._toggleLargerResources):
     260        (WebInspector.ResourcesPanel.prototype._enableResourceTracking):
     261        (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
     262        * inspector/front-end/ScriptView.js:
     263        (WebInspector.ScriptView.prototype.setupSourceFrameIfNeeded):
     264        * inspector/front-end/ScriptsPanel.js:
     265        (WebInspector.ScriptsPanel.prototype.show):
     266        (WebInspector.ScriptsPanel.prototype.addScript):
     267        (WebInspector.ScriptsPanel.prototype.attachDebuggerWhenShown):
     268        (WebInspector.ScriptsPanel.prototype.reset):
     269        (WebInspector.ScriptsPanel.prototype.canShowResource):
     270        (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
     271        (WebInspector.ScriptsPanel.prototype._addScriptToFilesMenu):
     272        (WebInspector.ScriptsPanel.prototype._updatePauseOnExceptionsButton):
     273        (WebInspector.ScriptsPanel.prototype._updateDebuggerButtons):
     274        (WebInspector.ScriptsPanel.prototype._enableDebugging):
     275        (WebInspector.ScriptsPanel.prototype._toggleDebugging):
     276        (WebInspector.ScriptsPanel.prototype._togglePauseOnExceptions):
     277        (WebInspector.ScriptsPanel.prototype._togglePause):
     278        (WebInspector.ScriptsPanel.prototype._stepOverClicked):
     279        (WebInspector.ScriptsPanel.prototype._stepIntoClicked):
     280        (WebInspector.ScriptsPanel.prototype._stepOutClicked):
     281        * inspector/front-end/SourceView.js:
     282        (WebInspector.SourceView.prototype.setupSourceFrameIfNeeded):
     283        (WebInspector.SourceView.prototype.performSearch.findSearchMatches):
     284        (WebInspector.SourceView.prototype.performSearch):
     285        * inspector/front-end/StylesSidebarPane.js:
     286        (WebInspector.StylesSidebarPane.prototype._changeColorFormat):
     287        * inspector/front-end/TestController.js:
     288        (WebInspector.TestController.prototype.notifyDone):
     289        * inspector/front-end/TimelinePanel.js:
     290        (WebInspector.TimelinePanel.prototype._toggleTimelineButtonClicked):
     291        * inspector/front-end/WatchExpressionsSidebarPane.js:
     292        (WebInspector.WatchExpressionsSection.prototype.update):
     293        (WebInspector.WatchExpressionsSection.prototype.loadSavedExpressions):
     294        (WebInspector.WatchExpressionsSection.prototype.saveExpressions):
     295        * inspector/front-end/WebKit.qrc:
     296        * inspector/front-end/inspector.html:
     297        * inspector/front-end/inspector.js:
     298        (WebInspector.pendingDispatches.0.get platform):
     299        (WebInspector.get port):
     300        (WebInspector.set currentPanel):
     301        (WebInspector._createPanels):
     302        (WebInspector._loadPreferences):
     303        (WebInspector.set attached):
     304        (WebInspector._updateHoverHighlight):
     305        (WebInspector.loaded):
     306        (windowLoaded):
     307        (WebInspector.windowUnload):
     308        (WebInspector.close):
     309        (WebInspector.toolbarDrag):
     310        (WebInspector.UIString):
     311
    13122009-11-30  Shinichiro Hamaji  <hamaji@chromium.org>
    2313

  • trunk/WebCore/DerivedSources.make

    r51519 r51528  
    201201    History \
    202202    ImageData \
     203    InjectedScriptHost \
    203204    InspectorBackend \
     205    InspectorFrontendHost \
    204206    KeyboardEvent \
    205207    Location \

  • trunk/WebCore/GNUmakefile.am

    r51486 r51528  
    247247        WebCore/html/VoidCallback.idl \
    248248        WebCore/inspector/JavaScriptCallFrame.idl \
     249        WebCore/inspector/InjectedScriptHost.idl \
    249250        WebCore/inspector/InspectorBackend.idl \
     251        WebCore/inspector/InspectorFrontendHost.idl \
    250252        WebCore/notifications/Notification.idl \
    251253        WebCore/notifications/NotificationCenter.idl \
    … …  
    399401        WebCore/bindings/js/JSImageConstructor.h \
    400402        WebCore/bindings/js/JSImageDataCustom.cpp \
    401         WebCore/bindings/js/JSInspectorBackendCustom.cpp \
     403        WebCore/bindings/js/JSInjectedScriptHostCustom.cpp \
     404        WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp \
    402405        WebCore/bindings/js/JSInspectedObjectWrapper.cpp \
    403406        WebCore/bindings/js/JSInspectedObjectWrapper.h \
    … …  
    11701173        WebCore/inspector/ConsoleMessage.cpp \
    11711174        WebCore/inspector/ConsoleMessage.h \
     1175        WebCore/inspector/InjectedScriptHost.cpp \
     1176        WebCore/inspector/InjectedScriptHost.h \
    11721177        WebCore/inspector/InspectorBackend.cpp \
    11731178        WebCore/inspector/InspectorBackend.h \
    … …  
    11831188        WebCore/inspector/InspectorFrontend.cpp \
    11841189        WebCore/inspector/InspectorFrontend.h \
     1190        WebCore/inspector/InspectorFrontendHost.cpp \
     1191        WebCore/inspector/InspectorFrontendHost.h \
    11851192        WebCore/inspector/InspectorResource.cpp \
    11861193        WebCore/inspector/InspectorResource.h \

  • trunk/WebCore/WebCore.gypi

    r51348 r51528  
    180180            'html/ValidityState.idl',
    181181            'html/VoidCallback.idl',
     182            'inspector/InjectedScriptHost.idl',
    182183            'inspector/InspectorBackend.idl',
     184            'inspector/InspectorFrontendHost.idl',
    183185            'inspector/JavaScriptCallFrame.idl',
    184186            'loader/appcache/DOMApplicationCache.idl',
    … …  
    523525            'bindings/js/JSInspectorCallbackWrapper.cpp',
    524526            'bindings/js/JSInspectorCallbackWrapper.h',
    525             'bindings/js/JSInspectorBackendCustom.cpp',
     527            'bindings/js/JSInjectedScriptHostCustom.cpp',
     528            'bindings/js/JSInspectorFrontendHostCustom.cpp',
    526529            'bindings/js/JSJavaScriptCallFrameCustom.cpp',
    527530            'bindings/js/JSLazyEventListener.cpp',
    … …  
    699702            'bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
    700703            'bindings/v8/custom/V8HTMLSelectElementCustom.h',
    701             'bindings/v8/custom/V8InspectorBackendCustom.cpp',
     704            'bindings/v8/custom/V8InjectedScriptHostCustom.cpp',
     705            'bindings/v8/custom/V8InspectorFrontendHostCustom.cpp',
    702706            'bindings/v8/custom/V8LocationCustom.cpp',
    703707            'bindings/v8/custom/V8MessageChannelConstructor.cpp',
    … …  
    15211525            'inspector/ConsoleMessage.cpp',
    15221526            'inspector/ConsoleMessage.h',
     1527            'inspector/InjectedScriptHost.cpp',
     1528            'inspector/InjectedScriptHost.h',
    15231529            'inspector/InspectorBackend.cpp',
    15241530            'inspector/InspectorBackend.h',
    … …  
    15331539            'inspector/InspectorFrontend.cpp',
    15341540            'inspector/InspectorFrontend.h',
     1541            'inspector/InspectorFrontendHost.cpp',
     1542            'inspector/InspectorFrontendHost.h',
    15351543            'inspector/InspectorResource.cpp',
    15361544            'inspector/InspectorResource.h',
    … …  
    36353643            'inspector/front-end/FontView.js',
    36363644            'inspector/front-end/ImageView.js',
    3637             'inspector/front-end/InspectorControllerStub.js',
     3645            'inspector/front-end/InspectorBackendStub.js',
     3646            'inspector/front-end/InspectorFrontendHostStub.js',
    36383647            'inspector/front-end/InjectedScript.js',
    36393648            'inspector/front-end/InjectedScriptAccess.js',

  • trunk/WebCore/WebCore.pro

    r51414 r51528  
    467467    html/ValidityState.idl \
    468468    html/VoidCallback.idl \
     469    inspector/InjectedScriptHost.idl \
    469470    inspector/InspectorBackend.idl \
     471    inspector/InspectorFrontendHost.idl \
    470472    inspector/JavaScriptCallFrame.idl \
    471473    loader/appcache/DOMApplicationCache.idl \
    … …  
    720722    bindings/js/JSImageConstructor.cpp \
    721723    bindings/js/JSImageDataCustom.cpp \
     724    bindings/js/JSInjectedScriptHostCustom.cpp \
    722725    bindings/js/JSInspectedObjectWrapper.cpp \
    723     bindings/js/JSInspectorBackendCustom.cpp \
     726    bindings/js/JSInspectorFrontendHostCustom.cpp \
    724727    bindings/js/JSInspectorCallbackWrapper.cpp \
    725728    bindings/js/JSLocationCustom.cpp \
    … …  
    10761079    html/ValidityState.cpp \
    10771080    inspector/ConsoleMessage.cpp \
     1081    inspector/InjectedScriptHost.cpp \
    10781082    inspector/InspectorBackend.cpp \
    10791083    inspector/InspectorController.cpp \
    … …  
    10821086    inspector/InspectorDOMStorageResource.cpp \
    10831087    inspector/InspectorFrontend.cpp \
     1088    inspector/InspectorFrontendHost.cpp \
    10841089    inspector/InspectorResource.cpp \
    10851090    inspector/InspectorTimelineAgent.cpp \
    … …  
    17581763    html/ValidityState.h \
    17591764    inspector/ConsoleMessage.h \
     1765    inspector/InjectedScriptHost.h \
    17601766    inspector/InspectorBackend.h \
    17611767    inspector/InspectorController.h \
    … …  
    17631769    inspector/InspectorDOMStorageResource.h \
    17641770    inspector/InspectorFrontend.h \
     1771    inspector/InspectorFrontendHost.h \
    17651772    inspector/InspectorResource.h \
    17661773    inspector/InspectorTimelineAgent.h \

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

    r51377 r51528  
    77327732                        </File>
    77337733                        <File
     7734                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInjectedScriptHost.cpp"
     7735                                >
     7736                                <FileConfiguration
     7737                                        Name="Debug|Win32"
     7738                                        ExcludedFromBuild="true"
     7739                                        >
     7740                                        <Tool
     7741                                                Name="VCCLCompilerTool"
     7742                                        />
     7743                                </FileConfiguration>
     7744                                <FileConfiguration
     7745                                        Name="Release|Win32"
     7746                                        ExcludedFromBuild="true"
     7747                                        >
     7748                                        <Tool
     7749                                                Name="VCCLCompilerTool"
     7750                                        />
     7751                                </FileConfiguration>
     7752                                <FileConfiguration
     7753                                        Name="Debug_Internal|Win32"
     7754                                        ExcludedFromBuild="true"
     7755                                        >
     7756                                        <Tool
     7757                                                Name="VCCLCompilerTool"
     7758                                        />
     7759                                </FileConfiguration>
     7760                                <FileConfiguration
     7761                                        Name="Debug_Cairo|Win32"
     7762                                        ExcludedFromBuild="true"
     7763                                        >
     7764                                        <Tool
     7765                                                Name="VCCLCompilerTool"
     7766                                        />
     7767                                </FileConfiguration>
     7768                                <FileConfiguration
     7769                                        Name="Release_Cairo|Win32"
     7770                                        ExcludedFromBuild="true"
     7771                                        >
     7772                                        <Tool
     7773                                                Name="VCCLCompilerTool"
     7774                                        />
     7775                                </FileConfiguration>
     7776                                <FileConfiguration
     7777                                        Name="Debug_All|Win32"
     7778                                        ExcludedFromBuild="true"
     7779                                        >
     7780                                        <Tool
     7781                                                Name="VCCLCompilerTool"
     7782                                        />
     7783                                </FileConfiguration>
     7784                        </File>
     7785                        <File
     7786                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInjectedScriptHost.h"
     7787                                >
     7788                        </File>
     7789                        <File
    77347790                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorBackend.cpp"
    77357791                                >
    … …  
    77847840                        </File>
    77857841                        <File
    7786                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorBackend.cpp"
    7787                                 >
    7788                         </File>
    7789                         <File
    7790                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorBackend.cpp"
     7842                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorBackend.h"
     7843                                >
     7844                        </File>
     7845                        <File
     7846                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorFrontendHost.cpp"
    77917847                                >
    77927848                                <FileConfiguration
    … …  
    78407896                        </File>
    78417897                        <File
    7842                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorBackend.h"
     7898                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSInspectorFrontendHost.h"
    78437899                                >
    78447900                        </File>
    … …  
    3729937355                                </File>
    3730037356                                <File
    37301                                         RelativePath="..\bindings\js\JSInspectorBackendCustom.cpp"
     37357                                        RelativePath="..\bindings\js\JSInjectedScriptHostCustom.cpp"
     37358                                        >
     37359                                        <FileConfiguration
     37360                                                Name="Debug|Win32"
     37361                                                ExcludedFromBuild="true"
     37362                                                >
     37363                                                <Tool
     37364                                                        Name="VCCLCompilerTool"
     37365                                                />
     37366                                        </FileConfiguration>
     37367                                        <FileConfiguration
     37368                                                Name="Release|Win32"
     37369                                                ExcludedFromBuild="true"
     37370                                                >
     37371                                                <Tool
     37372                                                        Name="VCCLCompilerTool"
     37373                                                />
     37374                                        </FileConfiguration>
     37375                                        <FileConfiguration
     37376                                                Name="Debug_Internal|Win32"
     37377                                                ExcludedFromBuild="true"
     37378                                                >
     37379                                                <Tool
     37380                                                        Name="VCCLCompilerTool"
     37381                                                />
     37382                                        </FileConfiguration>
     37383                                        <FileConfiguration
     37384                                                Name="Debug_Cairo|Win32"
     37385                                                ExcludedFromBuild="true"
     37386                                                >
     37387                                                <Tool
     37388                                                        Name="VCCLCompilerTool"
     37389                                                />
     37390                                        </FileConfiguration>
     37391                                        <FileConfiguration
     37392                                                Name="Release_Cairo|Win32"
     37393                                                ExcludedFromBuild="true"
     37394                                                >
     37395                                                <Tool
     37396                                                        Name="VCCLCompilerTool"
     37397                                                />
     37398                                        </FileConfiguration>
     37399                                        <FileConfiguration
     37400                                                Name="Debug_All|Win32"
     37401                                                ExcludedFromBuild="true"
     37402                                                >
     37403                                                <Tool
     37404                                                        Name="VCCLCompilerTool"
     37405                                                />
     37406                                        </FileConfiguration>
     37407                                </File>
     37408                                <File
     37409                                        RelativePath="..\bindings\js\JSInspectorFrontendHostCustom.cpp"
    3730237410                                        >
    3730337411                                        <FileConfiguration
    … …  
    4232042428                        </File>
    4232142429                        <File
     42430                                RelativePath="..\inspector\InjectedScriptHost.cpp"
     42431                                >
     42432                        </File>
     42433                        <File
     42434                                RelativePath="..\inspector\InjectedScriptHost.h"
     42435                                >
     42436                        <File
    4232242437                                RelativePath="..\inspector\InspectorBackend.cpp"
    4232342438                                >
    … …  
    4236942484                        <File
    4237042485                                RelativePath="..\inspector\InspectorFrontend.h"
     42486                                >
     42487                        </File>
     42488                        <File
     42489                                RelativePath="..\inspector\InspectorFrontendHost.cpp"
     42490                                >
     42491                        </File>
     42492                        <File
     42493                                RelativePath="..\inspector\InspectorFrontendHost.h"
    4237142494                                >
    4237242495                        </File>

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

    r51476 r51528  
    12301230                79F2F5A11091939A000D87CB /* CompositionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79F2F59E1091939A000D87CB /* CompositionEvent.cpp */; };
    12311231                79F2F5A21091939A000D87CB /* CompositionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 79F2F59F1091939A000D87CB /* CompositionEvent.h */; };
     1232                7A0E76D510BF050700A0276E /* JSInjectedScriptHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E76D410BF050700A0276E /* JSInjectedScriptHostCustom.cpp */; };
     1233                7A0E76DA10BF059800A0276E /* JSInjectedScriptHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E76D810BF059800A0276E /* JSInjectedScriptHost.cpp */; };
     1234                7A0E76DB10BF059800A0276E /* JSInjectedScriptHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E76D910BF059800A0276E /* JSInjectedScriptHost.h */; };
     1235                7A0E76F910BF08ED00A0276E /* InjectedScriptHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */; };
     1236                7A0E76FA10BF08ED00A0276E /* InjectedScriptHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */; };
     1237                7A0E76FB10BF08ED00A0276E /* InjectedScriptHost.idl in Resources */ = {isa = PBXBuildFile; fileRef = 7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */; };
     1238                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E770B10C00A8800A0276E /* InspectorFrontendHost.cpp */; };
     1239                7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E770C10C00A8800A0276E /* InspectorFrontendHost.h */; };
     1240                7A0E771010C00A8800A0276E /* InspectorFrontendHost.idl in Resources */ = {isa = PBXBuildFile; fileRef = 7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */; };
     1241                7A0E771E10C00DB100A0276E /* JSInspectorFrontendHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */; };
     1242                7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */; };
    12321243                7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */; };
    12331244                7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    12381249                7A74ECBA101839A600BF939E /* InspectorBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */; };
    12391250                7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorBackend.h */; };
    1240                 7A74ECBD101839DA00BF939E /* JSInspectorBackendCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorBackendCustom.cpp */; };
     1251                7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; };
    12411252                7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; };
    12421253                7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; };
    … …  
    65516562                79F2F59F1091939A000D87CB /* CompositionEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompositionEvent.h; sourceTree = "<group>"; };
    65526563                79F2F5A01091939A000D87CB /* CompositionEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CompositionEvent.idl; sourceTree = "<group>"; };
     6564                7A0E76D410BF050700A0276E /* JSInjectedScriptHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInjectedScriptHostCustom.cpp; sourceTree = "<group>"; };
     6565                7A0E76D810BF059800A0276E /* JSInjectedScriptHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSInjectedScriptHost.cpp; sourceTree = "<group>"; };
     6566                7A0E76D910BF059800A0276E /* JSInjectedScriptHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSInjectedScriptHost.h; sourceTree = "<group>"; };
     6567                7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptHost.cpp; sourceTree = "<group>"; };
     6568                7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptHost.h; sourceTree = "<group>"; };
     6569                7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = InjectedScriptHost.idl; sourceTree = "<group>"; };
     6570                7A0E770B10C00A8800A0276E /* InspectorFrontendHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontendHost.cpp; sourceTree = "<group>"; };
     6571                7A0E770C10C00A8800A0276E /* InspectorFrontendHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendHost.h; sourceTree = "<group>"; };
     6572                7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = InspectorFrontendHost.idl; sourceTree = "<group>"; };
     6573                7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSInspectorFrontendHost.cpp; sourceTree = "<group>"; };
     6574                7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSInspectorFrontendHost.h; sourceTree = "<group>"; };
    65536575                7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptArray.cpp; sourceTree = "<group>"; };
    65546576                7A1E88F4101CC384000C4DF5 /* ScriptArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptArray.h; sourceTree = "<group>"; };
    … …  
    65606582                7A74ECB8101839A500BF939E /* InspectorBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackend.cpp; sourceTree = "<group>"; };
    65616583                7A74ECB9101839A600BF939E /* InspectorBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackend.h; sourceTree = "<group>"; };
    6562                 7A74ECBC101839DA00BF939E /* JSInspectorBackendCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorBackendCustom.cpp; sourceTree = "<group>"; };
     6584                7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; };
    65636585                7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
    65646586                7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
    … …  
    1042110443                        isa = PBXGroup;
    1042210444                        children = (
     10445                                7A0E76D810BF059800A0276E /* JSInjectedScriptHost.cpp */,
     10446                                7A0E76D910BF059800A0276E /* JSInjectedScriptHost.h */,
    1042310447                                41F060CB0F5EEB2B00A07EAC /* JSInspectorBackend.cpp */,
    1042410448                                41F060CC0F5EEB2B00A07EAC /* JSInspectorBackend.h */,
     10449                                7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */,
     10450                                7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */,
    1042510451                                1C5FAECF0DCFD90100D58F78 /* JSJavaScriptCallFrame.cpp */,
    1042610452                                1C5FAED00DCFD90100D58F78 /* JSJavaScriptCallFrame.h */,
    … …  
    1043510461                                41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */,
    1043610462                                41F0618C0F5F069800A07EAC /* ConsoleMessage.h */,
     10463                                7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */,
     10464                                7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */,
     10465                                7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */,
    1043710466                                7A74ECB8101839A500BF939E /* InspectorBackend.cpp */,
    1043810467                                7A74ECB9101839A600BF939E /* InspectorBackend.h */,
    … …  
    1044910478                                7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */,
    1045010479                                7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */,
     10480                                7A0E770B10C00A8800A0276E /* InspectorFrontendHost.cpp */,
     10481                                7A0E770C10C00A8800A0276E /* InspectorFrontendHost.h */,
     10482                                7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */,
    1045110483                                41F062000F5F0B6600A07EAC /* InspectorResource.cpp */,
    1045210484                                41F061FF0F5F0B6600A07EAC /* InspectorResource.h */,
    … …  
    1453114563                                AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */,
    1453214564                                A7D0318D0E93540300E24ACD /* JSImageDataCustom.cpp */,
    14533                                 7A74ECBC101839DA00BF939E /* JSInspectorBackendCustom.cpp */,
     14565                                7A0E76D410BF050700A0276E /* JSInjectedScriptHostCustom.cpp */,
     14566                                7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */,
    1453414567                                1C5FAEE60DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp */,
    1453514568                                BCE1C43F0D9830F4003B02F2 /* JSLocationCustom.cpp */,
    … …  
    1818018213                                AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */,
    1818118214                                6E47E66110B7944B00B186C8 /* WebGLGetInfo.h in Headers */,
     18215                                7A0E76DB10BF059800A0276E /* JSInjectedScriptHost.h in Headers */,
     18216                                7A0E76FA10BF08ED00A0276E /* InjectedScriptHost.h in Headers */,
     18217                                7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */,
     18218                                7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */,
    1818218219                        );
    1818318220                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1828318320                                18C5FCA710A3991F0048438D /* WebKitSharedScript.idl in Resources */,
    1828418321                                18C5FCB910A3C6F20048438D /* SharedScriptContext.idl in Resources */,
     18322                                7A0E76FB10BF08ED00A0276E /* InjectedScriptHost.idl in Resources */,
     18323                                7A0E771010C00A8800A0276E /* InspectorFrontendHost.idl in Resources */,
    1828518324                        );
    1828618325                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1938019419                                C091588A0DB4209200E55AF4 /* JSInspectedObjectWrapper.cpp in Sources */,
    1938119420                                41F060CD0F5EEB2B00A07EAC /* JSInspectorBackend.cpp in Sources */,
    19382                                 7A74ECBD101839DA00BF939E /* JSInspectorBackendCustom.cpp in Sources */,
     19421                                7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */,
    1938319422                                C091588C0DB4209200E55AF4 /* JSInspectorCallbackWrapper.cpp in Sources */,
    1938419423                                1C5FAED10DCFD90100D58F78 /* JSJavaScriptCallFrame.cpp in Sources */,
    … …  
    2033020369                                E1B4CD2510B322E200BFFD7E /* CredentialStorageMac.mm in Sources */,
    2033120370                                6E47E66010B7944B00B186C8 /* WebGLGetInfo.cpp in Sources */,
     20371                                7A0E76D510BF050700A0276E /* JSInjectedScriptHostCustom.cpp in Sources */,
     20372                                7A0E76DA10BF059800A0276E /* JSInjectedScriptHost.cpp in Sources */,
     20373                                7A0E76F910BF08ED00A0276E /* InjectedScriptHost.cpp in Sources */,
     20374                                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
     20375                                7A0E771E10C00DB100A0276E /* JSInspectorFrontendHost.cpp in Sources */,
    2033220376                        );
    2033320377                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/WebCoreSources.bkl

    r51063 r51528  
    112112        bindings/js/JSImageConstructor.cpp
    113113        bindings/js/JSImageDataCustom.cpp
     114        bindings/js/JSInjectedScriptHostCustom.cpp
    114115        bindings/js/JSInspectedObjectWrapper.cpp
    115         bindings/js/JSInspectorBackendCustom.cpp
     116        bindings/js/JSInspectorFrontendHostCustom.cpp
    116117        bindings/js/JSInspectorCallbackWrapper.cpp
    117118        bindings/js/JSJavaScriptCallFrameCustom.cpp
    … …  
    367368        DerivedSources/WebCore/JSHistory.cpp
    368369        DerivedSources/WebCore/JSImageData.cpp
     370        DerivedSources/WebCore/JSInjectedScriptHost.cpp
    369371        DerivedSources/WebCore/JSInspectorBackend.cpp
     372        DerivedSources/WebCore/JSInspectorFrontendHost.cpp
    370373        DerivedSources/WebCore/JSJavaScriptCallFrame.cpp
    371374        DerivedSources/WebCore/JSKeyboardEvent.cpp
    … …  
    683686    <set append="1" var="WEBCORE_SOURCES_INSPECTOR">
    684687        inspector/ConsoleMessage.cpp
     688        inspector/InjectedScriptHost.cpp
    685689        inspector/InspectorBackend.cpp
     690        inspector/InspectorFrontendHost.cpp
    686691        inspector/InspectorDatabaseResource.cpp
    687692        inspector/InspectorDOMAgent.cpp

  • trunk/WebCore/bindings/js/JSBindingsAllInOne.cpp

    r50261 r51528  
    8686#include "JSImageConstructor.cpp"
    8787#include "JSImageDataCustom.cpp"
     88#include "JSInjectedScriptHostCustom.cpp"
    8889#include "JSInspectedObjectWrapper.cpp"
    89 #include "JSInspectorBackendCustom.cpp"
     90#include "JSInspectorFrontendHostCustom.cpp"
    9091#include "JSJavaScriptCallFrameCustom.cpp"
    9192#include "JSLazyEventListener.cpp"

  • trunk/WebCore/bindings/js/ScriptObject.cpp

    r51439 r51528  
    3737
    3838#if ENABLE(INSPECTOR)
     39#include "JSInjectedScriptHost.h"
    3940#include "JSInspectorBackend.h"
     41#include "JSInspectorFrontendHost.h"
    4042#endif
    4143
    … …  
    160162    return handleException(scriptState);
    161163}
     164
     165bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorFrontendHost* value)
     166{
     167    JSLock lock(SilenceAssertionsOnly);
     168    JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject());
     169    globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value));
     170    return handleException(scriptState);
     171}
     172
     173bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InjectedScriptHost* value)
     174{
     175    JSLock lock(SilenceAssertionsOnly);
     176    JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject());
     177    globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value));
     178    return handleException(scriptState);
     179}
    162180#endif // ENABLE(INSPECTOR)
    163181

  • trunk/WebCore/bindings/js/ScriptObject.h

    r51439 r51528  
    3939
    4040namespace WebCore {
     41    class InjectedScriptHost;
    4142    class InspectorBackend;
     43    class InspectorFrontendHost;
    4244
    4345    class ScriptObject : public ScriptValue {
    … …  
    6971#if ENABLE(INSPECTOR)
    7072        static bool set(ScriptState*, const char* name, InspectorBackend*);
     73        static bool set(ScriptState*, const char* name, InspectorFrontendHost*);
     74        static bool set(ScriptState*, const char* name, InjectedScriptHost*);
    7175#endif
    7276        static bool get(ScriptState*, const char* name, ScriptObject&);

  • trunk/WebCore/bindings/v8/DOMObjectsInclude.h

    r50968 r51528  
    258258
    259259#if ENABLE(INSPECTOR)
     260#include "InjectedScriptHost.h"
    260261#include "InspectorBackend.h"
     262#include "InspectorFrontendHost.h"
    261263#endif // INSPECTOR
    262264

  • trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp

    r51125 r51528  
    388388
    389389#if ENABLE(INSPECTOR)
     390#include "bindings/V8InjectedScriptHost.cpp"
    390391#include "bindings/V8InspectorBackend.cpp"
    391 #endif
     392#include "bindings/V8InspectorFrontendHost.cpp"
     393#endif

  • trunk/WebCore/bindings/v8/ScriptObject.cpp

    r51439 r51528  
    3737#include "Document.h"
    3838#include "Frame.h"
     39#include "InspectorBackend.h"
     40#include "InspectorFrontendHost.h"
    3941#include "V8Binding.h"
    4042#include "V8Proxy.h"
    … …  
    146148}
    147149
     150bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorFrontendHost* value)
     151{
     152    ScriptScope scope(scriptState);
     153    scope.global()->Set(v8::String::New(name), V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORFRONTENDHOST, value));
     154    return scope.success();
     155}
     156
     157bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InjectedScriptHost* value)
     158{
     159    ScriptScope scope(scriptState);
     160    scope.global()->Set(v8::String::New(name), V8DOMWrapper::convertToV8Object(V8ClassIndex::INJECTEDSCRIPTHOST, value));
     161    return scope.success();
     162}
     163
    148164bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value)
    149165{

  • trunk/WebCore/bindings/v8/ScriptObject.h

    r51439 r51528  
    3737
    3838namespace WebCore {
     39    class InjectedScriptHost;
    3940    class InspectorBackend;
     41    class InspectorFrontendHost;
    4042    class ScriptState;
    4143
    … …  
    6870        static bool set(ScriptState*, const char* name, const ScriptObject&);
    6971        static bool set(ScriptState*, const char* name, InspectorBackend*);
     72        static bool set(ScriptState*, const char* name, InspectorFrontendHost*);
     73        static bool set(ScriptState*, const char* name, InjectedScriptHost*);
    7074        static bool get(ScriptState*, const char* name, ScriptObject&);
    7175        static bool remove(ScriptState*, const char* name);

  • trunk/WebCore/bindings/v8/V8Index.cpp

    r50968 r51528  
    434434
    435435#if ENABLE(INSPECTOR)
     436#include "V8InjectedScriptHost.h"
    436437#include "V8InspectorBackend.h"
     438#include "V8InspectorFrontendHost.h"
    437439#endif
    438440

  • trunk/WebCore/bindings/v8/V8Index.h

    r50968 r51528  
    488488#if ENABLE(INSPECTOR)
    489489#define DOM_OBJECT_INSPECTOR_TYPES(V)                                   \
    490     V(INSPECTORBACKEND, InspectorBackend)
     490    V(INSPECTORBACKEND, InspectorBackend)                               \
     491    V(INSPECTORFRONTENDHOST, InspectorFrontendHost)                     \
     492    V(INJECTEDSCRIPTHOST, InjectedScriptHost)
    491493#else
    492494#define DOM_OBJECT_INSPECTOR_TYPES(V)

  • trunk/WebCore/bindings/v8/custom/V8CustomBinding.h

    r51416 r51528  
    478478        DECLARE_CALLBACK(TreeWalkerPreviousSibling);
    479479
    480         DECLARE_CALLBACK(InspectorBackendHighlightDOMNode);
    481         DECLARE_CALLBACK(InspectorBackendAddResourceSourceToFrame);
    482         DECLARE_CALLBACK(InspectorBackendAddSourceToFrame);
    483         DECLARE_CALLBACK(InspectorBackendSearch);
    484         DECLARE_CALLBACK(InspectorBackendSetting);
    485         DECLARE_CALLBACK(InspectorBackendDatabaseForId);
    486         DECLARE_CALLBACK(InspectorBackendInspectedWindow);
    487         DECLARE_CALLBACK(InspectorBackendSetSetting);
    488         DECLARE_CALLBACK(InspectorBackendCurrentCallFrame);
    489         DECLARE_CALLBACK(InspectorBackendDebuggerEnabled);
    490         DECLARE_CALLBACK(InspectorBackendPauseOnExceptions);
    491         DECLARE_CALLBACK(InspectorBackendProfilerEnabled);
    492         DECLARE_CALLBACK(InspectorBackendNodeForId);
    493         DECLARE_CALLBACK(InspectorBackendWrapObject);
    494         DECLARE_CALLBACK(InspectorBackendUnwrapObject);
    495         DECLARE_CALLBACK(InspectorBackendPushNodePathToFrontend);
     480        DECLARE_CALLBACK(InjectedScriptHostInspectedWindow);
     481        DECLARE_CALLBACK(InjectedScriptHostNodeForId);
     482        DECLARE_CALLBACK(InjectedScriptHostWrapObject);
     483        DECLARE_CALLBACK(InjectedScriptHostUnwrapObject);
     484        DECLARE_CALLBACK(InjectedScriptHostPushNodePathToFrontend);
     485        DECLARE_CALLBACK(InjectedScriptHostWrapCallback);
    496486#if ENABLE(DATABASE)
    497         DECLARE_CALLBACK(InspectorBackendSelectDatabase);
     487        DECLARE_CALLBACK(InjectedScriptHostSelectDatabase);
     488        DECLARE_CALLBACK(InjectedScriptHostDatabaseForId);
    498489#endif
    499490#if ENABLE(DOM_STORAGE)
    500         DECLARE_CALLBACK(InspectorBackendSelectDOMStorage);
    501 #endif
    502         DECLARE_CALLBACK(InspectorBackendWrapCallback);
     491        DECLARE_CALLBACK(InjectedScriptHostSelectDOMStorage);
     492#endif
     493
     494        DECLARE_CALLBACK(InspectorFrontendHostSearch);
     495        DECLARE_CALLBACK(InspectorFrontendHostSetting);
     496        DECLARE_CALLBACK(InspectorFrontendHostSetSetting);
    503497
    504498        DECLARE_CALLBACK(ConsoleProfile);

  • trunk/WebCore/inspector/InjectedScriptHost.idl

    r51527 r51528  
    11/*
     2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
     3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
    24 * Copyright (C) 2009 Google Inc. All rights reserved.
    35 *
    … …  
    2931 */
    3032
    31 WebInspector.TestController = function(callId)
    32 {
    33     this._callId = callId;
    34     this._waitUntilDone = false;
     33module core {
     34    interface [
     35        GenerateConstructor
     36    ] InjectedScriptHost {
     37        [Custom] DOMWindow inspectedWindow();
     38        [Custom] DOMObject wrapCallback(in DOMObject callback);
     39        void copyText(in DOMString text);
     40        [Custom] DOMObject nodeForId(in long nodeId);
     41        [Custom] long wrapObject(in DOMObject object, in DOMString objectGroup);
     42        [Custom] DOMObject unwrapObject(in long objectId);
     43        [Custom] int pushNodePathToFrontend(in DOMObject node, in boolean selectInUI);
     44        void addNodesToSearchResult(in DOMString nodeIds);
     45
     46#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
     47        [Custom] DOMObject currentCallFrame();
     48#endif
     49
     50#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
     51        [Custom] DOMObject databaseForId(in long databaseId);
     52        [Custom] void selectDatabase(in DOMObject database);
     53#endif
     54
     55#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
     56        [Custom] void selectDOMStorage(in DOMObject storage);
     57#endif
     58
     59        void reportDidDispatchOnInjectedScript(in long callId, in DOMString result, in boolean isException);
     60    };
    3561}
    36 
    37 WebInspector.TestController.prototype = {
    38     waitUntilDone: function()
    39     {
    40         this._waitUntilDone = true;
    41     },
    42 
    43     notifyDone: function(result)
    44     {
    45         var message = typeof result === "undefined" ? "\"<undefined>\"" : JSON.stringify(result);
    46         InspectorController.didEvaluateForTestInFrontend(this._callId, message);
    47     },
    48 
    49     runAfterPendingDispatches: function(callback)
    50     {
    51         if (WebInspector.pendingDispatches === 0) {
    52             callback();
    53             return;
    54         }
    55         setTimeout(this.runAfterPendingDispatches.bind(this), 0, callback);
    56     }
    57 }
    58 
    59 WebInspector.evaluateForTestInFrontend = function(callId, script)
    60 {
    61     var controller = new WebInspector.TestController(callId);
    62     function invokeMethod()
    63     {
    64         try {
    65             var result;
    66             if (window[script] && typeof window[script] === "function")
    67                 result = window[script].call(WebInspector, controller);
    68             else
    69                 result = window.eval(script);
    70 
    71             if (!controller._waitUntilDone)
    72                 controller.notifyDone(result);
    73         } catch (e) {
    74             controller.notifyDone(e.toString());
    75         }
    76     }
    77     controller.runAfterPendingDispatches(invokeMethod);
    78 }

  • trunk/WebCore/inspector/InspectorBackend.cpp

    r51439 r51528  
    6969namespace WebCore {
    7070
    71 InspectorBackend::InspectorBackend(InspectorController* inspectorController, InspectorClient* client)
     71InspectorBackend::InspectorBackend(InspectorController* inspectorController)
    7272    : m_inspectorController(inspectorController)
    73     , m_client(client)
    7473{
    7574}
    … …  
    7978}
    8079
    81 void InspectorBackend::hideDOMNodeHighlight()
    82 {
    83     if (m_inspectorController)
    84         m_inspectorController->hideHighlight();
    85 }
    86 
    87 String InspectorBackend::localizedStringsURL()
    88 {
    89     return m_client->localizedStringsURL();
    90 }
    91 
    92 String InspectorBackend::hiddenPanels()
    93 {
    94     return m_client->hiddenPanels();
    95 }
    96 
    97 void InspectorBackend::windowUnloading()
    98 {
    99     if (m_inspectorController)
    100         m_inspectorController->close();
    101 }
    102 
    103 bool InspectorBackend::isWindowVisible()
    104 {
    105     if (m_inspectorController)
    106         return m_inspectorController->windowVisible();
    107     return false;
    108 }
    109 
    110 void InspectorBackend::addResourceSourceToFrame(long identifier, Node* frame)
    111 {
    112     if (!m_inspectorController)
    113         return;
    114     RefPtr<InspectorResource> resource = m_inspectorController->resources().get(identifier);
    115     if (resource) {
    116         String sourceString = resource->sourceString();
    117         if (!sourceString.isEmpty())
    118             addSourceToFrame(resource->mimeType(), sourceString, frame);
    119     }
    120 }
    121 
    122 bool InspectorBackend::addSourceToFrame(const String& mimeType, const String& source, Node* frameNode)
    123 {
    124     ASSERT_ARG(frameNode, frameNode);
    125 
    126     if (!frameNode)
    127         return false;
    128 
    129     if (!frameNode->attached()) {
    130         ASSERT_NOT_REACHED();
    131         return false;
    132     }
    133 
    134     ASSERT(frameNode->isElementNode());
    135     if (!frameNode->isElementNode())
    136         return false;
    137 
    138     Element* element = static_cast<Element*>(frameNode);
    139     ASSERT(element->isFrameOwnerElement());
    140     if (!element->isFrameOwnerElement())
    141         return false;
    142 
    143     HTMLFrameOwnerElement* frameOwner = static_cast<HTMLFrameOwnerElement*>(element);
    144     ASSERT(frameOwner->contentFrame());
    145     if (!frameOwner->contentFrame())
    146         return false;
    147 
    148     FrameLoader* loader = frameOwner->contentFrame()->loader();
    149 
    150     loader->setResponseMIMEType(mimeType);
    151     loader->begin();
    152     loader->write(source);
    153     loader->end();
    154 
    155     return true;
    156 }
    157 
    15880void InspectorBackend::clearMessages(bool clearUI)
    15981{
    … …  
    16284}
    16385
     86void InspectorBackend::storeLastActivePanel(const String& panelName)
     87{
     88    if (m_inspectorController)
     89        m_inspectorController->storeLastActivePanel(panelName);
     90}
     91
    16492void InspectorBackend::toggleNodeSearch()
    16593{
    16694    if (m_inspectorController)
    16795        m_inspectorController->toggleSearchForNodeInPage();
    168 }
    169 
    170 void InspectorBackend::attach()
    171 {
    172     if (m_inspectorController)
    173         m_inspectorController->attachWindow();
    174 }
    175 
    176 void InspectorBackend::detach()
    177 {
    178     if (m_inspectorController)
    179         m_inspectorController->detachWindow();
    180 }
    181 
    182 void InspectorBackend::setAttachedWindowHeight(unsigned height)
    183 {
    184     if (m_inspectorController)
    185         m_inspectorController->setAttachedWindowHeight(height);
    186 }
    187 
    188 void InspectorBackend::storeLastActivePanel(const String& panelName)
    189 {
    190     if (m_inspectorController)
    191         m_inspectorController->storeLastActivePanel(panelName);
    19296}
    19397
    … …  
    199103}
    200104
    201 void InspectorBackend::loaded()
    202 {
    203     if (m_inspectorController)
    204         m_inspectorController->scriptObjectReady();
    205 }
    206 
    207 void InspectorBackend::enableResourceTracking(bool always)
    208 {
    209     if (m_inspectorController)
    210         m_inspectorController->enableResourceTracking(always);
    211 }
    212 
    213 void InspectorBackend::disableResourceTracking(bool always)
    214 {
    215     if (m_inspectorController)
    216         m_inspectorController->disableResourceTracking(always);
    217 }
    218 
    219105bool InspectorBackend::resourceTrackingEnabled() const
    220106{
    … …  
    224110}
    225111
    226 void InspectorBackend::moveWindowBy(float x, float y) const
    227 {
    228     if (m_inspectorController)
    229         m_inspectorController->moveWindowBy(x, y);
    230 }
    231 
    232 void InspectorBackend::closeWindow()
    233 {
    234     if (m_inspectorController)
    235         m_inspectorController->closeWindow();
    236 }
    237 
    238 const String& InspectorBackend::platform() const
    239 {
    240 #if PLATFORM(MAC)
    241 #ifdef BUILDING_ON_TIGER
    242     DEFINE_STATIC_LOCAL(const String, platform, ("mac-tiger"));
    243 #else
    244     DEFINE_STATIC_LOCAL(const String, platform, ("mac-leopard"));
    245 #endif
    246 #elif PLATFORM(WIN_OS)
    247     DEFINE_STATIC_LOCAL(const String, platform, ("windows"));
    248 #else
    249     DEFINE_STATIC_LOCAL(const String, platform, ("unknown"));
    250 #endif
    251 
    252     return platform;
    253 }
    254 
    255 
    256 const String& InspectorBackend::port() const
    257 {
    258 #if PLATFORM(QT)
    259     DEFINE_STATIC_LOCAL(const String, port, ("qt"));
    260 #elif PLATFORM(GTK)
    261     DEFINE_STATIC_LOCAL(const String, port, ("gtk"));
    262 #elif PLATFORM(WX)
    263     DEFINE_STATIC_LOCAL(const String, port, ("wx"));
    264 #else
    265     DEFINE_STATIC_LOCAL(const String, port, ("unknown"));
    266 #endif
    267 
    268     return port;
     112void InspectorBackend::enableResourceTracking(bool always)
     113{
     114    if (m_inspectorController)
     115        m_inspectorController->enableResourceTracking(always);
     116}
     117
     118void InspectorBackend::disableResourceTracking(bool always)
     119{
     120    if (m_inspectorController)
     121        m_inspectorController->disableResourceTracking(always);
    269122}
    270123
    … …  
    282135
    283136#if ENABLE(JAVASCRIPT_DEBUGGER)
    284 void InspectorBackend::startProfiling()
    285 {
    286     if (m_inspectorController)
    287         m_inspectorController->startUserInitiatedProfiling();
    288 }
    289 
    290 void InspectorBackend::stopProfiling()
    291 {
    292     if (m_inspectorController)
    293         m_inspectorController->stopUserInitiatedProfiling();
    294 }
    295 
    296 void InspectorBackend::enableProfiler(bool always)
    297 {
    298     if (m_inspectorController)
    299         m_inspectorController->enableProfiler(always);
    300 }
    301 
    302 void InspectorBackend::disableProfiler(bool always)
    303 {
    304     if (m_inspectorController)
    305         m_inspectorController->disableProfiler(always);
     137bool InspectorBackend::debuggerEnabled() const
     138{
     139    if (m_inspectorController)
     140        return m_inspectorController->debuggerEnabled();
     141    return false;
     142}
     143
     144void InspectorBackend::enableDebugger(bool always)
     145{
     146    if (m_inspectorController)
     147        m_inspectorController->enableDebuggerFromFrontend(always);
     148}
     149
     150void InspectorBackend::disableDebugger(bool always)
     151{
     152    if (m_inspectorController)
     153        m_inspectorController->disableDebugger(always);
     154}
     155
     156void InspectorBackend::addBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition)
     157{
     158    intptr_t sourceIDValue = sourceID.toIntPtr();
     159    JavaScriptDebugServer::shared().addBreakpoint(sourceIDValue, lineNumber, condition);
     160}
     161
     162void InspectorBackend::updateBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition)
     163{
     164    intptr_t sourceIDValue = sourceID.toIntPtr();
     165    JavaScriptDebugServer::shared().updateBreakpoint(sourceIDValue, lineNumber, condition);
     166}
     167
     168void InspectorBackend::removeBreakpoint(const String& sourceID, unsigned lineNumber)
     169{
     170    intptr_t sourceIDValue = sourceID.toIntPtr();
     171    JavaScriptDebugServer::shared().removeBreakpoint(sourceIDValue, lineNumber);
     172}
     173
     174void InspectorBackend::pauseInDebugger()
     175{
     176    JavaScriptDebugServer::shared().pauseProgram();
     177}
     178
     179void InspectorBackend::resumeDebugger()
     180{
     181    if (m_inspectorController)
     182        m_inspectorController->resumeDebugger();
     183}
     184
     185void InspectorBackend::stepOverStatementInDebugger()
     186{
     187    JavaScriptDebugServer::shared().stepOverStatement();
     188}
     189
     190void InspectorBackend::stepIntoStatementInDebugger()
     191{
     192    JavaScriptDebugServer::shared().stepIntoStatement();
     193}
     194
     195void InspectorBackend::stepOutOfFunctionInDebugger()
     196{
     197    JavaScriptDebugServer::shared().stepOutOfFunction();
     198}
     199
     200bool InspectorBackend::pauseOnExceptions()
     201{
     202    return JavaScriptDebugServer::shared().pauseOnExceptions();
     203}
     204
     205void InspectorBackend::setPauseOnExceptions(bool pause)
     206{
     207    JavaScriptDebugServer::shared().setPauseOnExceptions(pause);
    306208}
    307209
    … …  
    313215}
    314216
     217void InspectorBackend::enableProfiler(bool always)
     218{
     219    if (m_inspectorController)
     220        m_inspectorController->enableProfiler(always);
     221}
     222
     223void InspectorBackend::disableProfiler(bool always)
     224{
     225    if (m_inspectorController)
     226        m_inspectorController->disableProfiler(always);
     227}
     228
     229void InspectorBackend::startProfiling()
     230{
     231    if (m_inspectorController)
     232        m_inspectorController->startUserInitiatedProfiling();
     233}
     234
     235void InspectorBackend::stopProfiling()
     236{
     237    if (m_inspectorController)
     238        m_inspectorController->stopUserInitiatedProfiling();
     239}
     240
    315241void InspectorBackend::getProfileHeaders(long callId)
    316242{
    … …  
    325251}
    326252
    327 void InspectorBackend::enableDebugger(bool always)
    328 {
    329     if (m_inspectorController)
    330         m_inspectorController->enableDebuggerFromFrontend(always);
    331 }
    332 
    333 void InspectorBackend::disableDebugger(bool always)
    334 {
    335     if (m_inspectorController)
    336         m_inspectorController->disableDebugger(always);
    337 }
    338 
    339 bool InspectorBackend::debuggerEnabled() const
    340 {
    341     if (m_inspectorController)
    342         return m_inspectorController->debuggerEnabled();
    343     return false;
    344 }
    345 
    346253JavaScriptCallFrame* InspectorBackend::currentCallFrame() const
    347254{
    348255    return JavaScriptDebugServer::shared().currentCallFrame();
    349256}
    350 
    351 void InspectorBackend::addBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition)
    352 {
    353     intptr_t sourceIDValue = sourceID.toIntPtr();
    354     JavaScriptDebugServer::shared().addBreakpoint(sourceIDValue, lineNumber, condition);
    355 }
    356 
    357 void InspectorBackend::updateBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition)
    358 {
    359     intptr_t sourceIDValue = sourceID.toIntPtr();
    360     JavaScriptDebugServer::shared().updateBreakpoint(sourceIDValue, lineNumber, condition);
    361 }
    362 
    363 void InspectorBackend::removeBreakpoint(const String& sourceID, unsigned lineNumber)
    364 {
    365     intptr_t sourceIDValue = sourceID.toIntPtr();
    366     JavaScriptDebugServer::shared().removeBreakpoint(sourceIDValue, lineNumber);
    367 }
    368 
    369 bool InspectorBackend::pauseOnExceptions()
    370 {
    371     return JavaScriptDebugServer::shared().pauseOnExceptions();
    372 }
    373 
    374 void InspectorBackend::setPauseOnExceptions(bool pause)
    375 {
    376     JavaScriptDebugServer::shared().setPauseOnExceptions(pause);
    377 }
    378 
    379 void InspectorBackend::pauseInDebugger()
    380 {
    381     JavaScriptDebugServer::shared().pauseProgram();
    382 }
    383 
    384 void InspectorBackend::resumeDebugger()
    385 {
    386     if (m_inspectorController)
    387         m_inspectorController->resumeDebugger();
    388 }
    389 
    390 void InspectorBackend::stepOverStatementInDebugger()
    391 {
    392     JavaScriptDebugServer::shared().stepOverStatement();
    393 }
    394 
    395 void InspectorBackend::stepIntoStatementInDebugger()
    396 {
    397     JavaScriptDebugServer::shared().stepIntoStatement();
    398 }
    399 
    400 void InspectorBackend::stepOutOfFunctionInDebugger()
    401 {
    402     JavaScriptDebugServer::shared().stepOutOfFunction();
    403 }
    404 
    405257#endif
    406258
    … …  
    494346}
    495347
    496 void InspectorBackend::getCookies(long callId, const String& domain)
    497 {
    498     if (!m_inspectorController)
    499         return;
    500     m_inspectorController->getCookies(callId, domain);
    501 }
    502 
    503 void InspectorBackend::deleteCookie(const String& cookieName, const String& domain)
    504 {
    505     if (!m_inspectorController)
    506         return;
    507     m_inspectorController->deleteCookie(cookieName, domain);
    508 }
    509 
    510 void InspectorBackend::copyText(const String& text)
    511 {
    512     Pasteboard::generalPasteboard()->writePlainText(text);
    513 }
    514 
    515 void InspectorBackend::highlight(long nodeId)
     348void InspectorBackend::highlightDOMNode(long nodeId)
    516349{
    517350    if (Node* node = nodeForId(nodeId))
    … …  
    519352}
    520353
    521 Node* InspectorBackend::nodeForId(long nodeId)
    522 {
    523     if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
    524         return domAgent->nodeForId(nodeId);
    525     return 0;
    526 }
    527 
    528 ScriptValue InspectorBackend::wrapObject(const ScriptValue& object, const String& objectGroup)
    529 {
    530     if (m_inspectorController)
    531         return m_inspectorController->wrapObject(object, objectGroup);
    532     return ScriptValue();
    533 }
    534 
    535 ScriptValue InspectorBackend::unwrapObject(const String& objectId)
    536 {
    537     if (m_inspectorController)
    538         return m_inspectorController->unwrapObject(objectId);
    539     return ScriptValue();
     354void InspectorBackend::hideDOMNodeHighlight()
     355{
     356    if (m_inspectorController)
     357        m_inspectorController->hideHighlight();
     358}
     359
     360void InspectorBackend::getCookies(long callId, const String& domain)
     361{
     362    if (!m_inspectorController)
     363        return;
     364    m_inspectorController->getCookies(callId, domain);
     365}
     366
     367void InspectorBackend::deleteCookie(const String& cookieName, const String& domain)
     368{
     369    if (!m_inspectorController)
     370        return;
     371    m_inspectorController->deleteCookie(cookieName, domain);
    540372}
    541373
    … …  
    546378}
    547379
    548 long InspectorBackend::pushNodePathToFrontend(Node* node, bool selectInUI)
    549 {
    550     InspectorFrontend* frontend = inspectorFrontend();
    551     InspectorDOMAgent* domAgent = inspectorDOMAgent();
    552     if (!domAgent || !frontend)
    553         return 0;
    554     long id = domAgent->pushNodePathToFrontend(node);
    555     if (selectInUI)
    556         frontend->updateFocusedNode(id);
    557     return id;
    558 }
    559 
    560 void InspectorBackend::addNodesToSearchResult(const String& nodeIds)
    561 {
    562     if (InspectorFrontend* frontend = inspectorFrontend())
    563         frontend->addNodesToSearchResult(nodeIds);
     380void InspectorBackend::didEvaluateForTestInFrontend(long callId, const String& jsonResult)
     381{
     382    if (m_inspectorController)
     383        m_inspectorController->didEvaluateForTestInFrontend(callId, jsonResult);
    564384}
    565385
    566386#if ENABLE(DATABASE)
    567 Database* InspectorBackend::databaseForId(long databaseId)
    568 {
    569     if (m_inspectorController)
    570         return m_inspectorController->databaseForId(databaseId);
    571     return 0;
    572 }
    573 
    574 void InspectorBackend::selectDatabase(Database* database)
    575 {
    576     if (m_inspectorController)
    577         m_inspectorController->selectDatabase(database);
    578 }
    579 
    580387void InspectorBackend::getDatabaseTableNames(long callId, long databaseId)
    581388{
    … …  
    595402
    596403#if ENABLE(DOM_STORAGE)
    597 void InspectorBackend::selectDOMStorage(Storage* storage)
    598 {
    599     if (m_inspectorController)
    600         m_inspectorController->selectDOMStorage(storage);
    601 }
    602 
    603404void InspectorBackend::getDOMStorageEntries(long callId, long storageId)
    604405{
    … …  
    619420}
    620421#endif
    621 
    622 void InspectorBackend::didEvaluateForTestInFrontend(long callId, const String& jsonResult)
    623 {
    624     if (m_inspectorController)
    625         m_inspectorController->didEvaluateForTestInFrontend(callId, jsonResult);
    626 }
    627 
    628 void InspectorBackend::reportDidDispatchOnInjectedScript(long callId, const String& result, bool isException)
    629 {
    630     if (InspectorFrontend* frontend = inspectorFrontend())
    631         frontend->didDispatchOnInjectedScript(callId, result, isException);
    632 }
    633422
    634423InspectorDOMAgent* InspectorBackend::inspectorDOMAgent()
    … …  
    646435}
    647436
     437Node* InspectorBackend::nodeForId(long nodeId)
     438{
     439    if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
     440        return domAgent->nodeForId(nodeId);
     441    return 0;
     442}
     443
    648444} // namespace WebCore
    649445

  • trunk/WebCore/inspector/InspectorBackend.h

    r50639 r51528  
    4040class CachedResource;
    4141class Database;
    42 class InspectorClient;
    4342class InspectorDOMAgent;
     43class InspectorFrontend;
    4444class JavaScriptCallFrame;
    4545class Node;
    … …  
    4949{
    5050public:
    51     static PassRefPtr<InspectorBackend> create(InspectorController* inspectorController, InspectorClient* client)
     51    static PassRefPtr<InspectorBackend> create(InspectorController* inspectorController)
    5252    {
    53         return adoptRef(new InspectorBackend(inspectorController, client));
     53        return adoptRef(new InspectorBackend(inspectorController));
    5454    }
    5555
    … …  
    5757
    5858    InspectorController* inspectorController() { return m_inspectorController; }
    59    
    6059    void disconnectController() { m_inspectorController = 0; }
    6160
    62     void hideDOMNodeHighlight();
    63 
    64     String localizedStringsURL();
    65     String hiddenPanels();
    66 
    67     void windowUnloading();
    68 
    69     bool isWindowVisible();
    70 
    71     void addResourceSourceToFrame(long identifier, Node* frame);
    72     bool addSourceToFrame(const String& mimeType, const String& source, Node* frame);
    73 
    7461    void clearMessages(bool clearUI);
     62    void storeLastActivePanel(const String& panelName);
    7563
    7664    void toggleNodeSearch();
    77 
    78     void attach();
    79     void detach();
    80 
    81     void setAttachedWindowHeight(unsigned height);
    82 
    83     void storeLastActivePanel(const String& panelName);
    84 
    8565    bool searchingForNode();
    86 
    87     void loaded();
    8866
    8967    void enableResourceTracking(bool always);
    … …  
    9169    bool resourceTrackingEnabled() const;
    9270
    93     void moveWindowBy(float x, float y) const;
    94     void closeWindow();
    95 
    96     const String& platform() const;
    97     const String& port() const;
    98 
    9971    void startTimelineProfiler();
    10072    void stopTimelineProfiler();
    10173
    10274#if ENABLE(JAVASCRIPT_DEBUGGER)
    103     void startProfiling();
    104     void stopProfiling();
    105 
    106     void enableProfiler(bool always);
    107     void disableProfiler(bool always);
    108     bool profilerEnabled();
    109 
    110     void getProfileHeaders(long callId);
    111     void getProfile(long callId, unsigned uid);
    112 
     75    bool debuggerEnabled() const;
    11376    void enableDebugger(bool always);
    11477    void disableDebugger(bool always);
    115     bool debuggerEnabled() const;
    116 
    117     JavaScriptCallFrame* currentCallFrame() const;
    11878
    11979    void addBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition);
    … …  
    12181    void removeBreakpoint(const String& sourceID, unsigned lineNumber);
    12282
     83    void pauseInDebugger();
     84    void resumeDebugger();
     85
    12386    bool pauseOnExceptions();
    12487    void setPauseOnExceptions(bool pause);
    125 
    126     void pauseInDebugger();
    127     void resumeDebugger();
    12888
    12989    void stepOverStatementInDebugger();
    13090    void stepIntoStatementInDebugger();
    13191    void stepOutOfFunctionInDebugger();
     92
     93    bool profilerEnabled();
     94    void enableProfiler(bool always);
     95    void disableProfiler(bool always);
     96
     97    void startProfiling();
     98    void stopProfiling();
     99
     100    void getProfileHeaders(long callId);
     101    void getProfile(long callId, unsigned uid);
     102
     103    JavaScriptCallFrame* currentCallFrame() const;
    132104#endif
    133105
    … …  
    140112    void copyNode(long nodeId);
    141113    void removeNode(long callId, long nodeId);
     114    void highlightDOMNode(long nodeId);
     115    void hideDOMNodeHighlight();
    142116
    143117    void getCookies(long callId, const String& domain);
    144118    void deleteCookie(const String& cookieName, const String& domain);
    145119
    146     void copyText(const String& text);
     120    // Generic code called from custom implementations.
     121    void releaseWrapperObjectGroup(const String& objectGroup);
     122    void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
    147123
    148     // Generic code called from custom implementations.
    149     void highlight(long nodeId);
    150     Node* nodeForId(long nodeId);
    151     ScriptValue wrapObject(const ScriptValue& object, const String& objectGroup);
    152     ScriptValue unwrapObject(const String& objectId);
    153     void releaseWrapperObjectGroup(const String& objectGroup);
    154     long pushNodePathToFrontend(Node* node, bool selectInUI);
    155     void addNodesToSearchResult(const String& nodeIds);
    156124#if ENABLE(DATABASE)
    157     Database* databaseForId(long databaseId);
    158     void selectDatabase(Database* database);
    159125    void getDatabaseTableNames(long callId, long databaseId);
    160126#endif
     127
    161128#if ENABLE(DOM_STORAGE)
    162     void selectDOMStorage(Storage* storage);
    163129    void getDOMStorageEntries(long callId, long storageId);
    164130    void setDOMStorageItem(long callId, long storageId, const String& key, const String& value);
    165131    void removeDOMStorageItem(long callId, long storageId, const String& key);
    166132#endif
    167     void reportDidDispatchOnInjectedScript(long callId, const String& result, bool isException);
    168     void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
    169133
    170134private:
    171     InspectorBackend(InspectorController* inspectorController, InspectorClient* client);
     135    InspectorBackend(InspectorController* inspectorController);
    172136    InspectorDOMAgent* inspectorDOMAgent();
    173137    InspectorFrontend* inspectorFrontend();
     138    Node* nodeForId(long nodeId);
    174139
    175140    InspectorController* m_inspectorController;
    176     InspectorClient* m_client;
    177141};
    178142

  • trunk/WebCore/inspector/InspectorBackend.idl

    r50639 r51528  
    3535        GenerateConstructor
    3636    ] InspectorBackend {
    37         void hideDOMNodeHighlight();
    38         [Custom] void highlightDOMNode(in long nodeId);
    39         void loaded();
    40         void windowUnloading();
    41         void attach();
    42         void detach();
     37        void clearMessages(in boolean clearUI);
     38        void storeLastActivePanel(in DOMString panelName);
    4339
    44         void closeWindow();
    45         void clearMessages(in boolean clearUI);
    4640        void toggleNodeSearch();
    47 
    48         boolean isWindowVisible();
    4941        boolean searchingForNode();
    5042
    51         void addResourceSourceToFrame(in long identifier, in Node frame);
    52         boolean addSourceToFrame(in DOMString mimeType, in DOMString sourceValue, in Node frame);
    53         [Custom] void search(in Node node, in DOMString query);
    54 #if defined(ENABLE_DATABASE) && ENABLE_DATABASE
    55         void getDatabaseTableNames(in long callId, in long databaseId);
    56 #endif
    57 
    58         [Custom] DOMObject setting(in DOMString key);
    59         [Custom] void setSetting(in DOMString key, in DOMObject  value);
    60         [Custom] DOMWindow inspectedWindow();
    61         DOMString localizedStringsURL();
    62         DOMString hiddenPanels();
    63         DOMString platform();
    64         DOMString port();
    65         void startTimelineProfiler();
    66         void stopTimelineProfiler();
    67         [ImplementationFunction=moveWindowBy] void moveByUnrestricted(in float x, in float y);
    68         void setAttachedWindowHeight(in unsigned long height);
    69         [Custom] DOMObject wrapCallback(in DOMObject callback);
    7043        boolean resourceTrackingEnabled();
    7144        void enableResourceTracking(in boolean always);
    7245        void disableResourceTracking(in boolean always);
    73         void storeLastActivePanel(in DOMString panelName);
     46
     47        void startTimelineProfiler();
     48        void stopTimelineProfiler();
    7449
    7550#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
    … …  
    8863        void stepIntoStatementInDebugger();
    8964        void stepOutOfFunctionInDebugger();
    90 
    91         [Custom] DOMObject currentCallFrame();
    9265
    9366        boolean pauseOnExceptions();
    … …  
    11285        void copyNode(in long nodeId);
    11386        void removeNode(in long callId, in long nodeId);
     87        void highlightDOMNode(in long nodeId);
     88        void hideDOMNodeHighlight();
    11489
    11590        void getCookies(in long callId, in DOMString domain);
    11691        void deleteCookie(in DOMString cookieName, in DOMString domain);
    11792
    118         // Called from InjectedScript.
    119         // TODO: extract into a separate IDL.
    120         void copyText(in DOMString text);
    121         [Custom] DOMObject nodeForId(in long nodeId);
    122         [Custom] long wrapObject(in DOMObject object, in DOMString objectGroup);
    123         [Custom] DOMObject unwrapObject(in long objectId);
    12493        void releaseWrapperObjectGroup(in DOMString objectGroup);
    125         [Custom] int pushNodePathToFrontend(in DOMObject node, in boolean selectInUI);
    126         void addNodesToSearchResult(in DOMString nodeIds);
     94        void didEvaluateForTestInFrontend(in long callId, in DOMString jsonResult);
     95
    12796#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
    128         [Custom] void selectDatabase(in DOMObject database);
    129         [Custom] DOMObject databaseForId(in long databaseId);
     97        void getDatabaseTableNames(in long callId, in long databaseId);
    13098#endif
     99
    131100#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
    132         [Custom] void selectDOMStorage(in DOMObject storage);
    133101        void getDOMStorageEntries(in long callId, in long storageId);
    134102        void setDOMStorageItem(in long callId, in long storageId, in DOMString key, in DOMString value);
    135103        void removeDOMStorageItem(in long callId, in long storageId, in DOMString key);
    136104#endif
    137         void reportDidDispatchOnInjectedScript(in long callId, in DOMString result, in boolean isException);
    138         void didEvaluateForTestInFrontend(in long callId, in DOMString jsonResult);
    139105    };
    140106}

  • trunk/WebCore/inspector/InspectorController.cpp

    r51512 r51528  
    5454#include "HitTestResult.h"
    5555#include "InspectorBackend.h"
     56#include "InjectedScriptHost.h"
    5657#include "InspectorClient.h"
    5758#include "InspectorFrontend.h"
     59#include "InspectorFrontendHost.h"
    5860#include "InspectorDatabaseResource.h"
    5961#include "InspectorDOMAgent.h"
    … …  
    135137    , m_resourceTrackingEnabled(false)
    136138    , m_resourceTrackingSettingsLoaded(false)
    137     , m_inspectorBackend(InspectorBackend::create(this, client))
     139    , m_inspectorBackend(InspectorBackend::create(this))
     140    , m_inspectorFrontendHost(InspectorFrontendHost::create(this, client))
     141    , m_injectedScriptHost(InjectedScriptHost::create(this))
    138142    , m_lastBoundObjectId(1)
    139143#if ENABLE(JAVASCRIPT_DEBUGGER)
    … …  
    175179
    176180    m_inspectorBackend->disconnectController();
     181    m_inspectorFrontendHost->disconnectController();
     182    m_injectedScriptHost->disconnectController();
    177183}
    178184
    … …  
    181187    close();
    182188
    183     if (m_scriptState)
    184         ScriptGlobalObject::remove(m_scriptState, "InspectorController");
    185 
     189    if (m_scriptState) {
     190        ScriptGlobalObject::remove(m_scriptState, "InspectorBackend");
     191        ScriptGlobalObject::remove(m_scriptState, "InspectorFrontendHost");
     192        ScriptGlobalObject::remove(m_scriptState, "InjectedScriptHost");
     193    }
    186194    ASSERT(m_inspectedPage);
    187195    m_inspectedPage = 0;
    … …  
    523531    m_page->mainFrame()->document()->securityOrigin()->grantUniversalAccess();
    524532    m_scriptState = scriptStateFromPage(debuggerWorld(), m_page);
    525     ScriptGlobalObject::set(m_scriptState, "InspectorController", m_inspectorBackend.get());
     533    ScriptGlobalObject::set(m_scriptState, "InspectorBackend", m_inspectorBackend.get());
     534    ScriptGlobalObject::set(m_scriptState, "InspectorFrontendHost", m_inspectorFrontendHost.get());
     535    ScriptGlobalObject::set(m_scriptState, "InjectedScriptHost", m_injectedScriptHost.get());
    526536}
    527537

  • trunk/WebCore/inspector/InspectorController.h

    r51440 r51528  
    6363class GraphicsContext;
    6464class HitTestResult;
     65class InjectedScriptHost;
    6566class InspectorBackend;
    6667class InspectorClient;
    6768class InspectorDOMAgent;
    6869class InspectorFrontend;
     70class InspectorFrontendHost;
    6971class InspectorTimelineAgent;
    7072class JavaScriptCallFrame;
    … …  
    167169
    168170    InspectorBackend* inspectorBackend() { return m_inspectorBackend.get(); }
     171    InspectorFrontendHost* inspectorFrontendHost() { return m_inspectorFrontendHost.get(); }
     172    InjectedScriptHost* injectedScriptHost() { return m_injectedScriptHost.get(); }
    169173
    170174    void inspectedPageDestroyed();
    … …  
    295299private:
    296300    friend class InspectorBackend;
     301    friend class InspectorFrontendHost;
     302    friend class InjectedScriptHost;
    297303    // Following are used from InspectorBackend and internally.
    298304    void scriptObjectReady();
    … …  
    388394    bool m_resourceTrackingSettingsLoaded;
    389395    RefPtr<InspectorBackend> m_inspectorBackend;
     396    RefPtr<InspectorFrontendHost> m_inspectorFrontendHost;
     397    RefPtr<InjectedScriptHost> m_injectedScriptHost;
    390398    HashMap<String, ScriptValue> m_idToWrappedObject;
    391399    ObjectGroupsMap m_objectGroups;

  • trunk/WebCore/inspector/InspectorFrontendHost.h

    r51527 r51528  
    11/*
    2  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    77 *
    88 * 1.  Redistributions of source code must retain the above copyright
    9  *     notice, this list of conditions and the following disclaimer.
     9 *     notice, this list of conditions and the following disclaimer. 
    1010 * 2.  Redistributions in binary form must reproduce the above copyright
    1111 *     notice, this list of conditions and the following disclaimer in the
    12  *     documentation and/or other materials provided with the distribution.
     12 *     documentation and/or other materials provided with the distribution. 
    1313 * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
    1414 *     its contributors may be used to endorse or promote products derived
    15  *     from this software without specific prior written permission.
     15 *     from this software without specific prior written permission. 
    1616 *
    1717 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
    … …  
    2727 */
    2828
    29 WebInspector.Database = function(id, domain, name, version)
     29#ifndef InspectorFrontendHost_h
     30#define InspectorFrontendHost_h
     31
     32#include "Console.h"
     33#include "InspectorController.h"
     34#include "PlatformString.h"
     35
     36#include <wtf/RefCounted.h>
     37
     38namespace WebCore {
     39
     40class InspectorClient;
     41class Node;
     42
     43class InspectorFrontendHost : public RefCounted<InspectorFrontendHost>
    3044{
    31     this._id = id;
    32     this._domain = domain;
    33     this._name = name;
    34     this._version = version;
    35 }
     45public:
     46    static PassRefPtr<InspectorFrontendHost> create(InspectorController* inspectorController, InspectorClient* client)
     47    {
     48        return adoptRef(new InspectorFrontendHost(inspectorController, client));
     49    }
    3650
    37 WebInspector.Database.prototype = {
    38     get id()
    39     {
    40         return this._id;
    41     },
     51    ~InspectorFrontendHost();
    4252
    43     get name()
    44     {
    45         return this._name;
    46     },
     53    InspectorController* inspectorController() { return m_inspectorController; }
     54    void disconnectController() { m_inspectorController = 0; }
    4755
    48     set name(x)
    49     {
    50         this._name = x;
    51     },
     56    void loaded();
     57    void attach();
     58    void detach();
     59    void closeWindow();
     60    void windowUnloading();
    5261
    53     get version()
    54     {
    55         return this._version;
    56     },
     62    void setAttachedWindowHeight(unsigned height);
     63    void moveWindowBy(float x, float y) const;
    5764
    58     set version(x)
    59     {
    60         this._version = x;
    61     },
     65    String localizedStringsURL();
     66    String hiddenPanels();
     67    const String& platform() const;
     68    const String& port() const;
    6269
    63     get domain()
    64     {
    65         return this._domain;
    66     },
     70    void addResourceSourceToFrame(long identifier, Node* frame);
     71    bool addSourceToFrame(const String& mimeType, const String& source, Node* frame);
    6772
    68     set domain(x)
    69     {
    70         this._domain = x;
    71     },
     73private:
     74    InspectorFrontendHost(InspectorController* inspectorController, InspectorClient* client);
    7275
    73     get displayDomain()
    74     {
    75         return WebInspector.Resource.prototype.__lookupGetter__("displayDomain").call(this);
    76     },
     76    InspectorController* m_inspectorController;
     77    InspectorClient* m_client;
     78};
    7779
    78     getTableNames: function(callback)
    79     {
    80         function sortingCallback(names)
    81         {
    82             callback(names.sort());
    83         }
    84         var callId = WebInspector.Callback.wrap(sortingCallback);
    85         InspectorController.getDatabaseTableNames(callId, this._id);
    86     },
    87    
    88     executeSql: function(query, onSuccess, onError)
    89     {
    90         function callback(result)
    91         {
    92             if (!(result instanceof Array)) {
    93                 onError(result);
    94                 return;
    95             }
    96             onSuccess(result);
    97         }
    98         InjectedScriptAccess.executeSql(this._id, query, callback);
    99     }
    100 }
     80} // namespace WebCore
    10181
    102 WebInspector.didGetDatabaseTableNames = WebInspector.Callback.processCallback;
     82#endif // !defined(InspectorFrontendHost_h)

  • trunk/WebCore/inspector/InspectorFrontendHost.idl

    r51527 r51528  
    11/*
     2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
     3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
    24 * Copyright (C) 2009 Google Inc. All rights reserved.
    35 *
    … …  
    2931 */
    3032
    31 WebInspector.TestController = function(callId)
    32 {
    33     this._callId = callId;
    34     this._waitUntilDone = false;
     33module core {
     34    interface [
     35        GenerateConstructor
     36    ] InspectorFrontendHost {
     37        void loaded();
     38        void attach();
     39        void detach();
     40        void closeWindow();
     41        void windowUnloading();
     42
     43        void setAttachedWindowHeight(in unsigned long height);
     44        void moveWindowBy(in float x, in float y);
     45
     46        DOMString localizedStringsURL();
     47        DOMString hiddenPanels();
     48        DOMString platform();
     49        DOMString port();
     50
     51        void addResourceSourceToFrame(in long identifier, in Node frame);
     52        boolean addSourceToFrame(in DOMString mimeType, in DOMString sourceValue, in Node frame);
     53
     54        [Custom] void search(in Node node, in DOMString query);
     55        [Custom] DOMObject setting(in DOMString key);
     56        [Custom] void setSetting(in DOMString key, in DOMObject  value);
     57    };
    3558}
    36 
    37 WebInspector.TestController.prototype = {
    38     waitUntilDone: function()
    39     {
    40         this._waitUntilDone = true;
    41     },
    42 
    43     notifyDone: function(result)
    44     {
    45         var message = typeof result === "undefined" ? "\"<undefined>\"" : JSON.stringify(result);
    46         InspectorController.didEvaluateForTestInFrontend(this._callId, message);
    47     },
    48 
    49     runAfterPendingDispatches: function(callback)
    50     {
    51         if (WebInspector.pendingDispatches === 0) {
    52             callback();
    53             return;
    54         }
    55         setTimeout(this.runAfterPendingDispatches.bind(this), 0, callback);
    56     }
    57 }
    58 
    59 WebInspector.evaluateForTestInFrontend = function(callId, script)
    60 {
    61     var controller = new WebInspector.TestController(callId);
    62     function invokeMethod()
    63     {
    64         try {
    65             var result;
    66             if (window[script] && typeof window[script] === "function")
    67                 result = window[script].call(WebInspector, controller);
    68             else
    69                 result = window.eval(script);
    70 
    71             if (!controller._waitUntilDone)
    72                 controller.notifyDone(result);
    73         } catch (e) {
    74             controller.notifyDone(e.toString());
    75         }
    76     }
    77     controller.runAfterPendingDispatches(invokeMethod);
    78 }

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

    r48392 r51528  
    9090
    9191        if (this.enabled)
    92             InspectorController.updateBreakpoint(this.sourceID, this.line, c);
     92            InspectorBackend.updateBreakpoint(this.sourceID, this.line, c);
    9393    }
    9494}

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

    r50881 r51528  
    5959        }
    6060
    61         if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID)
     61        if (!InspectorBackend.debuggerEnabled() || !breakpoint.sourceID)
    6262            return;
    6363
    6464        if (breakpoint.enabled)
    65             InspectorController.addBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.condition);
     65            InspectorBackend.addBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.condition);
    6666    },
    6767
    … …  
    136136        }
    137137
    138         if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID)
     138        if (!InspectorBackend.debuggerEnabled() || !breakpoint.sourceID)
    139139            return;
    140140
    141         InspectorController.removeBreakpoint(breakpoint.sourceID, breakpoint.line);
     141        InspectorBackend.removeBreakpoint(breakpoint.sourceID, breakpoint.line);
    142142    },
    143143
    … …  
    149149        checkbox.checked = breakpoint.enabled;
    150150
    151         if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID)
     151        if (!InspectorBackend.debuggerEnabled() || !breakpoint.sourceID)
    152152            return;
    153153
    154154        if (breakpoint.enabled)
    155             InspectorController.addBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.condition);
     155            InspectorBackend.addBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.condition);
    156156        else
    157             InspectorController.removeBreakpoint(breakpoint.sourceID, breakpoint.line);
     157            InspectorBackend.removeBreakpoint(breakpoint.sourceID, breakpoint.line);
    158158    },
    159159

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

    r51506 r51528  
    286286    {
    287287        if (clearInspectorController)
    288             InspectorController.clearMessages(false);
     288            InspectorBackend.clearMessages(false);
    289289        if (WebInspector.panels.resources)
    290290            WebInspector.panels.resources.clearMessages();

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

    r50613 r51528  
    268268    {
    269269        var cookie = node.cookie;
    270         InspectorController.deleteCookie(cookie.name, this._cookieDomain);
     270        InspectorBackend.deleteCookie(cookie.name, this._cookieDomain);
    271271        this.update();
    272272    },

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

    r50574 r51528  
    328328        }
    329329        var callId = WebInspector.Callback.wrap(mycallback);
    330         InspectorController.getChildNodes(callId, parent.id);
     330        InspectorBackend.getChildNodes(callId, parent.id);
    331331    },
    332332
    … …  
    334334    {
    335335        var mycallback = this._didApplyDomChange.bind(this, node, callback);
    336         InspectorController.setAttribute(WebInspector.Callback.wrap(mycallback), node.id, name, value);
     336        InspectorBackend.setAttribute(WebInspector.Callback.wrap(mycallback), node.id, name, value);
    337337    },
    338338
    … …  
    340340    {
    341341        var mycallback = this._didApplyDomChange.bind(this, node, callback);
    342         InspectorController.removeAttribute(WebInspector.Callback.wrap(mycallback), node.id, name);
     342        InspectorBackend.removeAttribute(WebInspector.Callback.wrap(mycallback), node.id, name);
    343343    },
    344344
    … …  
    346346    {
    347347        var mycallback = this._didApplyDomChange.bind(this, node, callback);
    348         InspectorController.setTextNodeValue(WebInspector.Callback.wrap(mycallback), node.id, text);
     348        InspectorBackend.setTextNodeValue(WebInspector.Callback.wrap(mycallback), node.id, text);
    349349    },
    350350
    … …  
    448448    }
    449449    var callId = WebInspector.Callback.wrap(mycallback);
    450     InspectorController.getCookies(callId, cookieDomain);
     450    InspectorBackend.getCookies(callId, cookieDomain);
    451451}
    452452
    … …  
    478478
    479479    var callId = WebInspector.Callback.wrap(callback);
    480     InspectorController.getEventListenersForNode(callId, node.id);
     480    InspectorBackend.getEventListenersForNode(callId, node.id);
    481481}
    482482

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

    r48659 r51528  
    5858    {
    5959        var callId = WebInspector.Callback.wrap(callback);
    60         InspectorController.getDOMStorageEntries(callId, this._id);
     60        InspectorBackend.getDOMStorageEntries(callId, this._id);
    6161    },
    6262   
    … …  
    6464    {
    6565        var callId = WebInspector.Callback.wrap(callback);
    66         InspectorController.setDOMStorageItem(callId, this._id, key, value);
     66        InspectorBackend.setDOMStorageItem(callId, this._id, key, value);
    6767    },
    6868   
    … …  
    7070    {
    7171        var callId = WebInspector.Callback.wrap(callback);
    72         InspectorController.removeDOMStorageItem(callId, this._id, key);
     72        InspectorBackend.removeDOMStorageItem(callId, this._id, key);
    7373    }
    7474}

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

    r49234 r51528  
    8383        }
    8484        var callId = WebInspector.Callback.wrap(sortingCallback);
    85         InspectorController.getDatabaseTableNames(callId, this._id);
     85        InspectorBackend.getDatabaseTableNames(callId, this._id);
    8686    },
    8787   

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

    r51250 r51528  
    5959        this.panel.updateEventListeners();
    6060
    61         if (InspectorController.searchingForNode()) {
    62             InspectorController.toggleNodeSearch();
     61        if (InspectorBackend.searchingForNode()) {
     62            InspectorBackend.toggleNodeSearch();
    6363            this.panel.nodeSearchButton.toggled = false;
    6464        }
    … …  
    151151        WebInspector.hoveredDOMNode = null;
    152152
    153         if (InspectorController.searchingForNode()) {
    154             InspectorController.toggleNodeSearch();
     153        if (InspectorBackend.searchingForNode()) {
     154            InspectorBackend.toggleNodeSearch();
    155155            this.nodeSearchButton.toggled = false;
    156156        }
    … …  
    170170        WebInspector.hoveredDOMNode = null;
    171171
    172         if (InspectorController.searchingForNode()) {
    173             InspectorController.toggleNodeSearch();
     172        if (InspectorBackend.searchingForNode()) {
     173            InspectorBackend.toggleNodeSearch();
    174174            this.nodeSearchButton.toggled = false;
    175175        }
    … …  
    182182        var domWindow = WebInspector.domAgent.domWindow;
    183183        if (!domWindow || !domWindow.document || !domWindow.document.firstChild)
    184             return;
    185 
    186         // If the window isn't visible, return early so the DOM tree isn't built
    187         // and mutation event listeners are not added.
    188         if (!InspectorController.isWindowVisible())
    189184            return;
    190185
    … …  
    10241019        event.clipboardData.clearData();
    10251020        event.preventDefault();
    1026         InspectorController.copyNode(this.focusedDOMNode.id);
     1021        InspectorBackend.copyNode(this.focusedDOMNode.id);
    10271022    },
    10281023
    … …  
    10531048    _nodeSearchButtonClicked: function(event)
    10541049    {
    1055         InspectorController.toggleNodeSearch();
    1056 
    1057         this.nodeSearchButton.toggled = InspectorController.searchingForNode();
     1050        InspectorBackend.toggleNodeSearch();
     1051
     1052        this.nodeSearchButton.toggled = InspectorBackend.searchingForNode();
    10581053    }
    10591054}

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

    r51420 r51528  
    8484
    8585            if (x && !this.suppressSelectHighlight) {
    86                 InspectorController.highlightDOMNode(x.id);
     86                InspectorBackend.highlightDOMNode(x.id);
    8787
    8888                if ("_restorePreviousHighlightNodeTimeout" in this)
    … …  
    9393                    var hoveredNode = WebInspector.hoveredDOMNode;
    9494                    if (hoveredNode)
    95                         InspectorController.highlightDOMNode(hoveredNode.id);
     95                        InspectorBackend.highlightDOMNode(hoveredNode.id);
    9696                    else
    97                         InspectorController.hideDOMNodeHighlight();
     97                        InspectorBackend.hideDOMNodeHighlight();
    9898                }
    9999
    … …  
    946946
    947947        var callId = WebInspector.Callback.wrap(removeNodeCallback);
    948         InspectorController.removeNode(callId, this.representedObject.id);
     948        InspectorBackend.removeNode(callId, this.representedObject.id);
    949949    }
    950950}

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

    r49962 r51528  
    109109        Preferences.eventListenersFilter = selectedOption.value;
    110110
    111         InspectorController.setSetting("event-listeners-filter", Preferences.eventListenersFilter);
     111        InspectorFrontendHost.setSetting("event-listeners-filter", Preferences.eventListenersFilter);
    112112
    113113        for (var i = 0; i < this.sections.length; ++i)

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

    r51506 r51528  
    562562    var result = {};
    563563    try {
    564         result.value = InspectorController.wrapObject(InjectedScript._evaluateOn(evalFunction, object, expression), objectGroup);
     564        result.value = InjectedScriptHost.wrapObject(InjectedScript._evaluateOn(evalFunction, object, expression), objectGroup);
    565565        // Handle error that might have happened while describing result.
    566566        if (result.value.errorText) {
    … …  
    647647            node[searchResultsProperty] = true;
    648648            InjectedScript._searchResults.push(node);
    649             var nodeId = InspectorController.pushNodePathToFrontend(node, false);
     649            var nodeId = InjectedScriptHost.pushNodePathToFrontend(node, false);
    650650            nodeIds.push(nodeId);
    651651        }
    652         InspectorController.addNodesToSearchResult(nodeIds.join(","));
     652        InjectedScriptHost.addNodesToSearchResult(nodeIds.join(","));
    653653    }
    654654
    … …  
    849849InjectedScript.getCallFrames = function()
    850850{
    851     var callFrame = InspectorController.currentCallFrame();
     851    var callFrame = InjectedScriptHost.currentCallFrame();
    852852    if (!callFrame)
    853853        return false;
    … …  
    872872InjectedScript._callFrameForId = function(id)
    873873{
    874     var callFrame = InspectorController.currentCallFrame();
     874    var callFrame = InjectedScriptHost.currentCallFrame();
    875875    while (--id >= 0 && callFrame)
    876876        callFrame = callFrame.caller;
    … …  
    880880InjectedScript._clearConsoleMessages = function()
    881881{
    882     InspectorController.clearMessages(true);
     882    InjectedScriptHost.clearMessages(true);
    883883}
    884884
    … …  
    891891    inspectedWindow.console.log(o);
    892892    if (Object.type(o) === "node") {
    893         InspectorController.pushNodePathToFrontend(o, true);
     893        InjectedScriptHost.pushNodePathToFrontend(o, true);
    894894    } else {
    895895        switch (Object.describe(o)) {
    896896            case "Database":
    897                 InspectorController.selectDatabase(o);
     897                InjectedScriptHost.selectDatabase(o);
    898898                break;
    899899            case "Storage":
    900                 InspectorController.selectDOMStorage(o);
     900                InjectedScriptHost.selectDOMStorage(o);
    901901                break;
    902902        }
    … …  
    907907{
    908908    if (Object.type(o) === "node") {
    909         var nodeId = InspectorController.pushNodePathToFrontend(o, false);
    910         InspectorController.copyNode(nodeId);
     909        var nodeId = InjectedScriptHost.pushNodePathToFrontend(o, false);
     910        InjectedScriptHost.copyNode(nodeId);
    911911    } else {
    912         InspectorController.copyText(o);
     912        InjectedScriptHost.copyText(o);
    913913    }
    914914}
    … …  
    987987    };");
    988988
    989     inspectorCommandLineAPI.clear = InspectorController.wrapCallback(InjectedScript._clearConsoleMessages);
    990     inspectorCommandLineAPI.inspect = InspectorController.wrapCallback(InjectedScript._inspectObject);
    991     inspectorCommandLineAPI.copy = InspectorController.wrapCallback(InjectedScript._copy);
     989    inspectorCommandLineAPI.clear = InjectedScriptHost.wrapCallback(InjectedScript._clearConsoleMessages);
     990    inspectorCommandLineAPI.inspect = InjectedScriptHost.wrapCallback(InjectedScript._inspectObject);
     991    inspectorCommandLineAPI.copy = InjectedScriptHost.wrapCallback(InjectedScript._copy);
    992992}
    993993
    … …  
    10131013    // TODO: replace with 'return window;' once this script is injected into
    10141014    // the page's context.
    1015     return InspectorController.inspectedWindow();
     1015    return InjectedScriptHost.inspectedWindow();
    10161016}
    10171017
    … …  
    10201020    if (!nodeId)
    10211021        return null;
    1022     return InspectorController.nodeForId(nodeId);
     1022    return InjectedScriptHost.nodeForId(nodeId);
    10231023}
    10241024
    … …  
    10321032        return InjectedScript._nodeForId(objectId);
    10331033    } else if (typeof objectId === "string") {
    1034         return InspectorController.unwrapObject(objectId);
     1034        return InjectedScriptHost.unwrapObject(objectId);
    10351035    } else if (typeof objectId === "object") {
    10361036        var callFrame = InjectedScript._callFrameForId(objectId.callFrame);
    … …  
    10481048    if (!object || Object.type(object) !== "node")
    10491049        return false;
    1050     return InspectorController.pushNodePathToFrontend(object, false);
     1050    return InjectedScriptHost.pushNodePathToFrontend(object, false);
    10511051}
    10521052
    … …  
    11311131            }
    11321132        }
    1133         InspectorController.reportDidDispatchOnInjectedScript(callId, JSON.stringify(result), false);
     1133        InjectedScriptHost.reportDidDispatchOnInjectedScript(callId, JSON.stringify(result), false);
    11341134    }
    11351135
    11361136    function errorCallback(tx, error)
    11371137    {
    1138         InspectorController.reportDidDispatchOnInjectedScript(callId, JSON.stringify(error), false);
     1138        InjectedScriptHost.reportDidDispatchOnInjectedScript(callId, JSON.stringify(error), false);
    11391139    }
    11401140
    11411141    function queryTransaction(tx)
    11421142    {
    1143         tx.executeSql(query, null, InspectorController.wrapCallback(successCallback), InspectorController.wrapCallback(errorCallback));
    1144     }
    1145 
    1146     var database = InspectorController.databaseForId(databaseId);
     1143        tx.executeSql(query, null, InjectedScriptHost.wrapCallback(successCallback), InjectedScriptHost.wrapCallback(errorCallback));
     1144    }
     1145
     1146    var database = InjectedScriptHost.databaseForId(databaseId);
    11471147    if (!database)
    11481148        errorCallback(null, { code : 2 });  // Return as unexpected version.
    1149     database.transaction(InspectorController.wrapCallback(queryTransaction), InspectorController.wrapCallback(errorCallback));
     1149    database.transaction(InjectedScriptHost.wrapCallback(queryTransaction), InjectedScriptHost.wrapCallback(errorCallback));
    11501150    return true;
    11511151}

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

    r51453 r51528  
    4848        }
    4949        var callId = WebInspector.Callback.wrap(myCallback);
    50         InspectorController.dispatchOnInjectedScript(callId, methodName, argsString, !!async);
     50        InspectorBackend.dispatchOnInjectedScript(callId, methodName, argsString, !!async);
    5151    };
    5252}

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

    r51527 r51528  
    2929 */
    3030
    31 if (!window.InspectorController) {
    32 
    33 WebInspector.InspectorControllerStub = function()
     31if (!window.InspectorBackend) {
     32
     33WebInspector.InspectorBackendStub = function()
    3434{
    3535    this._searchingForNode = false;
    36     this._windowVisible = true;
    3736    this._attachedWindowHeight = 0;
    3837    this._debuggerEnabled = true;
    … …  
    4342}
    4443
    45 WebInspector.InspectorControllerStub.prototype = {
     44WebInspector.InspectorBackendStub.prototype = {
    4645    wrapCallback: function(func)
    4746    {
    4847        return func;
    49     },
    50 
    51     isWindowVisible: function()
    52     {
    53         return this._windowVisible;
    5448    },
    5549
    … …  
    292286}
    293287
    294 window.InspectorController = new WebInspector.InspectorControllerStub();
     288InspectorBackend = new WebInspector.InspectorBackendStub();
    295289
    296290}

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

    r50528 r51528  
    1 /*
    2  * Copyright (C) 2009 Google Inc. All rights reserved.
    3  *
    4  * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are
    6  * met:
    7  *
    8  *     * Redistributions of source code must retain the above copyright
    9  * notice, this list of conditions and the following disclaimer.
    10  *     * Redistributions in binary form must reproduce the above
    11  * copyright notice, this list of conditions and the following disclaimer
    12  * in the documentation and/or other materials provided with the
    13  * distribution.
    14  *     * Neither the name of Google Inc. nor the names of its
    15  * contributors may be used to endorse or promote products derived from
    16  * this software without specific prior written permission.
    17  *
    18  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    19  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    20  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    21  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
    22  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    23  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    24  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    25  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    29  */
    30 
    31 if (!window.InspectorController) {
    32 
    33 WebInspector.InspectorControllerStub = function()
    34 {
    35     this._searchingForNode = false;
    36     this._windowVisible = true;
    37     this._attachedWindowHeight = 0;
    38     this._debuggerEnabled = true;
    39     this._profilerEnabled = true;
    40     this._resourceTrackingEnabled = false;
    41     this._timelineEnabled = false;
    42     this._settings = {};
    43 }
    44 
    45 WebInspector.InspectorControllerStub.prototype = {
    46     wrapCallback: function(func)
    47     {
    48         return func;
    49     },
    50 
    51     isWindowVisible: function()
    52     {
    53         return this._windowVisible;
    54     },
    55 
    56     platform: function()
    57     {
    58         return "mac-leopard";
    59     },
    60 
    61     port: function()
    62     {
    63         return "unknown";
    64     },
    65 
    66 
    67     closeWindow: function()
    68     {
    69         this._windowVisible = false;
    70     },
    71 
    72     attach: function()
    73     {
    74     },
    75 
    76     detach: function()
    77     {
    78     },
    79 
    80     storeLastActivePanel: function(panel)
    81     {
    82     },
    83 
    84     clearMessages: function()
    85     {
    86     },
    87 
    88     searchingForNode: function()
    89     {
    90         return this._searchingForNode;
    91     },
    92 
    93     search: function(sourceRow, query)
    94     {
    95     },
    96 
    97     toggleNodeSearch: function()
    98     {
    99         this._searchingForNode = !this._searchingForNode;
    100     },
    101 
    102     setAttachedWindowHeight: function(height)
    103     {
    104     },
    105 
    106     moveByUnrestricted: function(x, y)
    107     {
    108     },
    109 
    110 
    111     addResourceSourceToFrame: function(identifier, element)
    112     {
    113     },
    114 
    115     addSourceToFrame: function(mimeType, source, element)
    116     {
    117         return false;
    118     },
    119 
    120     getResourceDocumentNode: function(identifier)
    121     {
    122         return undefined;
    123     },
    124 
    125     highlightDOMNode: function(node)
    126     {
    127     },
    128 
    129     hideDOMNodeHighlight: function()
    130     {
    131     },
    132 
    133     inspectedWindow: function()
    134     {
    135         return window;
    136     },
    137 
    138     loaded: function()
    139     {
    140     },
    141 
    142     localizedStringsURL: function()
    143     {
    144         return undefined;
    145     },
    146 
    147     windowUnloading: function()
    148     {
    149         return false;
    150     },
    151 
    152     hiddenPanels: function()
    153     {
    154         return "";
    155     },
    156 
    157     debuggerEnabled: function()
    158     {
    159         return this._debuggerEnabled;
    160     },
    161 
    162     enableResourceTracking: function()
    163     {
    164         this._resourceTrackingEnabled = true;
    165         WebInspector.resourceTrackingWasEnabled();
    166     },
    167 
    168     disableResourceTracking: function()
    169     {
    170         this._resourceTrackingEnabled = false;
    171         WebInspector.resourceTrackingWasDisabled();
    172     },
    173 
    174     resourceTrackingEnabled: function()
    175     {
    176         return this._resourceTrackingEnabled;
    177     },
    178 
    179     enableDebugger: function()
    180     {
    181         this._debuggerEnabled = true;
    182     },
    183 
    184     disableDebugger: function()
    185     {
    186         this._debuggerEnabled = false;
    187     },
    188 
    189     addBreakpoint: function(sourceID, line, condition)
    190     {
    191     },
    192 
    193     removeBreakpoint: function(sourceID, line)
    194     {
    195     },
    196 
    197     updateBreakpoint: function(sourceID, line, condition)
    198     {
    199     },
    200 
    201     pauseInDebugger: function()
    202     {
    203     },
    204 
    205     pauseOnExceptions: function()
    206     {
    207         return false;
    208     },
    209 
    210     setPauseOnExceptions: function(value)
    211     {
    212     },
    213 
    214     resumeDebugger: function()
    215     {
    216     },
    217 
    218     profilerEnabled: function()
    219     {
    220         return true;
    221     },
    222 
    223     enableProfiler: function()
    224     {
    225         this._profilerEnabled = true;
    226     },
    227 
    228     disableProfiler: function()
    229     {
    230         this._profilerEnabled = false;
    231     },
    232 
    233     startProfiling: function()
    234     {
    235     },
    236 
    237     stopProfiling: function()
    238     {
    239     },
    240 
    241     getProfileHeaders: function(callId)
    242     {
    243         WebInspector.didGetProfileHeaders(callId, []);
    244     },
    245 
    246     getProfile: function(callId, uid)
    247     {
    248         if (WebInspector.__fullProfiles && (uid in WebInspector.__fullProfiles))
    249         {
    250             WebInspector.didGetProfile(callId, WebInspector.__fullProfiles[uid]);
    251         }
    252     },
    253 
    254     takeHeapSnapshot: function()
    255     {
    256     },
    257 
    258     databaseTableNames: function(database)
    259     {
    260         return [];
    261     },
    262 
    263     stepIntoStatementInDebugger: function()
    264     {
    265     },
    266 
    267     stepOutOfFunctionInDebugger: function()
    268     {
    269     },
    270 
    271     stepOverStatementInDebugger: function()
    272     {
    273     },
    274 
    275     setSetting: function(setting, value)
    276     {
    277         this._settings[setting] = value;
    278     },
    279 
    280     dispatchOnInjectedScript: function()
    281     {
    282     },
    283 
    284     releaseWrapperObjectGroup: function()
    285     {
    286     },
    287 
    288     setting: function(setting)
    289     {
    290         return this._settings[setting];
    291     }
    292 }
    293 
    294 window.InspectorController = new WebInspector.InspectorControllerStub();
    295 
    296 }

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

    r51527 r51528  
    2929 */
    3030
    31 WebInspector.TestController = function(callId)
     31if (!window.InspectorFrontendHost) {
     32
     33WebInspector.InspectorFrontendHostStub = function()
    3234{
    33     this._callId = callId;
    34     this._waitUntilDone = false;
     35    this._attachedWindowHeight = 0;
     36    this._settings = {};
    3537}
    3638
    37 WebInspector.TestController.prototype = {
    38     waitUntilDone: function()
     39WebInspector.InspectorFrontendHostStub.prototype = {
     40    platform: function()
    3941    {
    40         this._waitUntilDone = true;
     42        return "mac-leopard";
    4143    },
    4244
    43     notifyDone: function(result)
     45    port: function()
    4446    {
    45         var message = typeof result === "undefined" ? "\"<undefined>\"" : JSON.stringify(result);
    46         InspectorController.didEvaluateForTestInFrontend(this._callId, message);
     47        return "unknown";
    4748    },
    4849
    49     runAfterPendingDispatches: function(callback)
     50    closeWindow: function()
    5051    {
    51         if (WebInspector.pendingDispatches === 0) {
    52             callback();
    53             return;
    54         }
    55         setTimeout(this.runAfterPendingDispatches.bind(this), 0, callback);
     52        this._windowVisible = false;
     53    },
     54
     55    attach: function()
     56    {
     57    },
     58
     59    detach: function()
     60    {
     61    },
     62
     63    search: function(sourceRow, query)
     64    {
     65    },
     66
     67    setAttachedWindowHeight: function(height)
     68    {
     69    },
     70
     71    moveWindowBy: function(x, y)
     72    {
     73    },
     74
     75    addResourceSourceToFrame: function(identifier, element)
     76    {
     77    },
     78
     79    addSourceToFrame: function(mimeType, source, element)
     80    {
     81        return false;
     82    },
     83
     84    loaded: function()
     85    {
     86    },
     87
     88    localizedStringsURL: function()
     89    {
     90        return undefined;
     91    },
     92
     93    hiddenPanels: function()
     94    {
     95        return "";
     96    },
     97
     98    setSetting: function(setting, value)
     99    {
     100        this._settings[setting] = value;
     101    },
     102
     103    setting: function(setting)
     104    {
     105        return this._settings[setting];
    56106    }
    57107}
    58108
    59 WebInspector.evaluateForTestInFrontend = function(callId, script)
    60 {
    61     var controller = new WebInspector.TestController(callId);
    62     function invokeMethod()
    63     {
    64         try {
    65             var result;
    66             if (window[script] && typeof window[script] === "function")
    67                 result = window[script].call(WebInspector, controller);
    68             else
    69                 result = window.eval(script);
     109InspectorFrontendHost = new WebInspector.InspectorFrontendHostStub();
    70110
    71             if (!controller._waitUntilDone)
    72                 controller.notifyDone(result);
    73         } catch (e) {
    74             controller.notifyDone(e.toString());
    75         }
    76     }
    77     controller.runAfterPendingDispatches(invokeMethod);
    78111}

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

    r50460 r51528  
    9696
    9797    var callId = WebInspector.Callback.wrap(profileCallback);
    98     InspectorController.getProfile(callId, this.profile.uid);
     98    InspectorBackend.getProfile(callId, this.profile.uid);
    9999}
    100100
    … …  
    595595
    596596        if (this._recording)
    597             InspectorController.startProfiling();
     597            InspectorBackend.startProfiling();
    598598        else
    599             InspectorController.stopProfiling();
     599            InspectorBackend.stopProfiling();
    600600    },
    601601

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

    r50460 r51528  
    401401    {
    402402        // FIXME: Replace ProfileType-specific button visibility changes by a single ProfileType-agnostic "combo-button" visibility change.
    403         if (InspectorController.profilerEnabled()) {
     403        if (InspectorBackend.profilerEnabled()) {
    404404            this.enableToggleButton.title = WebInspector.UIString("Profiling enabled. Click to disable.");
    405405            this.enableToggleButton.toggled = true;
    … …  
    420420    _enableProfiling: function()
    421421    {
    422         if (InspectorController.profilerEnabled())
     422        if (InspectorBackend.profilerEnabled())
    423423            return;
    424424        this._toggleProfiling(this.panelEnablerView.alwaysEnabled);
    … …  
    427427    _toggleProfiling: function(optionalAlways)
    428428    {
    429         if (InspectorController.profilerEnabled())
    430             InspectorController.disableProfiler(true);
     429        if (InspectorBackend.profilerEnabled())
     430            InspectorBackend.disableProfiler(true);
    431431        else
    432             InspectorController.enableProfiler(!!optionalAlways);
     432            InspectorBackend.enableProfiler(!!optionalAlways);
    433433    },
    434434
    … …  
    450450
    451451        var callId = WebInspector.Callback.wrap(populateCallback);
    452         InspectorController.getProfileHeaders(callId);
     452        InspectorBackend.getProfileHeaders(callId);
    453453
    454454        delete this._shouldPopulateProfiles;

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

    r51290 r51528  
    350350        this.summaryBar.reset();
    351351
    352         if (InspectorController.resourceTrackingEnabled()) {
     352        if (InspectorBackend.resourceTrackingEnabled()) {
    353353            this.enableToggleButton.title = WebInspector.UIString("Resource tracking enabled. Click to disable.");
    354354            this.enableToggleButton.toggled = true;
    … …  
    617617        this.itemsTreeElement.smallChildren = !this.itemsTreeElement.smallChildren;
    618618        Preferences.resourcesLargeRows = !Preferences.resourcesLargeRows;
    619         InspectorController.setSetting("resources-large-rows", Preferences.resourcesLargeRows);
     619        InspectorFrontendHost.setSetting("resources-large-rows", Preferences.resourcesLargeRows);
    620620
    621621        if (this.itemsTreeElement.smallChildren) {
    … …  
    676676    _enableResourceTracking: function()
    677677    {
    678         if (InspectorController.resourceTrackingEnabled())
     678        if (InspectorBackend.resourceTrackingEnabled())
    679679            return;
    680680        this._toggleResourceTracking(this.panelEnablerView.alwaysEnabled);
    … …  
    683683    _toggleResourceTracking: function(optionalAlways)
    684684    {
    685         if (InspectorController.resourceTrackingEnabled()) {
     685        if (InspectorBackend.resourceTrackingEnabled()) {
    686686            this.largerResourcesButton.visible = false;
    687687            this.sortingSelectElement.visible = false;
    688             InspectorController.disableResourceTracking(true);
     688            InspectorBackend.disableResourceTracking(true);
    689689        } else {
    690690            this.largerResourcesButton.visible = true;
    691691            this.sortingSelectElement.visible = true;
    692             InspectorController.enableResourceTracking(!!optionalAlways);
     692            InspectorBackend.enableResourceTracking(!!optionalAlways);
    693693        }
    694694    },

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

    r37313 r51528  
    6060        this.attach();
    6161
    62         if (!InspectorController.addSourceToFrame("text/javascript", this.script.source, this.sourceFrame.element))
     62        if (!InspectorFrontendHost.addSourceToFrame("text/javascript", this.script.source, this.sourceFrame.element))
    6363            return;
    6464

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

    r51341 r51528  
    236236        }
    237237        if (this._attachDebuggerWhenShown) {
    238             InspectorController.enableDebugger(false);
     238            InspectorBackend.enableDebugger(false);
    239239            delete this._attachDebuggerWhenShown;
    240240        }
    … …  
    294294                   
    295295                    if (breakpoint.enabled)
    296                         InspectorController.addBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.condition);
     296                        InspectorBackend.addBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.condition);
    297297                }
    298298            }
    … …  
    422422    {
    423423        if (this.element.parentElement) {
    424             InspectorController.enableDebugger(false);
     424            InspectorBackend.enableDebugger(false);
    425425        } else {
    426426            this._attachDebuggerWhenShown = true;
    … …  
    445445        this.searchCanceled();
    446446
    447         if (!InspectorController.debuggerEnabled()) {
     447        if (!InspectorBackend.debuggerEnabled()) {
    448448            this._paused = false;
    449449            this._waitingToPause = false;
    … …  
    496496    canShowResource: function(resource)
    497497    {
    498         return resource && resource.scripts.length && InspectorController.debuggerEnabled();
     498        return resource && resource.scripts.length && InspectorBackend.debuggerEnabled();
    499499    },
    500500
    … …  
    607607        var url = scriptOrResource.url || scriptOrResource.sourceURL;
    608608        if (url && !options.initialLoad)
    609             InspectorController.setSetting("LastViewedScriptFile", url);
     609            InspectorFrontendHost.setSetting("LastViewedScriptFile", url);
    610610
    611611        if (!options.fromBackForwardAction) {
    … …  
    710710            // if not first item, check to see if this was the last viewed
    711711            var url = option.representedObject.url || option.representedObject.sourceURL;
    712             var lastURL = InspectorController.setting("LastViewedScriptFile");
     712            var lastURL = InspectorFrontendHost.setting("LastViewedScriptFile");
    713713            if (url && url === lastURL)
    714714                this._showScriptOrResource(option.representedObject, {initialLoad: true});
    … …  
    782782    _updatePauseOnExceptionsButton: function()
    783783    {
    784         if (InspectorController.pauseOnExceptions()) {
     784        if (InspectorBackend.pauseOnExceptions()) {
    785785            this.pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.");
    786786            this.pauseOnExceptionButton.toggled = true;
    … …  
    793793    _updateDebuggerButtons: function()
    794794    {
    795         if (InspectorController.debuggerEnabled()) {
     795        if (InspectorBackend.debuggerEnabled()) {
    796796            this.enableToggleButton.title = WebInspector.UIString("Debugging enabled. Click to disable.");
    797797            this.enableToggleButton.toggled = true;
    … …  
    872872    _enableDebugging: function()
    873873    {
    874         if (InspectorController.debuggerEnabled())
     874        if (InspectorBackend.debuggerEnabled())
    875875            return;
    876876        this._toggleDebugging(this.panelEnablerView.alwaysEnabled);
    … …  
    883883        this._stepping = false;
    884884
    885         if (InspectorController.debuggerEnabled())
    886             InspectorController.disableDebugger(true);
     885        if (InspectorBackend.debuggerEnabled())
     886            InspectorBackend.disableDebugger(true);
    887887        else
    888             InspectorController.enableDebugger(!!optionalAlways);
     888            InspectorBackend.enableDebugger(!!optionalAlways);
    889889    },
    890890
    891891    _togglePauseOnExceptions: function()
    892892    {
    893         InspectorController.setPauseOnExceptions(!InspectorController.pauseOnExceptions());
     893        InspectorBackend.setPauseOnExceptions(!InspectorBackend.pauseOnExceptions());
    894894        this._updatePauseOnExceptionsButton();
    895895    },
    … …  
    900900            this._paused = false;
    901901            this._waitingToPause = false;
    902             InspectorController.resumeDebugger();
     902            InspectorBackend.resumeDebugger();
    903903        } else {
    904904            this._stepping = false;
    905905            this._waitingToPause = true;
    906             InspectorController.pauseInDebugger();
     906            InspectorBackend.pauseInDebugger();
    907907        }
    908908
    … …  
    917917        this._clearInterface();
    918918
    919         InspectorController.stepOverStatementInDebugger();
     919        InspectorBackend.stepOverStatementInDebugger();
    920920    },
    921921
    … …  
    927927        this._clearInterface();
    928928
    929         InspectorController.stepIntoStatementInDebugger();
     929        InspectorBackend.stepIntoStatementInDebugger();
    930930    },
    931931
    … …  
    937937        this._clearInterface();
    938938
    939         InspectorController.stepOutOfFunctionInDebugger();
     939        InspectorBackend.stepOutOfFunctionInDebugger();
    940940    }
    941941}

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

    r49071 r51528  
    9898        delete this._frameNeedsSetup;
    9999        this.sourceFrame.addEventListener("content loaded", this._contentLoaded, this);
    100         InspectorController.addResourceSourceToFrame(this.resource.identifier, this.sourceFrame.element);
     100        InspectorFrontendHost.addResourceSourceToFrame(this.resource.identifier, this.sourceFrame.element);
    101101    },
    102102   
    … …  
    181181            if (isNaN(lineToSearch)) {
    182182                // Search the whole document since there was no line to search.
    183                 this._searchResults = (InspectorController.search(this.sourceFrame.element.contentDocument, query) || []);
     183                this._searchResults = (InspectorFrontendHost.search(this.sourceFrame.element.contentDocument, query) || []);
    184184            } else {
    185185                var sourceRow = this.sourceFrame.sourceRow(lineToSearch);
    … …  
    187187                    if (filterlessQuery) {
    188188                        // There is still a query string, so search for that string in the line.
    189                         this._searchResults = (InspectorController.search(sourceRow, filterlessQuery) || []);
     189                        this._searchResults = (InspectorFrontendHost.search(sourceRow, filterlessQuery) || []);
    190190                    } else {
    191191                        // Match the whole line, since there was no remaining query string to match.
    … …  
    197197
    198198                // Attempt to search for the whole query, just incase it matches a color like "#333".
    199                 var wholeQueryMatches = InspectorController.search(this.sourceFrame.element.contentDocument, query);
     199                var wholeQueryMatches = InspectorFrontendHost.search(this.sourceFrame.element.contentDocument, query);
    200200                if (wholeQueryMatches)
    201201                    this._searchResults = this._searchResults.concat(wholeQueryMatches);

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

    r50627 r51528  
    335335        Preferences.colorFormat = selectedOption.value;
    336336
    337         InspectorController.setSetting("color-format", Preferences.colorFormat);
     337        InspectorFrontendHost.setSetting("color-format", Preferences.colorFormat);
    338338
    339339        for (var i = 0; i < this.sections.length; ++i)

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

    r50574 r51528  
    4444    {
    4545        var message = typeof result === "undefined" ? "\"<undefined>\"" : JSON.stringify(result);
    46         InspectorController.didEvaluateForTestInFrontend(this._callId, message);
     46        InspectorBackend.didEvaluateForTestInFrontend(this._callId, message);
    4747    },
    4848

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

    r51339 r51528  
    120120    {
    121121        if (this.toggleTimelineButton.toggled)
    122             InspectorController.stopTimelineProfiler();
     122            InspectorBackend.stopTimelineProfiler();
    123123        else
    124             InspectorController.startTimelineProfiler();
     124            InspectorBackend.startTimelineProfiler();
    125125    },
    126126

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

    r50468 r51528  
    128128        }
    129129
    130         InspectorController.releaseWrapperObjectGroup(this._watchObjectGroupId)
     130        InspectorBackend.releaseWrapperObjectGroup(this._watchObjectGroupId)
    131131        var properties = [];
    132132
    … …  
    184184    loadSavedExpressions: function()
    185185    {
    186         var json = InspectorController.setting("watchExpressions");
     186        var json = InspectorFrontendHost.setting("watchExpressions");
    187187        if (!json)
    188188            return [];
    … …  
    205205
    206206        var json = JSON.stringify({expressions: toSave});
    207         InspectorController.setSetting("watchExpressions", json);
     207        InspectorFrontendHost.setSetting("watchExpressions", json);
    208208
    209209        return toSave.length;

  • trunk/WebCore/inspector/front-end/WebKit.qrc

    r51296 r51528  
    2929    <file>InjectedScriptAccess.js</file>
    3030    <file>inspector.js</file>
    31     <file>InspectorControllerStub.js</file>
     31    <file>InspectorBackendStub.js</file>
     32    <file>InspectorFrontendHostStub.js</file>
    3233    <file>KeyboardShortcut.js</file>
    3334    <file>MetricsSidebarPane.js</file>

  • trunk/WebCore/inspector/front-end/inspector.html

    r51296 r51528  
    3535    <script type="text/javascript" src="treeoutline.js"></script>
    3636    <script type="text/javascript" src="inspector.js"></script>
    37     <script type="text/javascript" src="InspectorControllerStub.js"></script>
     37    <script type="text/javascript" src="InspectorBackendStub.js"></script>
     38    <script type="text/javascript" src="InspectorFrontendHostStub.js"></script>
    3839    <script type="text/javascript" src="Object.js"></script>
    3940    <script type="text/javascript" src="KeyboardShortcut.js"></script>

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

    r51506 r51528  
    7878    {
    7979        if (!("_platform" in this))
    80             this._platform = InspectorController.platform();
     80            this._platform = InspectorFrontendHost.platform();
    8181
    8282        return this._platform;
    … …  
    8686    {
    8787        if (!("_port" in this))
    88             this._port = InspectorController.port();
     88            this._port = InspectorFrontendHost.port();
    8989
    9090        return this._port;
    … …  
    166166        for (var panelName in WebInspector.panels) {
    167167            if (WebInspector.panels[panelName] == x)
    168                 InspectorController.storeLastActivePanel(panelName);
     168                InspectorBackend.storeLastActivePanel(panelName);
    169169        }
    170170    },
    … …  
    172172    _createPanels: function()
    173173    {
    174         var hiddenPanels = (InspectorController.hiddenPanels() || "").split(',');
     174        var hiddenPanels = (InspectorFrontendHost.hiddenPanels() || "").split(',');
    175175        if (hiddenPanels.indexOf("elements") === -1)
    176176            this.panels.elements = new WebInspector.ElementsPanel();
    … …  
    194194    _loadPreferences: function()
    195195    {
    196         var colorFormat = InspectorController.setting("color-format");
     196        var colorFormat = InspectorFrontendHost.setting("color-format");
    197197        if (colorFormat)
    198198            Preferences.colorFormat = colorFormat;
    199199
    200         var eventListenersFilter = InspectorController.setting("event-listeners-filter");
     200        var eventListenersFilter = InspectorFrontendHost.setting("event-listeners-filter");
    201201        if (eventListenersFilter)
    202202            Preferences.eventListenersFilter = eventListenersFilter;
    203203
    204         var resourcesLargeRows = InspectorController.setting("resources-large-rows");
     204        var resourcesLargeRows = InspectorFrontendHost.setting("resources-large-rows");
    205205        if (typeof resourcesLargeRows !== "undefined")
    206206            Preferences.resourcesLargeRows = resourcesLargeRows;
    … …  
    225225
    226226        if (x) {
    227             InspectorController.attach();
     227            InspectorFrontendHost.attach();
    228228            body.removeStyleClass("detached");
    229229            body.addStyleClass("attached");
    230230            dockToggleButton.title = WebInspector.UIString("Undock into separate window.");
    231231        } else {
    232             InspectorController.detach();
     232            InspectorFrontendHost.detach();
    233233            body.removeStyleClass("attached");
    234234            body.addStyleClass("detached");
    … …  
    399399
    400400        if (this._hoveredDOMNode) {
    401             InspectorController.highlightDOMNode(this._hoveredDOMNode.id);
     401            InspectorBackend.highlightDOMNode(this._hoveredDOMNode.id);
    402402            this.showingDOMNodeHighlight = true;
    403403        } else {
    404             InspectorController.hideDOMNodeHighlight();
     404            InspectorBackend.hideDOMNodeHighlight();
    405405            this.showingDOMNodeHighlight = false;
    406406        }
    … …  
    509509    document.getElementById("close-button-right").addEventListener("click", this.close, true);
    510510
    511     InspectorController.loaded();
     511    InspectorFrontendHost.loaded();
    512512}
    513513
    514514var windowLoaded = function()
    515515{
    516     var localizedStringsURL = InspectorController.localizedStringsURL();
     516    var localizedStringsURL = InspectorFrontendHost.localizedStringsURL();
    517517    if (localizedStringsURL) {
    518518        var localizedStringsScriptElement = document.createElement("script");
    … …  
    547547WebInspector.windowUnload = function(event)
    548548{
    549     InspectorController.windowUnloading();
     549    InspectorFrontendHost.windowUnloading();
    550550}
    551551
    … …  
    587587WebInspector.close = function(event)
    588588{
    589     InspectorController.closeWindow();
     589    InspectorFrontendHost.closeWindow();
    590590}
    591591
    … …  
    910910        var height = window.innerHeight - (event.screenY - toolbar.lastScreenY);
    911911
    912         InspectorController.setAttachedWindowHeight(height);
     912        InspectorFrontendHost.setAttachedWindowHeight(height);
    913913    } else {
    914914        var x = event.screenX - toolbar.lastScreenX;
    … …  
    917917        // We cannot call window.moveBy here because it restricts the movement
    918918        // of the window at the edges.
    919         InspectorController.moveByUnrestricted(x, y);
     919        InspectorFrontendHost.moveWindowBy(x, y);
    920920    }
    921921
    … …  
    16411641    else {
    16421642        if (!(string in this.missingLocalizedStrings)) {
    1643             if (!WebInspector.InspectorControllerStub)
     1643            if (!WebInspector.InspectorBackendStub)
    16441644                console.error("Localized string \"" + string + "\" not found.");
    16451645            this.missingLocalizedStrings[string] = true;
Note: See TracChangeset for help on using the changeset viewer.