[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:50:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit aa001e02f1cef60f10eeb981d88c7c1bd8e66333
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 9 16:11:11 2010 +0000
2010-08-09 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Remove callId argument from all backend agents' methods.
https://bugs.webkit.org/show_bug.cgi?id=43723
* inspector/CodeGeneratorInspector.pm:
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorBackend.cpp:
(WebCore::InspectorBackend::getProfilerLogLines):
(WebCore::InspectorBackend::clearConsoleMessages):
(WebCore::InspectorBackend::getDatabaseTableNames):
* inspector/InspectorBackend.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::getCookies):
(WebCore::InspectorController::getDOMStorageEntries):
(WebCore::InspectorController::setDOMStorageItem):
(WebCore::InspectorController::removeDOMStorageItem):
(WebCore::InspectorController::getProfileHeaders):
(WebCore::InspectorController::getProfile):
(WebCore::InspectorController::getResourceContent):
* inspector/InspectorController.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::getChildNodes):
(WebCore::InspectorDOMAgent::setAttribute):
(WebCore::InspectorDOMAgent::removeAttribute):
(WebCore::InspectorDOMAgent::removeNode):
(WebCore::InspectorDOMAgent::changeTagName):
(WebCore::InspectorDOMAgent::getOuterHTML):
(WebCore::InspectorDOMAgent::setOuterHTML):
(WebCore::InspectorDOMAgent::setTextNodeValue):
(WebCore::InspectorDOMAgent::getEventListenersForNode):
(WebCore::InspectorDOMAgent::getStyles):
(WebCore::InspectorDOMAgent::getAllStyles):
(WebCore::InspectorDOMAgent::getStyleSheet):
(WebCore::InspectorDOMAgent::getRuleRanges):
(WebCore::InspectorDOMAgent::getInlineStyle):
(WebCore::InspectorDOMAgent::getComputedStyle):
(WebCore::InspectorDOMAgent::applyStyleText):
(WebCore::InspectorDOMAgent::setStyleText):
(WebCore::InspectorDOMAgent::setStyleProperty):
(WebCore::InspectorDOMAgent::toggleStyleEnabled):
(WebCore::InspectorDOMAgent::setRuleSelector):
(WebCore::InspectorDOMAgent::addRule):
(WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::setBreakpoint):
(WebCore::InspectorDebuggerAgent::editScriptSource):
(WebCore::InspectorDebuggerAgent::getScriptSource):
* inspector/InspectorDebuggerAgent.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6002ba0..b4ed047 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,58 @@
+2010-08-09 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Remove callId argument from all backend agents' methods.
+ https://bugs.webkit.org/show_bug.cgi?id=43723
+
+ * inspector/CodeGeneratorInspector.pm:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorBackend.cpp:
+ (WebCore::InspectorBackend::getProfilerLogLines):
+ (WebCore::InspectorBackend::clearConsoleMessages):
+ (WebCore::InspectorBackend::getDatabaseTableNames):
+ * inspector/InspectorBackend.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::getCookies):
+ (WebCore::InspectorController::getDOMStorageEntries):
+ (WebCore::InspectorController::setDOMStorageItem):
+ (WebCore::InspectorController::removeDOMStorageItem):
+ (WebCore::InspectorController::getProfileHeaders):
+ (WebCore::InspectorController::getProfile):
+ (WebCore::InspectorController::getResourceContent):
+ * inspector/InspectorController.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::getChildNodes):
+ (WebCore::InspectorDOMAgent::setAttribute):
+ (WebCore::InspectorDOMAgent::removeAttribute):
+ (WebCore::InspectorDOMAgent::removeNode):
+ (WebCore::InspectorDOMAgent::changeTagName):
+ (WebCore::InspectorDOMAgent::getOuterHTML):
+ (WebCore::InspectorDOMAgent::setOuterHTML):
+ (WebCore::InspectorDOMAgent::setTextNodeValue):
+ (WebCore::InspectorDOMAgent::getEventListenersForNode):
+ (WebCore::InspectorDOMAgent::getStyles):
+ (WebCore::InspectorDOMAgent::getAllStyles):
+ (WebCore::InspectorDOMAgent::getStyleSheet):
+ (WebCore::InspectorDOMAgent::getRuleRanges):
+ (WebCore::InspectorDOMAgent::getInlineStyle):
+ (WebCore::InspectorDOMAgent::getComputedStyle):
+ (WebCore::InspectorDOMAgent::applyStyleText):
+ (WebCore::InspectorDOMAgent::setStyleText):
+ (WebCore::InspectorDOMAgent::setStyleProperty):
+ (WebCore::InspectorDOMAgent::toggleStyleEnabled):
+ (WebCore::InspectorDOMAgent::setRuleSelector):
+ (WebCore::InspectorDOMAgent::addRule):
+ (WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::setBreakpoint):
+ (WebCore::InspectorDebuggerAgent::editScriptSource):
+ (WebCore::InspectorDebuggerAgent::getScriptSource):
+ * inspector/InspectorDebuggerAgent.h:
+
2010-08-09 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index cd3046d..82334ad 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -347,12 +347,12 @@ sub generateBackendFunction
push(@function, " " . $typeTransform{$_->type}->{"variable"} . " " . $_->name . "$initializer;");
}
-
- my $args = join(", ", (map($_->name, @inArgs), map("&" . $_->name, @outArgs)));
+ my $async = $function->signature->extendedAttributes->{"async"};
+ my $args = join(", ", (grep($async || !($_ eq "callId"), map($_->name, @inArgs)), map("&" . $_->name, @outArgs)));
push(@function, " $handlerAccessor->$functionName($args);");
# The results of function call should be transfered back to frontend (except async methods - need to fix that).
- if (scalar(grep($_->name eq "callId", @inArgs)) && !$function->signature->extendedAttributes->{"async"}) {
+ if (scalar(grep($_->name eq "callId", @inArgs)) && !$async) {
my @pushArguments = map(" arguments->push" . $typeTransform{$_->type}->{"accessorSuffix"} . "(" . $_->name . ");", @outArgs);
my $customResponse = $function->signature->extendedAttributes->{"customResponse"};
my $didFunctionName = $customResponse ? $customResponse : "did" . ucfirst($function->signature->name);
diff --git a/WebCore/inspector/InspectorApplicationCacheAgent.cpp b/WebCore/inspector/InspectorApplicationCacheAgent.cpp
index bda442b..b95c0e1 100644
--- a/WebCore/inspector/InspectorApplicationCacheAgent.cpp
+++ b/WebCore/inspector/InspectorApplicationCacheAgent.cpp
@@ -61,7 +61,7 @@ void InspectorApplicationCacheAgent::updateNetworkState(bool isNowOnline)
m_frontend->updateNetworkState(isNowOnline);
}
-void InspectorApplicationCacheAgent::getApplicationCaches(long, RefPtr<InspectorValue>* applicationCaches)
+void InspectorApplicationCacheAgent::getApplicationCaches(RefPtr<InspectorValue>* applicationCaches)
{
DocumentLoader* documentLoader = m_inspectorController->inspectedPage()->mainFrame()->loader()->documentLoader();
if (documentLoader) {
diff --git a/WebCore/inspector/InspectorApplicationCacheAgent.h b/WebCore/inspector/InspectorApplicationCacheAgent.h
index dde9c70..3338f84 100644
--- a/WebCore/inspector/InspectorApplicationCacheAgent.h
+++ b/WebCore/inspector/InspectorApplicationCacheAgent.h
@@ -51,7 +51,7 @@ public:
void updateNetworkState(bool isNowOnline);
// From Frontend
- void getApplicationCaches(long callId, RefPtr<InspectorValue>* applicationCaches);
+ void getApplicationCaches(RefPtr<InspectorValue>* applicationCaches);
private:
PassRefPtr<InspectorObject> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index f0a1638..22025fb 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -72,7 +72,7 @@ void InspectorBackend::takeHeapSnapshot()
ScriptProfiler::takeHeapSnapshot();
}
-void InspectorBackend::getProfilerLogLines(long, long position, long* outPosition, String* data)
+void InspectorBackend::getProfilerLogLines(long position, long* outPosition, String* data)
{
// FIXME: we should make inspector dispatcher pluggable, so that embedders could contribute APIs instead of polluting the core one
// https://bugs.webkit.org/show_bug.cgi?id=43357
@@ -108,7 +108,7 @@ void InspectorBackend::dispatchOnInjectedScript(long callId, long injectedScript
remoteFrontend()->didDispatchOnInjectedScript(callId, (*result).get(), *hadException);
}
-void InspectorBackend::clearConsoleMessages(long)
+void InspectorBackend::clearConsoleMessages()
{
m_inspectorController->clearConsoleMessages();
}
@@ -119,7 +119,7 @@ void InspectorBackend::releaseWrapperObjectGroup(long injectedScriptId, const St
}
#if ENABLE(DATABASE)
-void InspectorBackend::getDatabaseTableNames(long, long databaseId, RefPtr<InspectorArray>* names)
+void InspectorBackend::getDatabaseTableNames(long databaseId, RefPtr<InspectorArray>* names)
{
Database* database = m_inspectorController->databaseForId(databaseId);
if (database) {
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index bff4db0..f7bae4f 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -62,18 +62,18 @@ public:
#if ENABLE(JAVASCRIPT_DEBUGGER)
void enableDebugger(bool always);
void takeHeapSnapshot();
- void getProfilerLogLines(long callId, long position, long* outPosition, String* data);
+ void getProfilerLogLines(long position, long* outPosition, String* data);
#endif
void setInjectedScriptSource(const String& source);
void dispatchOnInjectedScript(long callId, long injectedScriptId, const String& methodName, const String& arguments, bool async, RefPtr<InspectorValue>* result, bool* hadException);
- void clearConsoleMessages(long callId);
+ void clearConsoleMessages();
// Generic code called from custom implementations.
void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
#if ENABLE(DATABASE)
- void getDatabaseTableNames(long callId, long databaseId, RefPtr<InspectorArray>* names);
+ void getDatabaseTableNames(long databaseId, RefPtr<InspectorArray>* names);
#endif
private:
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 57d6fe1..5d8609a 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1274,7 +1274,7 @@ void InspectorController::didOpenDatabase(PassRefPtr<Database> database, const S
}
#endif
-void InspectorController::getCookies(long, RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString)
+void InspectorController::getCookies(RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString)
{
// If we can get raw cookies.
ListHashSet<Cookie> rawCookiesList;
@@ -1395,7 +1395,7 @@ void InspectorController::selectDOMStorage(Storage* storage)
m_remoteFrontend->selectDOMStorage(storageResourceId);
}
-void InspectorController::getDOMStorageEntries(long, long storageId, RefPtr<InspectorArray>* entries)
+void InspectorController::getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries)
{
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
@@ -1412,7 +1412,7 @@ void InspectorController::getDOMStorageEntries(long, long storageId, RefPtr<Insp
}
}
-void InspectorController::setDOMStorageItem(long, long storageId, const String& key, const String& value, bool* success)
+void InspectorController::setDOMStorageItem(long storageId, const String& key, const String& value, bool* success)
{
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
@@ -1422,7 +1422,7 @@ void InspectorController::setDOMStorageItem(long, long storageId, const String&
}
}
-void InspectorController::removeDOMStorageItem(long, long storageId, const String& key, bool* success)
+void InspectorController::removeDOMStorageItem(long storageId, const String& key, bool* success)
{
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
@@ -1490,14 +1490,14 @@ void InspectorController::clearProfiles()
m_nextUserInitiatedProfileNumber = 1;
}
-void InspectorController::getProfileHeaders(long, RefPtr<InspectorArray>* headers)
+void InspectorController::getProfileHeaders(RefPtr<InspectorArray>* headers)
{
ProfilesMap::iterator profilesEnd = m_profiles.end();
for (ProfilesMap::iterator it = m_profiles.begin(); it != profilesEnd; ++it)
(*headers)->push(createProfileHeader(*it->second));
}
-void InspectorController::getProfile(long, unsigned uid, RefPtr<InspectorObject>* profileObject)
+void InspectorController::getProfile(unsigned uid, RefPtr<InspectorObject>* profileObject)
{
ProfilesMap::iterator it = m_profiles.find(uid);
if (it != m_profiles.end()) {
@@ -1931,7 +1931,7 @@ void InspectorController::setInspectorExtensionAPI(const String& source)
m_inspectorExtensionAPI = source;
}
-void InspectorController::getResourceContent(long, unsigned long identifier, String* content)
+void InspectorController::getResourceContent(unsigned long identifier, String* content)
{
RefPtr<InspectorResource> resource = m_resources.get(identifier);
*content = resource ? resource->sourceString() : String();
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 15687d1..920466c 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -175,7 +175,7 @@ public:
void stopTimelineProfiler();
InspectorTimelineAgent* timelineAgent() { return m_timelineAgent.get(); }
- void getCookies(long callId, RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString);
+ void getCookies(RefPtr<InspectorArray>* cookies, WebCore::String* cookiesString);
void deleteCookie(const String& cookieName, const String& domain);
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -202,9 +202,9 @@ public:
#if ENABLE(DOM_STORAGE)
void didUseDOMStorage(StorageArea* storageArea, bool isLocalStorage, Frame* frame);
void selectDOMStorage(Storage* storage);
- void getDOMStorageEntries(long callId, long storageId, RefPtr<InspectorArray>* entries);
- void setDOMStorageItem(long callId, long storageId, const String& key, const String& value, bool* success);
- void removeDOMStorageItem(long callId, long storageId, const String& key, bool* success);
+ void getDOMStorageEntries(long storageId, RefPtr<InspectorArray>* entries);
+ void setDOMStorageItem(long storageId, const String& key, const String& value, bool* success);
+ void removeDOMStorageItem(long storageId, const String& key, bool* success);
#endif
const ResourcesMap& resources() const { return m_resources; }
@@ -250,7 +250,7 @@ public:
void resume();
#endif
- void evaluateForTestInFrontend(long callId, const String& script);
+ void evaluateForTestInFrontend(long testCallId, const String& script);
InjectedScript injectedScriptForNodeId(long id);
void addScriptToEvaluateOnLoad(const String& source);
@@ -287,8 +287,8 @@ private:
void startUserInitiatedProfilingSoon();
void toggleRecordButton(bool);
void enableDebuggerFromFrontend(bool always);
- void getProfileHeaders(long callId, RefPtr<InspectorArray>* headers);
- void getProfile(long callId, unsigned uid, RefPtr<InspectorObject>* profileObject);
+ void getProfileHeaders(RefPtr<InspectorArray>* headers);
+ void getProfile(unsigned uid, RefPtr<InspectorObject>* profileObject);
PassRefPtr<InspectorObject> createProfileHeader(const ScriptProfile& profile);
#endif
#if ENABLE(DATABASE)
@@ -309,7 +309,7 @@ private:
void addResource(InspectorResource*);
void removeResource(InspectorResource*);
InspectorResource* getTrackedResource(unsigned long identifier);
- void getResourceContent(long callId, unsigned long identifier, String* content);
+ void getResourceContent(unsigned long identifier, String* content);
void pruneResources(ResourcesMap*, DocumentLoader* loaderToKeep = 0);
void removeAllResources(ResourcesMap* map) { pruneResources(map); }
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 04a1cd1..e60cee3 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -384,7 +384,7 @@ Node* InspectorDOMAgent::nodeForId(long id)
return 0;
}
-void InspectorDOMAgent::getChildNodes(long, long nodeId)
+void InspectorDOMAgent::getChildNodes(long nodeId)
{
pushChildNodesToFrontend(nodeId);
}
@@ -431,7 +431,7 @@ long InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
return map->get(nodeToPush);
}
-void InspectorDOMAgent::setAttribute(long, long elementId, const String& name, const String& value, bool* success)
+void InspectorDOMAgent::setAttribute(long elementId, const String& name, const String& value, bool* success)
{
Node* node = nodeForId(elementId);
if (node && (node->nodeType() == Node::ELEMENT_NODE)) {
@@ -442,7 +442,7 @@ void InspectorDOMAgent::setAttribute(long, long elementId, const String& name, c
}
}
-void InspectorDOMAgent::removeAttribute(long, long elementId, const String& name, bool* success)
+void InspectorDOMAgent::removeAttribute(long elementId, const String& name, bool* success)
{
Node* node = nodeForId(elementId);
if (node && (node->nodeType() == Node::ELEMENT_NODE)) {
@@ -453,7 +453,7 @@ void InspectorDOMAgent::removeAttribute(long, long elementId, const String& name
}
}
-void InspectorDOMAgent::removeNode(long, long nodeId, long* outNodeId)
+void InspectorDOMAgent::removeNode(long nodeId, long* outNodeId)
{
Node* node = nodeForId(nodeId);
if (!node)
@@ -471,7 +471,7 @@ void InspectorDOMAgent::removeNode(long, long nodeId, long* outNodeId)
*outNodeId = nodeId;
}
-void InspectorDOMAgent::changeTagName(long, long nodeId, const String& tagName, long* newId)
+void InspectorDOMAgent::changeTagName(long nodeId, const String& tagName, long* newId)
{
Node* oldNode = nodeForId(nodeId);
if (!oldNode || !oldNode->isElementNode())
@@ -506,7 +506,7 @@ void InspectorDOMAgent::changeTagName(long, long nodeId, const String& tagName,
pushChildNodesToFrontend(*newId);
}
-void InspectorDOMAgent::getOuterHTML(long, long nodeId, WebCore::String* outerHTML)
+void InspectorDOMAgent::getOuterHTML(long nodeId, WebCore::String* outerHTML)
{
Node* node = nodeForId(nodeId);
if (!node || !node->isHTMLElement())
@@ -515,7 +515,7 @@ void InspectorDOMAgent::getOuterHTML(long, long nodeId, WebCore::String* outerHT
*outerHTML = static_cast<HTMLElement*>(node)->outerHTML();
}
-void InspectorDOMAgent::setOuterHTML(long, long nodeId, const String& outerHTML, long* newId)
+void InspectorDOMAgent::setOuterHTML(long nodeId, const String& outerHTML, long* newId)
{
Node* node = nodeForId(nodeId);
if (!node || !node->isHTMLElement())
@@ -538,7 +538,7 @@ void InspectorDOMAgent::setOuterHTML(long, long nodeId, const String& outerHTML,
pushChildNodesToFrontend(*newId);
}
-void InspectorDOMAgent::setTextNodeValue(long, long nodeId, const String& value, bool* success)
+void InspectorDOMAgent::setTextNodeValue(long nodeId, const String& value, bool* success)
{
Node* node = nodeForId(nodeId);
if (node && (node->nodeType() == Node::TEXT_NODE)) {
@@ -549,7 +549,7 @@ void InspectorDOMAgent::setTextNodeValue(long, long nodeId, const String& value,
}
}
-void InspectorDOMAgent::getEventListenersForNode(long, long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray)
+void InspectorDOMAgent::getEventListenersForNode(long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray)
{
Node* node = nodeForId(nodeId);
*outNodeId = nodeId;
@@ -971,7 +971,7 @@ void InspectorDOMAgent::didModifyDOMAttr(Element* element)
m_frontend->attributesUpdated(id, buildArrayForElementAttributes(element));
}
-void InspectorDOMAgent::getStyles(long, long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles)
+void InspectorDOMAgent::getStyles(long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles)
{
Node* node = nodeForId(nodeId);
if (!node || node->nodeType() != Node::ELEMENT_NODE)
@@ -1014,7 +1014,7 @@ void InspectorDOMAgent::getStyles(long, long nodeId, bool authorOnly, RefPtr<Ins
*styles = result.release();
}
-void InspectorDOMAgent::getAllStyles(long, RefPtr<InspectorArray>* styles)
+void InspectorDOMAgent::getAllStyles(RefPtr<InspectorArray>* styles)
{
for (ListHashSet<RefPtr<Document> >::iterator it = m_documents.begin(); it != m_documents.end(); ++it) {
StyleSheetList* list = (*it)->styleSheets();
@@ -1026,14 +1026,14 @@ void InspectorDOMAgent::getAllStyles(long, RefPtr<InspectorArray>* styles)
}
}
-void InspectorDOMAgent::getStyleSheet(long, long styleSheetId, RefPtr<InspectorObject>* styleSheetObject)
+void InspectorDOMAgent::getStyleSheet(long styleSheetId, RefPtr<InspectorObject>* styleSheetObject)
{
CSSStyleSheet* styleSheet = cssStore()->styleSheetForId(styleSheetId);
if (styleSheet && styleSheet->doc())
*styleSheetObject = buildObjectForStyleSheet(styleSheet->doc(), styleSheet);
}
-void InspectorDOMAgent::getRuleRanges(long, long styleSheetId, RefPtr<InspectorValue>* ruleRange)
+void InspectorDOMAgent::getRuleRanges(long styleSheetId, RefPtr<InspectorValue>* ruleRange)
{
CSSStyleSheet* styleSheet = cssStore()->styleSheetForId(styleSheetId);
if (styleSheet && styleSheet->doc()) {
@@ -1055,7 +1055,7 @@ void InspectorDOMAgent::getRuleRanges(long, long styleSheetId, RefPtr<InspectorV
}
}
-void InspectorDOMAgent::getInlineStyle(long, long nodeId, RefPtr<InspectorValue>* style)
+void InspectorDOMAgent::getInlineStyle(long nodeId, RefPtr<InspectorValue>* style)
{
Node* node = nodeForId(nodeId);
if (!node || node->nodeType() != Node::ELEMENT_NODE)
@@ -1063,7 +1063,7 @@ void InspectorDOMAgent::getInlineStyle(long, long nodeId, RefPtr<InspectorValue>
*style = buildObjectForStyle(static_cast<Element*>(node)->style(), true);
}
-void InspectorDOMAgent::getComputedStyle(long, long nodeId, RefPtr<InspectorValue>* style)
+void InspectorDOMAgent::getComputedStyle(long nodeId, RefPtr<InspectorValue>* style)
{
Node* node = nodeForId(nodeId);
if (!node || node->nodeType() != Node::ELEMENT_NODE)
@@ -1120,7 +1120,7 @@ PassRefPtr<InspectorArray> InspectorDOMAgent::buildArrayForPseudoElements(Elemen
return result.release();
}
-void InspectorDOMAgent::applyStyleText(long, long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedPropertiesArray)
+void InspectorDOMAgent::applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedPropertiesArray)
{
CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
if (!style)
@@ -1202,7 +1202,7 @@ void InspectorDOMAgent::applyStyleText(long, long styleId, const String& styleTe
*changedPropertiesArray = toArray(changedProperties);
}
-void InspectorDOMAgent::setStyleText(long, long styleId, const String& cssText, bool* success)
+void InspectorDOMAgent::setStyleText(long styleId, const String& cssText, bool* success)
{
CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
if (!style)
@@ -1212,7 +1212,7 @@ void InspectorDOMAgent::setStyleText(long, long styleId, const String& cssText,
*success = !ec;
}
-void InspectorDOMAgent::setStyleProperty(long, long styleId, const String& name, const String& value, bool* success)
+void InspectorDOMAgent::setStyleProperty(long styleId, const String& name, const String& value, bool* success)
{
CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
if (!style)
@@ -1223,7 +1223,7 @@ void InspectorDOMAgent::setStyleProperty(long, long styleId, const String& name,
*success = !ec;
}
-void InspectorDOMAgent::toggleStyleEnabled(long, long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject)
+void InspectorDOMAgent::toggleStyleEnabled(long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject)
{
CSSStyleDeclaration* style = cssStore()->styleForId(styleId);
if (!style)
@@ -1248,7 +1248,7 @@ void InspectorDOMAgent::toggleStyleEnabled(long, long styleId, const String& pro
*styleObject = buildObjectForStyle(style, true);
}
-void InspectorDOMAgent::setRuleSelector(long, long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
+void InspectorDOMAgent::setRuleSelector(long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
{
CSSStyleRule* rule = cssStore()->ruleForId(ruleId);
if (!rule)
@@ -1277,7 +1277,7 @@ void InspectorDOMAgent::setRuleSelector(long, long ruleId, const String& selecto
*ruleObject = buildObjectForRule(node->ownerDocument(), newRule);
}
-void InspectorDOMAgent::addRule(long, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
+void InspectorDOMAgent::addRule(const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode)
{
Node* node = nodeForId(selectedNodeId);
if (!node)
@@ -1567,7 +1567,7 @@ void InspectorDOMAgent::copyNode(long nodeId)
Pasteboard::generalPasteboard()->writePlainText(markup);
}
-void InspectorDOMAgent::pushNodeByPathToFrontend(long, const String& path, long* nodeId)
+void InspectorDOMAgent::pushNodeByPathToFrontend(const String& path, long* nodeId)
{
if (Node* node = nodeForPath(path))
*nodeId = pushNodePathToFrontend(node);
diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index 9fcf95d..492b7e3 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -100,32 +100,32 @@ namespace WebCore {
virtual bool operator==(const EventListener& other);
// Methods called from the frontend for DOM nodes inspection.
- void getChildNodes(long callId, long nodeId);
- void setAttribute(long callId, long elementId, const String& name, const String& value, bool* success);
- void removeAttribute(long callId, long elementId, const String& name, bool* success);
- void removeNode(long callId, long nodeId, long* outNodeId);
- void changeTagName(long callId, long nodeId, const String& tagName, long* newId);
- void getOuterHTML(long callId, long nodeId, WebCore::String* outerHTML);
- void setOuterHTML(long callId, long nodeId, const String& outerHTML, long* newId);
- void setTextNodeValue(long callId, long nodeId, const String& value, bool* success);
- void getEventListenersForNode(long callId, long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray);
+ void getChildNodes(long nodeId);
+ void setAttribute(long elementId, const String& name, const String& value, bool* success);
+ void removeAttribute(long elementId, const String& name, bool* success);
+ void removeNode(long nodeId, long* outNodeId);
+ void changeTagName(long nodeId, const String& tagName, long* newId);
+ void getOuterHTML(long nodeId, WebCore::String* outerHTML);
+ void setOuterHTML(long nodeId, const String& outerHTML, long* newId);
+ void setTextNodeValue(long nodeId, const String& value, bool* success);
+ void getEventListenersForNode(long nodeId, long* outNodeId, RefPtr<InspectorArray>* listenersArray);
void addInspectedNode(long nodeId);
void performSearch(const String& whitespaceTrimmedQuery, bool runSynchronously);
void searchCanceled();
// Methods called from the frontend for CSS styles inspection.
- void getStyles(long callId, long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles);
- void getAllStyles(long callId, RefPtr<InspectorArray>* styles);
- void getInlineStyle(long callId, long nodeId, RefPtr<InspectorValue>* styles);
- void getComputedStyle(long callId, long nodeId, RefPtr<InspectorValue>* styles);
- void getStyleSheet(long callId, long styleSheetId, RefPtr<InspectorObject>* styleSheetObject);
- void getRuleRanges(long callId, long styleSheetId, RefPtr<InspectorValue>* ruleRange);
- void applyStyleText(long callId, long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedProperties);
- void setStyleText(long callId, long styleId, const String& cssText, bool* success);
- void setStyleProperty(long callId, long styleId, const String& name, const String& value, bool* success);
- void toggleStyleEnabled(long callId, long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject);
- void setRuleSelector(long callId, long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
- void addRule(long callId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
+ void getStyles(long nodeId, bool authorOnly, RefPtr<InspectorValue>* styles);
+ void getAllStyles(RefPtr<InspectorArray>* styles);
+ void getInlineStyle(long nodeId, RefPtr<InspectorValue>* styles);
+ void getComputedStyle(long nodeId, RefPtr<InspectorValue>* styles);
+ void getStyleSheet(long styleSheetId, RefPtr<InspectorObject>* styleSheetObject);
+ void getRuleRanges(long styleSheetId, RefPtr<InspectorValue>* ruleRange);
+ void applyStyleText(long styleId, const String& styleText, const String& propertyName, bool* success, RefPtr<InspectorValue>* styleObject, RefPtr<InspectorArray>* changedProperties);
+ void setStyleText(long styleId, const String& cssText, bool* success);
+ void setStyleProperty(long styleId, const String& name, const String& value, bool* success);
+ void toggleStyleEnabled(long styleId, const String& propertyName, bool disabled, RefPtr<InspectorValue>* styleObject);
+ void setRuleSelector(long ruleId, const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
+ void addRule(const String& selector, long selectedNodeId, RefPtr<InspectorValue>* ruleObject, bool* selectorAffectsNode);
// Methods called from the InspectorController.
void setDocument(Document* document);
@@ -138,7 +138,7 @@ namespace WebCore {
Node* nodeForId(long nodeId);
long pushNodePathToFrontend(Node* node);
void pushChildNodesToFrontend(long nodeId);
- void pushNodeByPathToFrontend(long callId, const String& path, long* nodeId);
+ void pushNodeByPathToFrontend(const String& path, long* nodeId);
long inspectedNode(unsigned long num);
void copyNode(long nodeId);
diff --git a/WebCore/inspector/InspectorDebuggerAgent.cpp b/WebCore/inspector/InspectorDebuggerAgent.cpp
index 3a582c8..a617e79 100644
--- a/WebCore/inspector/InspectorDebuggerAgent.cpp
+++ b/WebCore/inspector/InspectorDebuggerAgent.cpp
@@ -82,7 +82,7 @@ void InspectorDebuggerAgent::deactivateBreakpoints()
ScriptDebugServer::shared().deactivateBreakpoints();
}
-void InspectorDebuggerAgent::setBreakpoint(long, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber)
+void InspectorDebuggerAgent::setBreakpoint(const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber)
{
ScriptBreakpoint breakpoint(enabled, condition);
*success = ScriptDebugServer::shared().setBreakpoint(sourceID, breakpoint, lineNumber, actualLineNumber);
@@ -127,13 +127,13 @@ void InspectorDebuggerAgent::removeBreakpoint(const String& sourceID, unsigned l
saveBreakpoints();
}
-void InspectorDebuggerAgent::editScriptSource(long, const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames)
+void InspectorDebuggerAgent::editScriptSource(const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames)
{
if ((*success = ScriptDebugServer::shared().editScriptSource(sourceID, newContent, *result)))
*newCallFrames = currentCallFrames();
}
-void InspectorDebuggerAgent::getScriptSource(long, const String& sourceID, String* scriptSource)
+void InspectorDebuggerAgent::getScriptSource(const String& sourceID, String* scriptSource)
{
*scriptSource = m_scriptIDToContent.get(sourceID);
}
diff --git a/WebCore/inspector/InspectorDebuggerAgent.h b/WebCore/inspector/InspectorDebuggerAgent.h
index 165bf4f..fe533c7 100644
--- a/WebCore/inspector/InspectorDebuggerAgent.h
+++ b/WebCore/inspector/InspectorDebuggerAgent.h
@@ -54,11 +54,11 @@ public:
void activateBreakpoints();
void deactivateBreakpoints();
- void setBreakpoint(long callId, const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber);
+ void setBreakpoint(const String& sourceID, unsigned lineNumber, bool enabled, const String& condition, bool* success, unsigned int* actualLineNumber);
void removeBreakpoint(const String& sourceID, unsigned lineNumber);
- void editScriptSource(long callId, const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames);
- void getScriptSource(long callId, const String& sourceID, String* scriptSource);
+ void editScriptSource(const String& sourceID, const String& newContent, bool* success, String* result, RefPtr<InspectorValue>* newCallFrames);
+ void getScriptSource(const String& sourceID, String* scriptSource);
void pause();
void resume();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list