[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
loislo at chromium.org
loislo at chromium.org
Wed Dec 22 11:40:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 854cb9afc8b4da4d06f321267563d776a7f24df1
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 08:57:59 2010 +0000
2010-08-02 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
WebInspector: Trivial InspectorBackend functions were removed.
And now it is bit simpler to change Inspector API because we have
less number of abstraction layers.
https://bugs.webkit.org/show_bug.cgi?id=43402
* inspector/CodeGeneratorInspector.pm:
* inspector/Inspector.idl:
* inspector/InspectorBackend.cpp:
(WebCore::InspectorBackend::clearConsoleMessages):
(WebCore::InspectorBackend::releaseWrapperObjectGroup):
(WebCore::InspectorBackend::inspectorFrontend):
(WebCore::InspectorBackend::remoteFrontend):
* inspector/InspectorBackend.h:
(WebCore::InspectorBackend::inspectorDOMAgent):
(WebCore::InspectorBackend::inspectorApplicationCacheAgent):
* inspector/InspectorController.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64536 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 564d338..8c5c6ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-02 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ WebInspector: Trivial InspectorBackend functions were removed.
+ And now it is bit simpler to change Inspector API because we have
+ less number of abstraction layers.
+ https://bugs.webkit.org/show_bug.cgi?id=43402
+
+ * inspector/CodeGeneratorInspector.pm:
+ * inspector/Inspector.idl:
+ * inspector/InspectorBackend.cpp:
+ (WebCore::InspectorBackend::clearConsoleMessages):
+ (WebCore::InspectorBackend::releaseWrapperObjectGroup):
+ (WebCore::InspectorBackend::inspectorFrontend):
+ (WebCore::InspectorBackend::remoteFrontend):
+ * inspector/InspectorBackend.h:
+ (WebCore::InspectorBackend::inspectorDOMAgent):
+ (WebCore::InspectorBackend::inspectorApplicationCacheAgent):
+ * inspector/InspectorController.h:
+
2010-08-03 Alexey Proskuryakov <ap at apple.com>
Unreviewed (emergency test fix).
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index 5488dbd..0ae9e85 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -14,9 +14,30 @@ $typeTransform{"InspectorClient"} = {
"forward" => "InspectorClient",
"header" => "InspectorClient.h",
};
-$typeTransform{"InspectorBackend"} = {
+$typeTransform{"Backend"} = {
"forward" => "InspectorBackend",
"header" => "InspectorBackend.h",
+ "handlerAccessor" => "m_inspectorBackend",
+};
+$typeTransform{"Controller"} = {
+ "forward" => "InspectorController",
+ "header" => "InspectorController.h",
+ "handlerAccessor" => "m_inspectorBackend->inspectorController()",
+};
+$typeTransform{"Debug"} = {
+ "forward" => "ScriptDebugServer",
+ "header" => "ScriptDebugServer.h",
+ "handlerAccessor" => "(&ScriptDebugServer::shared())",
+};
+$typeTransform{"DOM"} = {
+ "forward" => "InspectorDOMAgent",
+ "header" => "InspectorDOMAgent.h",
+ "handlerAccessor" => "m_inspectorBackend->inspectorDOMAgent()",
+};
+$typeTransform{"ApplicationCache"} = {
+ "forward" => "InspectorApplicationCacheAgent",
+ "header" => "InspectorApplicationCacheAgent.h",
+ "handlerAccessor" => "m_inspectorBackend->inspectorApplicationCacheAgent()",
};
$typeTransform{"PassRefPtr"} = {
"forwardHeader" => "wtf/PassRefPtr.h",
@@ -168,7 +189,7 @@ sub GenerateInterface
push(@backendHead, "private:");
$backendConstructor = join("\n", @backendHead);
$backendFooter = " InspectorBackend* m_inspectorBackend;";
- $backendTypes{"InspectorBackend"} = 1;
+ $backendTypes{"Backend"} = 1;
$backendTypes{"PassRefPtr"} = 1;
$backendTypes{"Array"} = 1;
@@ -276,7 +297,11 @@ sub generateBackendFunction
push(@function, " }");
++$i;
}
- push(@function, " m_inspectorBackend->$functionName(" . join(", ", map($_->name, @argsFiltered)) . ");");
+ my $handler = $function->signature->extendedAttributes->{"handler"} || "Backend";
+ my $handlerAccessor = $typeTransform{$handler}->{"handlerAccessor"};
+ $backendTypes{$handler} = 1;
+ push(@function, " if ($handlerAccessor)");
+ push(@function, " $handlerAccessor->$functionName(" . join(", ", map($_->name, @argsFiltered)) . ");");
push(@function, "}");
push(@function, "");
push(@backendMethodsImpl, @function);
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index cf3f687..11fb378 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -45,118 +45,118 @@ module core {
[notify] void updateConsoleMessageExpiredCount(out unsigned long count);
[notify] void updateConsoleMessageRepeatCount(out unsigned long count);
- void storeLastActivePanel(in String panelName);
+ [handler=Controller] void storeLastActivePanel(in String panelName);
- void saveApplicationSettings(in String settings);
- void saveSessionSettings(in String settings);
+ [handler=Controller] void saveApplicationSettings(in String settings);
+ [handler=Controller] void saveSessionSettings(in String settings);
- void enableSearchingForNode();
- void disableSearchingForNode();
+ [handler=Controller] void enableSearchingForNode();
+ [handler=Controller] void disableSearchingForNode();
- void enableMonitoringXHR();
- void disableMonitoringXHR();
+ [handler=Controller] void enableMonitoringXHR();
+ [handler=Controller] void disableMonitoringXHR();
- void enableResourceTracking(in boolean always);
- void disableResourceTracking(in boolean always);
- void getResourceContent(in long callId, in unsigned long identifier);
- void reloadPage();
+ [handler=Controller] void enableResourceTracking(in boolean always);
+ [handler=Controller] void disableResourceTracking(in boolean always);
+ [handler=Controller] void getResourceContent(in long callId, in unsigned long identifier);
+ [handler=Controller] void reloadPage();
- void startTimelineProfiler();
- void stopTimelineProfiler();
+ [handler=Controller] void startTimelineProfiler();
+ [handler=Controller] void stopTimelineProfiler();
#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
- void enableDebugger(in boolean always);
- void disableDebugger(in boolean always);
+ [handler=Backend] void enableDebugger(in boolean always);
+ [handler=Controller] void disableDebugger(in boolean always);
- void setBreakpoint(in long callId, in String sourceID, in unsigned long lineNumber, in boolean enabled, in String condition);
- void removeBreakpoint(in String sourceID, in unsigned long lineNumber);
- void activateBreakpoints();
- void deactivateBreakpoints();
+ [handler=Controller] void setBreakpoint(in long callId, in String sourceID, in unsigned long lineNumber, in boolean enabled, in String condition);
+ [handler=Controller] void removeBreakpoint(in String sourceID, in unsigned long lineNumber);
+ [handler=Debug] void activateBreakpoints();
+ [handler=Debug] void deactivateBreakpoints();
- void pause();
- void resume();
+ [handler=Debug] void pause();
+ [handler=Controller] void resume();
- void stepOverStatement();
- void stepIntoStatement();
- void stepOutOfFunction();
+ [handler=Debug] void stepOverStatement();
+ [handler=Debug] void stepIntoStatement();
+ [handler=Debug] void stepOutOfFunction();
- void setPauseOnExceptionsState(in long pauseOnExceptionsState);
+ [handler=Controller] void setPauseOnExceptionsState(in long pauseOnExceptionsState);
- void editScriptSource(in long callId, in String sourceID, in String newContent);
- void getScriptSource(in long callId, in String sourceID);
+ [handler=Controller] void editScriptSource(in long callId, in String sourceID, in String newContent);
+ [handler=Controller] void getScriptSource(in long callId, in String sourceID);
- void enableProfiler(in boolean always);
- void disableProfiler(in boolean always);
+ [handler=Controller] void enableProfiler(in boolean always);
+ [handler=Controller] void disableProfiler(in boolean always);
- void startProfiling();
- void stopProfiling();
+ [handler=Controller] void startProfiling();
+ [handler=Controller] void stopProfiling();
- void getProfileHeaders(in long callId);
- void getProfile(in long callId, in unsigned long uid);
+ [handler=Controller] void getProfileHeaders(in long callId);
+ [handler=Controller] void getProfile(in long callId, in unsigned long uid);
- void removeProfile(in unsigned long uid);
- void clearProfiles();
+ [handler=Controller] void removeProfile(in unsigned long uid);
+ [handler=Controller] void clearProfiles();
- void takeHeapSnapshot();
- void getProfilerLogLines(in long callId, in long inPosition, out long outPosition, out String log);
+ [handler=Backend] void takeHeapSnapshot();
+ [handler=Backend] void getProfilerLogLines(in long callId, in long inPosition, out long outPosition, out String log);
#endif
- void setInjectedScriptSource(in String scriptSource);
- void dispatchOnInjectedScript(in long callId, in long injectedScriptId, in String methodName, in String arguments, in boolean async);
-
- void addScriptToEvaluateOnLoad(in String scriptSource);
- void removeAllScriptsToEvaluateOnLoad();
-
- void getChildNodes(in long callId, in long nodeId);
- [customResponse=didApplyDomChange] void setAttribute(in long callId, in long elementId, in String name, in String value, out boolean success);
- [customResponse=didApplyDomChange] void removeAttribute(in long callId, in long elementId, in String name, out boolean success);
- void setTextNodeValue(in long callId, in long nodeId, in String value);
- void getEventListenersForNode(in long callId, in long nodeId, out long nodeId, out Array listenersArray);
- void copyNode(in long nodeId);
- void removeNode(in long callId, in long nodeId, out long nodeId);
- void changeTagName(in long callId, in long nodeId, in String newTagName, out long nodeId);
- void getOuterHTML(in long callId, in long nodeId, out String outerHTML);
- void setOuterHTML(in long callId, in long nodeId, in String outerHTML, out long nodeId);
- void addInspectedNode(in long nodeId);
- void performSearch(in String query, in boolean runSynchronously);
- void searchCanceled();
- void pushNodeByPathToFrontend(in long callId, in String path, out long nodeId);
-
- void clearConsoleMessages(in long callId);
-
- void highlightDOMNode(in long nodeId);
- void hideDOMNodeHighlight();
-
- void getStyles(in long callId, in long nodeId, in boolean authOnly, out Value styles);
- void getAllStyles(in long callId, out Array styles);
- void getInlineStyle(in long callId, in long nodeId, out Value style);
- void getComputedStyle(in long callId, in long nodeId, out Value style);
- void getStyleSheet(in long callId, in long styleSheetId, out Value styleSheet);
- void getRuleRanges(in long callId, in long styleSheetId, out Value ranges);
- void applyStyleText(in long callId, in long styleId, in String styleText, in String propertyName, out boolean success, out Value style, out Array changedProperties);
- void setStyleText(in long callId, in long styleId, in String styleText, out boolean success);
- void setStyleProperty(in long callId, in long styleId, in String name, in String value, out boolean success);
- void toggleStyleEnabled(in long callId, in long styleId, in String propertyName, in boolean disabled, out Value style);
- void setRuleSelector(in long callId, in long ruleId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
- void addRule(in long callId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
-
- void getCookies(in long callId);
- void deleteCookie(in String cookieName, in String domain);
+ [handler=Backend] void setInjectedScriptSource(in String scriptSource);
+ [handler=Backend] void dispatchOnInjectedScript(in long callId, in long injectedScriptId, in String methodName, in String arguments, in boolean async);
+
+ [handler=Controller] void addScriptToEvaluateOnLoad(in String scriptSource);
+ [handler=Controller] void removeAllScriptsToEvaluateOnLoad();
+
+ [handler=DOM] void getChildNodes(in long callId, in long nodeId);
+ [handler=DOM, customResponse=didApplyDomChange] void setAttribute(in long callId, in long elementId, in String name, in String value, out boolean success);
+ [handler=DOM, customResponse=didApplyDomChange] void removeAttribute(in long callId, in long elementId, in String name, out boolean success);
+ [handler=DOM] void setTextNodeValue(in long callId, in long nodeId, in String value);
+ [handler=DOM] void getEventListenersForNode(in long callId, in long nodeId, out long nodeId, out Array listenersArray);
+ [handler=DOM] void copyNode(in long nodeId);
+ [handler=DOM] void removeNode(in long callId, in long nodeId, out long nodeId);
+ [handler=DOM] void changeTagName(in long callId, in long nodeId, in String newTagName, out long nodeId);
+ [handler=DOM] void getOuterHTML(in long callId, in long nodeId, out String outerHTML);
+ [handler=DOM] void setOuterHTML(in long callId, in long nodeId, in String outerHTML, out long nodeId);
+ [handler=DOM] void addInspectedNode(in long nodeId);
+ [handler=DOM] void performSearch(in String query, in boolean runSynchronously);
+ [handler=DOM] void searchCanceled();
+ [handler=DOM] void pushNodeByPathToFrontend(in long callId, in String path, out long nodeId);
+
+ [handler=Backend] void clearConsoleMessages(in long callId);
+
+ [handler=Controller] void highlightDOMNode(in long nodeId);
+ [handler=Controller] void hideDOMNodeHighlight();
+
+ [handler=DOM] void getStyles(in long callId, in long nodeId, in boolean authOnly, out Value styles);
+ [handler=DOM] void getAllStyles(in long callId, out Array styles);
+ [handler=DOM] void getInlineStyle(in long callId, in long nodeId, out Value style);
+ [handler=DOM] void getComputedStyle(in long callId, in long nodeId, out Value style);
+ [handler=DOM] void getStyleSheet(in long callId, in long styleSheetId, out Value styleSheet);
+ [handler=DOM] void getRuleRanges(in long callId, in long styleSheetId, out Value ranges);
+ [handler=DOM] void applyStyleText(in long callId, in long styleId, in String styleText, in String propertyName, out boolean success, out Value style, out Array changedProperties);
+ [handler=DOM] void setStyleText(in long callId, in long styleId, in String styleText, out boolean success);
+ [handler=DOM] void setStyleProperty(in long callId, in long styleId, in String name, in String value, out boolean success);
+ [handler=DOM] void toggleStyleEnabled(in long callId, in long styleId, in String propertyName, in boolean disabled, out Value style);
+ [handler=DOM] void setRuleSelector(in long callId, in long ruleId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
+ [handler=DOM] void addRule(in long callId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
+
+ [handler=Controller] void getCookies(in long callId);
+ [handler=Controller] void deleteCookie(in String cookieName, in String domain);
#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
- void getApplicationCaches(in long callId);
+ [handler=ApplicationCache] void getApplicationCaches(in long callId);
#endif
- void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
- void didEvaluateForTestInFrontend(in long callId, in String jsonResult);
+ [handler=Backend] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
+ [handler=Controller] void didEvaluateForTestInFrontend(in long callId, in String jsonResult);
#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
- void getDatabaseTableNames(in long callId, in long databaseId);
+ [handler=Backend] void getDatabaseTableNames(in long callId, in long databaseId);
#endif
#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
- void getDOMStorageEntries(in long callId, in long storageId);
- void setDOMStorageItem(in long callId, in long storageId, in String key, in String value);
- void removeDOMStorageItem(in long callId, in long storageId, in String key);
+ [handler=Controller] void getDOMStorageEntries(in long callId, in long storageId);
+ [handler=Controller] void setDOMStorageItem(in long callId, in long storageId, in String key, in String value);
+ [handler=Controller] void removeDOMStorageItem(in long callId, in long storageId, in String key);
#endif
};
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index 3bdccde..a451329 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -36,42 +36,17 @@
#include "Database.h"
#endif
-#include "Element.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "HTMLFrameOwnerElement.h"
#include "InjectedScript.h"
#include "InjectedScriptHost.h"
-#include "InspectorClient.h"
#include "InspectorController.h"
#include "InspectorDOMAgent.h"
#include "InspectorFrontend.h"
-#include "InspectorResource.h"
-#include "Page.h"
-#include "Pasteboard.h"
#include "RemoteInspectorFrontend.h"
#include "ScriptArray.h"
#include "ScriptBreakpoint.h"
#include "ScriptProfiler.h"
#include "SerializedScriptValue.h"
-#if ENABLE(DOM_STORAGE)
-#include "Storage.h"
-#endif
-
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-#include "ScriptDebugServer.h"
-#endif
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "InspectorApplicationCacheAgent.h"
-#endif
-
-#include "markup.h"
-
-#include <wtf/RefPtr.h>
-#include <wtf/StdLibExtras.h>
-
using namespace std;
namespace WebCore {
@@ -85,83 +60,6 @@ InspectorBackend::~InspectorBackend()
{
}
-void InspectorBackend::saveApplicationSettings(const String& settings)
-{
- if (m_inspectorController)
- m_inspectorController->saveApplicationSettings(settings);
-}
-
-void InspectorBackend::saveSessionSettings(const String& settings)
-{
- if (m_inspectorController)
- m_inspectorController->saveSessionSettings(settings);
-}
-
-void InspectorBackend::storeLastActivePanel(const String& panelName)
-{
- if (m_inspectorController)
- m_inspectorController->storeLastActivePanel(panelName);
-}
-
-void InspectorBackend::enableSearchingForNode()
-{
- if (m_inspectorController)
- m_inspectorController->enableSearchingForNode();
-}
-
-void InspectorBackend::disableSearchingForNode()
-{
- if (m_inspectorController)
- m_inspectorController->disableSearchingForNode();
-}
-
-void InspectorBackend::enableMonitoringXHR()
-{
- if (m_inspectorController)
- m_inspectorController->enableMonitoringXHR();
-}
-
-void InspectorBackend::disableMonitoringXHR()
-{
- if (m_inspectorController)
- m_inspectorController->disableMonitoringXHR();
-}
-
-void InspectorBackend::enableResourceTracking(bool always)
-{
- if (m_inspectorController)
- m_inspectorController->enableResourceTracking(always);
-}
-
-void InspectorBackend::disableResourceTracking(bool always)
-{
- if (m_inspectorController)
- m_inspectorController->disableResourceTracking(always);
-}
-
-void InspectorBackend::getResourceContent(long callId, unsigned long identifier)
-{
- if (m_inspectorController)
- m_inspectorController->getResourceContent(callId, identifier);
-}
-
-void InspectorBackend::reloadPage()
-{
- if (m_inspectorController)
- m_inspectorController->reloadPage();
-}
-
-void InspectorBackend::startTimelineProfiler()
-{
- if (m_inspectorController)
- m_inspectorController->startTimelineProfiler();
-}
-
-void InspectorBackend::stopTimelineProfiler()
-{
- if (m_inspectorController)
- m_inspectorController->stopTimelineProfiler();
-}
#if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -171,126 +69,6 @@ void InspectorBackend::enableDebugger(bool always)
m_inspectorController->enableDebuggerFromFrontend(always);
}
-void InspectorBackend::disableDebugger(bool always)
-{
- if (m_inspectorController)
- m_inspectorController->disableDebugger(always);
-}
-
-void InspectorBackend::setBreakpoint(long callId, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition)
-{
- if (m_inspectorController)
- m_inspectorController->setBreakpoint(callId, sourceID, lineNumber, enabled, condition);
-}
-
-void InspectorBackend::removeBreakpoint(const String& sourceID, unsigned lineNumber)
-{
- if (m_inspectorController)
- m_inspectorController->removeBreakpoint(sourceID, lineNumber);
-}
-
-void InspectorBackend::activateBreakpoints()
-{
- ScriptDebugServer::shared().activateBreakpoints();
-}
-
-void InspectorBackend::deactivateBreakpoints()
-{
- ScriptDebugServer::shared().deactivateBreakpoints();
-}
-
-void InspectorBackend::pause()
-{
- ScriptDebugServer::shared().pause();
-}
-
-void InspectorBackend::resume()
-{
- if (m_inspectorController)
- m_inspectorController->resume();
-}
-
-void InspectorBackend::stepOverStatement()
-{
- ScriptDebugServer::shared().stepOverStatement();
-}
-
-void InspectorBackend::stepIntoStatement()
-{
- ScriptDebugServer::shared().stepIntoStatement();
-}
-
-void InspectorBackend::stepOutOfFunction()
-{
- ScriptDebugServer::shared().stepOutOfFunction();
-}
-
-void InspectorBackend::setPauseOnExceptionsState(long pauseState)
-{
- if (m_inspectorController)
- m_inspectorController->setPauseOnExceptionsState(pauseState);
-}
-
-void InspectorBackend::editScriptSource(long callId, const String& sourceID, const String& newContent)
-{
- if (m_inspectorController)
- m_inspectorController->editScriptSource(callId, sourceID, newContent);
-}
-
-void InspectorBackend::getScriptSource(long callId, const String& sourceID)
-{
- if (m_inspectorController)
- m_inspectorController->getScriptSource(callId, sourceID);
-}
-
-void InspectorBackend::enableProfiler(bool always)
-{
- if (m_inspectorController)
- m_inspectorController->enableProfiler(always);
-}
-
-void InspectorBackend::disableProfiler(bool always)
-{
- if (m_inspectorController)
- m_inspectorController->disableProfiler(always);
-}
-
-void InspectorBackend::startProfiling()
-{
- if (m_inspectorController)
- m_inspectorController->startUserInitiatedProfiling();
-}
-
-void InspectorBackend::stopProfiling()
-{
- if (m_inspectorController)
- m_inspectorController->stopUserInitiatedProfiling();
-}
-
-void InspectorBackend::getProfileHeaders(long callId)
-{
- if (m_inspectorController)
- m_inspectorController->getProfileHeaders(callId);
-}
-
-void InspectorBackend::getProfile(long callId, unsigned uid)
-{
- if (m_inspectorController)
- m_inspectorController->getProfile(callId, uid);
-}
-
-void InspectorBackend::removeProfile(unsigned uid)
-{
- if (m_inspectorController)
- m_inspectorController->removeProfile(uid);
-}
-
-void InspectorBackend::clearProfiles()
-{
- if (m_inspectorController)
- m_inspectorController->clearProfiles();
-}
-
void InspectorBackend::takeHeapSnapshot()
{
ScriptProfiler::takeHeapSnapshot();
@@ -340,216 +118,17 @@ void InspectorBackend::dispatchOnInjectedScript(long callId, long injectedScript
frontend->didDispatchOnInjectedScript(callId, result.get(), hadException);
}
-void InspectorBackend::getChildNodes(long callId, long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getChildNodes(callId, nodeId);
-}
-
-void InspectorBackend::setAttribute(long callId, long elementId, const String& name, const String& value)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->setAttribute(callId, elementId, name, value);
-}
-
-void InspectorBackend::removeAttribute(long callId, long elementId, const String& name)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->removeAttribute(callId, elementId, name);
-}
-
-void InspectorBackend::setTextNodeValue(long callId, long nodeId, const String& value)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->setTextNodeValue(callId, nodeId, value);
-}
-
-void InspectorBackend::getEventListenersForNode(long callId, long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getEventListenersForNode(callId, nodeId);
-}
-
-void InspectorBackend::copyNode(long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->copyNode(nodeId);
-}
-
-void InspectorBackend::removeNode(long callId, long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->removeNode(callId, nodeId);
-}
-
-void InspectorBackend::changeTagName(long callId, long nodeId, const String& tagName)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->changeTagName(callId, nodeId, tagName);
-}
-
-void InspectorBackend::getOuterHTML(long callId, long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getOuterHTML(callId, nodeId);
-}
-
-void InspectorBackend::setOuterHTML(long callId, long nodeId, const String& outerHTML)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->setOuterHTML(callId, nodeId, outerHTML);
-}
-
-void InspectorBackend::addInspectedNode(long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->addInspectedNode(nodeId);
-}
-
-void InspectorBackend::performSearch(const String& query, bool runSynchronously)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->performSearch(query, runSynchronously);
-}
-
-void InspectorBackend::searchCanceled()
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->searchCanceled();
-}
-
-void InspectorBackend::pushNodeByPathToFrontend(long callId, const String& path)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->pushNodeByPathToFrontend(callId, path);
-}
-
void InspectorBackend::clearConsoleMessages(long callId)
{
- if (m_inspectorController) {
- m_inspectorController->clearConsoleMessages();
- if (RemoteInspectorFrontend* frontend = remoteFrontend())
- frontend->didClearConsoleMessages(callId);
- }
-}
-
-void InspectorBackend::getStyles(long callId, long nodeId, bool authorOnly)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getStyles(callId, nodeId, authorOnly);
-}
-
-void InspectorBackend::getAllStyles(long callId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getAllStyles(callId);
-}
-
-void InspectorBackend::getInlineStyle(long callId, long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getInlineStyle(callId, nodeId);
-}
-
-void InspectorBackend::getComputedStyle(long callId, long nodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getComputedStyle(callId, nodeId);
-}
-
-void InspectorBackend::getStyleSheet(long callId, long styleSheetId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getStyleSheet(callId, styleSheetId);
-}
-
-void InspectorBackend::getRuleRanges(long callId, long styleSheetId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->getRuleRanges(callId, styleSheetId);
-}
-
-void InspectorBackend::applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->applyStyleText(callId, styleId, styleText, propertyName);
-}
-
-void InspectorBackend::setStyleText(long callId, long styleId, const String& cssText)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->setStyleText(callId, styleId, cssText);
-}
-
-void InspectorBackend::setStyleProperty(long callId, long styleId, const String& name, const String& value)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->setStyleProperty(callId, styleId, name, value);
-}
-
-void InspectorBackend::toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->toggleStyleEnabled(callId, styleId, propertyName, disabled);
-}
-
-void InspectorBackend::setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->setRuleSelector(callId, ruleId, selector, selectedNodeId);
-}
-
-void InspectorBackend::addRule(long callId, const String& selector, long selectedNodeId)
-{
- if (InspectorDOMAgent* domAgent = inspectorDOMAgent())
- domAgent->addRule(callId, selector, selectedNodeId);
-}
-
-void InspectorBackend::highlightDOMNode(long nodeId)
-{
- if (m_inspectorController)
- m_inspectorController->highlightDOMNode(nodeId);
-}
-
-void InspectorBackend::hideDOMNodeHighlight()
-{
- if (m_inspectorController)
- m_inspectorController->hideDOMNodeHighlight();
-}
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-void InspectorBackend::getApplicationCaches(long callId)
-{
- if (InspectorApplicationCacheAgent* agent = inspectorApplicationCacheAgent())
- agent->getApplicationCaches(callId);
-}
-#endif
-
-void InspectorBackend::getCookies(long callId)
-{
- if (!m_inspectorController)
- return;
- m_inspectorController->getCookies(callId);
-}
-
-void InspectorBackend::deleteCookie(const String& cookieName, const String& domain)
-{
- if (!m_inspectorController)
- return;
- m_inspectorController->deleteCookie(cookieName, domain);
+ m_inspectorController->clearConsoleMessages();
+ if (RemoteInspectorFrontend* frontend = remoteFrontend())
+ frontend->didClearConsoleMessages(callId);
}
void InspectorBackend::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
{
- if (!m_inspectorController)
- return;
- m_inspectorController->injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
-}
-
-void InspectorBackend::didEvaluateForTestInFrontend(long callId, const String& jsonResult)
-{
if (m_inspectorController)
- m_inspectorController->didEvaluateForTestInFrontend(callId, jsonResult);
+ m_inspectorController->injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
}
#if ENABLE(DATABASE)
@@ -569,68 +148,16 @@ void InspectorBackend::getDatabaseTableNames(long callId, long databaseId)
}
#endif
-#if ENABLE(DOM_STORAGE)
-void InspectorBackend::getDOMStorageEntries(long callId, long storageId)
-{
- if (m_inspectorController)
- m_inspectorController->getDOMStorageEntries(callId, storageId);
-}
-
-void InspectorBackend::setDOMStorageItem(long callId, long storageId, const String& key, const String& value)
-{
- if (m_inspectorController)
- m_inspectorController->setDOMStorageItem(callId, storageId, key, value);
-}
-
-void InspectorBackend::removeDOMStorageItem(long callId, long storageId, const String& key)
-{
- if (m_inspectorController)
- m_inspectorController->removeDOMStorageItem(callId, storageId, key);
-}
-#endif
-
-InspectorDOMAgent* InspectorBackend::inspectorDOMAgent()
-{
- if (!m_inspectorController)
- return 0;
- return m_inspectorController->domAgent();
-}
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-InspectorApplicationCacheAgent* InspectorBackend::inspectorApplicationCacheAgent()
-{
- if (!m_inspectorController)
- return 0;
- return m_inspectorController->applicationCacheAgent();
-}
-#endif
-
InspectorFrontend* InspectorBackend::inspectorFrontend()
{
- if (!m_inspectorController)
- return 0;
return m_inspectorController->m_frontend.get();
}
RemoteInspectorFrontend* InspectorBackend::remoteFrontend()
{
- if (!m_inspectorController)
- return 0;
return m_inspectorController->m_remoteFrontend.get();
}
-void InspectorBackend::addScriptToEvaluateOnLoad(const String& source)
-{
- if (m_inspectorController)
- m_inspectorController->addScriptToEvaluateOnLoad(source);
-}
-
-void InspectorBackend::removeAllScriptsToEvaluateOnLoad()
-{
- if (m_inspectorController)
- m_inspectorController->removeAllScriptsToEvaluateOnLoad();
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index 3a2159c..7f4b500 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -37,14 +37,10 @@
namespace WebCore {
-class CachedResource;
-class Database;
class InspectorApplicationCacheAgent;
class InspectorDOMAgent;
class InspectorFrontend;
-class Node;
class RemoteInspectorFrontend;
-class Storage;
class InspectorBackend : public RefCounted<InspectorBackend>
{
@@ -57,132 +53,33 @@ public:
~InspectorBackend();
InspectorController* inspectorController() { return m_inspectorController; }
+ InspectorDOMAgent* inspectorDOMAgent() { return m_inspectorController->domAgent(); }
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+ InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() { return m_inspectorController->applicationCacheAgent(); }
+#endif
void disconnectController() { m_inspectorController = 0; }
- void saveApplicationSettings(const String&);
- void saveSessionSettings(const String&);
-
- void storeLastActivePanel(const String& panelName);
-
- void enableSearchingForNode();
- void disableSearchingForNode();
-
- void enableMonitoringXHR();
- void disableMonitoringXHR();
-
- void enableResourceTracking(bool always);
- void disableResourceTracking(bool always);
- void getResourceContent(long callId, unsigned long identifier);
- void reloadPage();
-
- void startTimelineProfiler();
- void stopTimelineProfiler();
-
#if ENABLE(JAVASCRIPT_DEBUGGER)
void enableDebugger(bool always);
- void disableDebugger(bool always);
-
- void setBreakpoint(long callId, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition);
- void removeBreakpoint(const String& sourceID, unsigned lineNumber);
- void activateBreakpoints();
- void deactivateBreakpoints();
-
- void pause();
- void resume();
-
- void stepOverStatement();
- void stepIntoStatement();
- void stepOutOfFunction();
-
- void setPauseOnExceptionsState(long pauseState);
-
- void editScriptSource(long callId, const String& sourceID, const String& newContent);
- void getScriptSource(long callId, const String& sourceID);
-
- void enableProfiler(bool always);
- void disableProfiler(bool always);
-
- void startProfiling();
- void stopProfiling();
-
- void getProfileHeaders(long callId);
- void getProfile(long callId, unsigned uid);
-
- void removeProfile(unsigned uid);
- void clearProfiles();
-
void takeHeapSnapshot();
void getProfilerLogLines(long callId, long position);
#endif
void setInjectedScriptSource(const String& source);
void dispatchOnInjectedScript(long callId, long injectedScriptId, const String& methodName, const String& arguments, bool async);
- void addScriptToEvaluateOnLoad(const String& source);
- void removeAllScriptsToEvaluateOnLoad();
-
- void getChildNodes(long callId, long nodeId);
- void setAttribute(long callId, long elementId, const String& name, const String& value);
- void removeAttribute(long callId, long elementId, const String& name);
- void setTextNodeValue(long callId, long nodeId, const String& value);
- void getEventListenersForNode(long callId, long nodeId);
- void copyNode(long nodeId);
- void removeNode(long callId, long nodeId);
- void changeTagName(long callId, long nodeId, const String& tagName);
- void getOuterHTML(long callId, long nodeId);
- void setOuterHTML(long callId, long nodeId, const String& outerHTML);
- void addInspectedNode(long nodeId);
- void performSearch(const String& query, bool runSynchronously);
- void searchCanceled();
- void pushNodeByPathToFrontend(long callId, const String& path);
-
void clearConsoleMessages(long callId);
- void getStyles(long callId, long nodeId, bool authOnly);
- void getAllStyles(long callId);
- void getInlineStyle(long callId, long nodeId);
- void getComputedStyle(long callId, long nodeId);
- void getStyleSheet(long callId, long styleSheetId);
- void getRuleRanges(long callId, long styleSheetId);
- void applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName);
- void setStyleText(long callId, long styleId, const String& cssText);
- void setStyleProperty(long callId, long styleId, const String& name, const String& value);
- void toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled);
- void setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId);
- void addRule(long callId, const String& selector, long selectedNodeId);
-
- void highlightDOMNode(long nodeId);
- void hideDOMNodeHighlight();
-
- void getCookies(long callId);
- void deleteCookie(const String& cookieName, const String& domain);
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
- void getApplicationCaches(long callId);
-#endif
-
// Generic code called from custom implementations.
void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
- void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
#if ENABLE(DATABASE)
void getDatabaseTableNames(long callId, long databaseId);
#endif
-#if ENABLE(DOM_STORAGE)
- void getDOMStorageEntries(long callId, long storageId);
- void setDOMStorageItem(long callId, long storageId, const String& key, const String& value);
- void removeDOMStorageItem(long callId, long storageId, const String& key);
-#endif
-
private:
InspectorBackend(InspectorController* inspectorController);
- InspectorDOMAgent* inspectorDOMAgent();
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
- InspectorApplicationCacheAgent* inspectorApplicationCacheAgent();
-#endif
InspectorFrontend* inspectorFrontend();
RemoteInspectorFrontend* remoteFrontend();
- Node* nodeForId(long nodeId);
InspectorController* m_inspectorController;
};
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 0153d9a..ecd37f3 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -289,6 +289,7 @@ private:
static const String& frontendSettingsSettingName();
friend class InspectorBackend;
+ friend class InspectorBackendDispatcher;
friend class InjectedScriptHost;
void populateScriptObjects();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list