2011-03-21 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: migrate Inspector.json to valid JSON types.
https://bugs.webkit.org/show_bug.cgi?id=56651
This change migrates inspector from long to int as
dom, storage, database and other id types.
* inspector/InjectedScriptHost.cpp:
(WebCore::InjectedScriptHost::inspectedNode):
(WebCore::InjectedScriptHost::databaseIdImpl):
(WebCore::InjectedScriptHost::storageIdImpl):
(WebCore::InjectedScriptHost::didCreateWorker):
(WebCore::InjectedScriptHost::didDestroyWorker):
* inspector/InjectedScriptHost.h:
* inspector/InjectedScriptHost.idl:
* inspector/Inspector.json:
* inspector/InspectorAgent.cpp:
(WebCore::InspectorAgent::highlightDOMNode):
* inspector/InspectorAgent.h:
* inspector/InspectorBrowserDebuggerAgent.cpp:
(WebCore::InspectorBrowserDebuggerAgent::setDOMBreakpoint):
(WebCore::InspectorBrowserDebuggerAgent::removeDOMBreakpoint):
(WebCore::InspectorBrowserDebuggerAgent::descriptionForDOMEvent):
(WebCore::InspectorBrowserDebuggerAgent::hasBreakpoint):
* inspector/InspectorBrowserDebuggerAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getStylesForNode):
(WebCore::InspectorCSSAgent::getInlineStyleForNode):
(WebCore::InspectorCSSAgent::getComputedStyleForNode):
(WebCore::InspectorCSSAgent::setPropertyText):
(WebCore::InspectorCSSAgent::toggleProperty):
(WebCore::InspectorCSSAgent::addRule):
(WebCore::InspectorCSSAgent::elementForId):
* inspector/InspectorCSSAgent.h:
* inspector/InspectorConsoleAgent.cpp:
(WebCore::InspectorConsoleAgent::count):
(WebCore::InspectorConsoleAgent::addInspectedNode):
(WebCore::InspectorConsoleAgent::setConsoleMessagesEnabled):
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::bind):
(WebCore::InspectorDOMAgent::unbind):
(WebCore::InspectorDOMAgent::assertNode):
(WebCore::InspectorDOMAgent::assertElement):
(WebCore::InspectorDOMAgent::assertHTMLElement):
(WebCore::InspectorDOMAgent::nodeToSelectOn):
(WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
(WebCore::InspectorDOMAgent::nodeForId):
(WebCore::InspectorDOMAgent::getChildNodes):
(WebCore::InspectorDOMAgent::querySelector):
(WebCore::InspectorDOMAgent::querySelectorAll):
(WebCore::InspectorDOMAgent::pushNodePathToFrontend):
(WebCore::InspectorDOMAgent::boundNodeId):
(WebCore::InspectorDOMAgent::setAttribute):
(WebCore::InspectorDOMAgent::removeAttribute):
(WebCore::InspectorDOMAgent::removeNode):
(WebCore::InspectorDOMAgent::setNodeName):
(WebCore::InspectorDOMAgent::getOuterHTML):
(WebCore::InspectorDOMAgent::setOuterHTML):
(WebCore::InspectorDOMAgent::setNodeValue):
(WebCore::InspectorDOMAgent::getEventListenersForNode):
(WebCore::InspectorDOMAgent::resolveNode):
(WebCore::InspectorDOMAgent::pushNodeToFrontend):
(WebCore::InspectorDOMAgent::buildObjectForNode):
(WebCore::InspectorDOMAgent::loadEventFired):
(WebCore::InspectorDOMAgent::didInsertDOMNode):
(WebCore::InspectorDOMAgent::didRemoveDOMNode):
(WebCore::InspectorDOMAgent::didModifyDOMAttr):
(WebCore::InspectorDOMAgent::characterDataModified):
(WebCore::InspectorDOMAgent::didInvalidateStyleAttr):
(WebCore::InspectorDOMAgent::reportNodesAsSearchResults):
(WebCore::InspectorDOMAgent::copyNode):
(WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
(WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::storageId):
(WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDOMStorageResource.cpp:
* inspector/InspectorDOMStorageResource.h:
(WebCore::InspectorDOMStorageResource::id):
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
(WebCore::InspectorDatabaseAgent::executeSQL):
(WebCore::InspectorDatabaseAgent::databaseId):
(WebCore::InspectorDatabaseAgent::databaseForId):
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDatabaseResource.cpp:
* inspector/InspectorDatabaseResource.h:
(WebCore::InspectorDatabaseResource::id):
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::setPauseOnExceptionsState):
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::InspectorProfilerAgent::getExactHeapSnapshotNodeRetainedSize):
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::identifierForInitialRequest):
(WebCore::InspectorResourceAgent::willSendRequest):
(WebCore::InspectorResourceAgent::markResourceAsCached):
(WebCore::InspectorResourceAgent::didReceiveResponse):
(WebCore::InspectorResourceAgent::didReceiveContentLength):
(WebCore::InspectorResourceAgent::didFinishLoading):
(WebCore::InspectorResourceAgent::didFailLoading):
(WebCore::InspectorResourceAgent::setInitialContent):
(WebCore::InspectorResourceAgent::didCreateWebSocket):
(WebCore::InspectorResourceAgent::willSendWebSocketHandshakeRequest):
(WebCore::InspectorResourceAgent::didReceiveWebSocketHandshakeResponse):
(WebCore::InspectorResourceAgent::didCloseWebSocket):
* inspector/generate-inspector-idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@81572 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a9e79c5..cbce702 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,123 @@
Reviewed by Yury Semikhatsky.
+ Web Inspector: migrate Inspector.json to valid JSON types.
+ https://bugs.webkit.org/show_bug.cgi?id=56651
+
+ This change migrates inspector from long to int as
+ dom, storage, database and other id types.
+
+ * inspector/InjectedScriptHost.cpp:
+ (WebCore::InjectedScriptHost::inspectedNode):
+ (WebCore::InjectedScriptHost::databaseIdImpl):
+ (WebCore::InjectedScriptHost::storageIdImpl):
+ (WebCore::InjectedScriptHost::didCreateWorker):
+ (WebCore::InjectedScriptHost::didDestroyWorker):
+ * inspector/InjectedScriptHost.h:
+ * inspector/InjectedScriptHost.idl:
+ * inspector/Inspector.json:
+ * inspector/InspectorAgent.cpp:
+ (WebCore::InspectorAgent::highlightDOMNode):
+ * inspector/InspectorAgent.h:
+ * inspector/InspectorBrowserDebuggerAgent.cpp:
+ (WebCore::InspectorBrowserDebuggerAgent::setDOMBreakpoint):
+ (WebCore::InspectorBrowserDebuggerAgent::removeDOMBreakpoint):
+ (WebCore::InspectorBrowserDebuggerAgent::descriptionForDOMEvent):
+ (WebCore::InspectorBrowserDebuggerAgent::hasBreakpoint):
+ * inspector/InspectorBrowserDebuggerAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::getStylesForNode):
+ (WebCore::InspectorCSSAgent::getInlineStyleForNode):
+ (WebCore::InspectorCSSAgent::getComputedStyleForNode):
+ (WebCore::InspectorCSSAgent::setPropertyText):
+ (WebCore::InspectorCSSAgent::toggleProperty):
+ (WebCore::InspectorCSSAgent::addRule):
+ (WebCore::InspectorCSSAgent::elementForId):
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorConsoleAgent.cpp:
+ (WebCore::InspectorConsoleAgent::count):
+ (WebCore::InspectorConsoleAgent::addInspectedNode):
+ (WebCore::InspectorConsoleAgent::setConsoleMessagesEnabled):
+ * inspector/InspectorConsoleAgent.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::bind):
+ (WebCore::InspectorDOMAgent::unbind):
+ (WebCore::InspectorDOMAgent::assertNode):
+ (WebCore::InspectorDOMAgent::assertElement):
+ (WebCore::InspectorDOMAgent::assertHTMLElement):
+ (WebCore::InspectorDOMAgent::nodeToSelectOn):
+ (WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
+ (WebCore::InspectorDOMAgent::nodeForId):
+ (WebCore::InspectorDOMAgent::getChildNodes):
+ (WebCore::InspectorDOMAgent::querySelector):
+ (WebCore::InspectorDOMAgent::querySelectorAll):
+ (WebCore::InspectorDOMAgent::pushNodePathToFrontend):
+ (WebCore::InspectorDOMAgent::boundNodeId):
+ (WebCore::InspectorDOMAgent::setAttribute):
+ (WebCore::InspectorDOMAgent::removeAttribute):
+ (WebCore::InspectorDOMAgent::removeNode):
+ (WebCore::InspectorDOMAgent::setNodeName):
+ (WebCore::InspectorDOMAgent::getOuterHTML):
+ (WebCore::InspectorDOMAgent::setOuterHTML):
+ (WebCore::InspectorDOMAgent::setNodeValue):
+ (WebCore::InspectorDOMAgent::getEventListenersForNode):
+ (WebCore::InspectorDOMAgent::resolveNode):
+ (WebCore::InspectorDOMAgent::pushNodeToFrontend):
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ (WebCore::InspectorDOMAgent::loadEventFired):
+ (WebCore::InspectorDOMAgent::didInsertDOMNode):
+ (WebCore::InspectorDOMAgent::didRemoveDOMNode):
+ (WebCore::InspectorDOMAgent::didModifyDOMAttr):
+ (WebCore::InspectorDOMAgent::characterDataModified):
+ (WebCore::InspectorDOMAgent::didInvalidateStyleAttr):
+ (WebCore::InspectorDOMAgent::reportNodesAsSearchResults):
+ (WebCore::InspectorDOMAgent::copyNode):
+ (WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
+ (WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
+ (WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
+ (WebCore::InspectorDOMStorageAgent::storageId):
+ (WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDOMStorageResource.cpp:
+ * inspector/InspectorDOMStorageResource.h:
+ (WebCore::InspectorDOMStorageResource::id):
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+ (WebCore::InspectorDatabaseAgent::executeSQL):
+ (WebCore::InspectorDatabaseAgent::databaseId):
+ (WebCore::InspectorDatabaseAgent::databaseForId):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorDatabaseResource.cpp:
+ * inspector/InspectorDatabaseResource.h:
+ (WebCore::InspectorDatabaseResource::id):
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::setPauseOnExceptionsState):
+ * inspector/InspectorDebuggerAgent.h:
+ * inspector/InspectorProfilerAgent.cpp:
+ (WebCore::InspectorProfilerAgent::getExactHeapSnapshotNodeRetainedSize):
+ * inspector/InspectorProfilerAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::identifierForInitialRequest):
+ (WebCore::InspectorResourceAgent::willSendRequest):
+ (WebCore::InspectorResourceAgent::markResourceAsCached):
+ (WebCore::InspectorResourceAgent::didReceiveResponse):
+ (WebCore::InspectorResourceAgent::didReceiveContentLength):
+ (WebCore::InspectorResourceAgent::didFinishLoading):
+ (WebCore::InspectorResourceAgent::didFailLoading):
+ (WebCore::InspectorResourceAgent::setInitialContent):
+ (WebCore::InspectorResourceAgent::didCreateWebSocket):
+ (WebCore::InspectorResourceAgent::willSendWebSocketHandshakeRequest):
+ (WebCore::InspectorResourceAgent::didReceiveWebSocketHandshakeResponse):
+ (WebCore::InspectorResourceAgent::didCloseWebSocket):
+ * inspector/generate-inspector-idl:
+
+2011-03-21 Pavel Feldman <pfeldman@chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
Web Inspector: make frameId in network agent of type string, not unsigned long.
https://bugs.webkit.org/show_bug.cgi?id=56708
diff --git a/Source/WebCore/inspector/InjectedScriptHost.cpp b/Source/WebCore/inspector/InjectedScriptHost.cpp
index ae7cb7c..a0bafdf9 100644
--- a/Source/WebCore/inspector/InjectedScriptHost.cpp
+++ b/Source/WebCore/inspector/InjectedScriptHost.cpp
@@ -135,7 +135,7 @@
Pasteboard::generalPasteboard()->writePlainText(text);
}
-Node* InjectedScriptHost::inspectedNode(unsigned long num)
+Node* InjectedScriptHost::inspectedNode(unsigned int num)
{
if (num < m_inspectedNodes.size())
return m_inspectedNodes[num].get();
@@ -143,7 +143,7 @@
}
#if ENABLE(DATABASE)
-long InjectedScriptHost::databaseIdImpl(Database* database)
+int InjectedScriptHost::databaseIdImpl(Database* database)
{
if (m_databaseAgent)
return m_databaseAgent->databaseId(database);
@@ -152,7 +152,7 @@
#endif
#if ENABLE(DOM_STORAGE)
-long InjectedScriptHost::storageIdImpl(Storage* storage)
+int InjectedScriptHost::storageIdImpl(Storage* storage)
{
if (m_domStorageAgent)
return m_domStorageAgent->storageId(storage);
@@ -169,13 +169,13 @@
void InjectedScriptHost::didCreateWorker(long id, const String& url, bool isSharedWorker)
{
if (m_inspectorAgent)
- m_inspectorAgent->didCreateWorker(id, url, isSharedWorker);
+ m_inspectorAgent->didCreateWorker(static_cast<int>(id), url, isSharedWorker);
}
void InjectedScriptHost::didDestroyWorker(long id)
{
if (m_inspectorAgent)
- m_inspectorAgent->didDestroyWorker(id);
+ m_inspectorAgent->didDestroyWorker(static_cast<int>(id));
}
#endif // ENABLE(WORKERS)
diff --git a/Source/WebCore/inspector/InjectedScriptHost.h b/Source/WebCore/inspector/InjectedScriptHost.h
index 04b44cd..b592d9b 100644
--- a/Source/WebCore/inspector/InjectedScriptHost.h
+++ b/Source/WebCore/inspector/InjectedScriptHost.h
@@ -93,12 +93,12 @@
void inspectImpl(PassRefPtr<InspectorValue> objectToInspect, PassRefPtr<InspectorValue> hints);
void clearConsoleMessages();
void copyText(const String& text);
- Node* inspectedNode(unsigned long num);
+ Node* inspectedNode(unsigned int num);
#if ENABLE(DATABASE)
- long databaseIdImpl(Database*);
+ int databaseIdImpl(Database*);
#endif
#if ENABLE(DOM_STORAGE)
- long storageIdImpl(Storage*);
+ int storageIdImpl(Storage*);
#endif
#if ENABLE(WORKERS)
long nextWorkerId();
diff --git a/Source/WebCore/inspector/InjectedScriptHost.idl b/Source/WebCore/inspector/InjectedScriptHost.idl
index 0d5c500..fc60813 100644
--- a/Source/WebCore/inspector/InjectedScriptHost.idl
+++ b/Source/WebCore/inspector/InjectedScriptHost.idl
@@ -36,12 +36,12 @@
void copyText(in DOMString text);
[Custom] void inspect(in DOMObject objectId, in DOMObject hints);
- [Custom] DOMObject inspectedNode(in unsigned long num);
+ [Custom] DOMObject inspectedNode(in int num);
[Custom] DOMObject internalConstructorName(in DOMObject object);
[Custom] DOMObject currentCallFrame();
- [Custom] long databaseId(in DOMObject database);
- [Custom] long storageId(in DOMObject storage);
+ [Custom] int databaseId(in DOMObject database);
+ [Custom] int storageId(in DOMObject storage);
#if defined(ENABLE_WORKERS) && ENABLE_WORKERS
void didCreateWorker(in long id, in DOMString url, in boolean isFakeWorker);
diff --git a/Source/WebCore/inspector/Inspector.json b/Source/WebCore/inspector/Inspector.json
index b39a038..47650fd9b 100644
--- a/Source/WebCore/inspector/Inspector.json
+++ b/Source/WebCore/inspector/Inspector.json
@@ -36,14 +36,14 @@
{
"name": "didEvaluateForTestInFrontend",
"parameters": [
- { "name": "testCallId", "type": "long" },
+ { "name": "testCallId", "type": "integer" },
{ "name": "jsonResult", "type": "string" }
]
},
{
"name": "highlightDOMNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
]
},
{
@@ -98,13 +98,13 @@
{
"name": "domContentEventFired",
"parameters": [
- { "name": "time", "type": "float" }
+ { "name": "time", "type": "number" }
]
},
{
"name": "loadEventFired",
"parameters": [
- { "name": "time", "type": "float" }
+ { "name": "time", "type": "number" }
]
},
{
@@ -119,7 +119,7 @@
{
"name": "evaluateForTestInFrontend",
"parameters": [
- { "name": "testCallId", "type": "long" },
+ { "name": "testCallId", "type": "integer" },
{ "name": "script", "type": "string" }
]
},
@@ -218,7 +218,7 @@
{
"name": "addInspectedNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
]
}
],
@@ -232,13 +232,13 @@
{
"name": "consoleMessageExpiredCountUpdate",
"parameters": [
- { "name": "count", "type": "unsigned" }
+ { "name": "count", "type": "integer" }
]
},
{
"name": "consoleMessageRepeatCountUpdate",
"parameters": [
- { "name": "count", "type": "unsigned" }
+ { "name": "count", "type": "integer" }
]
},
{
@@ -288,7 +288,7 @@
{
"name": "identifierForInitialRequest",
"parameters": [
- { "name": "identifier", "type": "long" },
+ { "name": "identifier", "type": "integer" },
{ "name": "url", "type": "string" },
{ "name": "loader", "$ref": "NetworkLoader" },
{ "name": "callStack", "$ref": ["DebuggerStackFrame"] }
@@ -297,8 +297,8 @@
{
"name": "willSendRequest",
"parameters": [
- { "name": "identifier", "type": "long" },
- { "name": "time", "type": "float" },
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" },
{ "name": "request", "$ref": "NetworkRequest" },
{ "name": "redirectResponse", "$ref": "NetworkResponse" }
]
@@ -306,14 +306,14 @@
{
"name": "markResourceAsCached",
"parameters": [
- { "name": "identifier", "type": "long" }
+ { "name": "identifier", "type": "integer" }
]
},
{
"name": "didReceiveResponse",
"parameters": [
- { "name": "identifier", "type": "long" },
- { "name": "time", "type": "float" },
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" },
{ "name": "resourceType", "type": "string" },
{ "name": "response", "$ref": "NetworkResponse" }
]
@@ -321,37 +321,37 @@
{
"name": "didReceiveContentLength",
"parameters": [
- { "name": "identifier", "type": "long" },
- { "name": "time", "type": "float" },
- { "name": "lengthReceived", "type": "long" }
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" },
+ { "name": "lengthReceived", "type": "integer" }
]
},
{
"name": "didFinishLoading",
"parameters": [
- { "name": "identifier", "type": "long" },
- { "name": "finishTime", "type": "float" }
+ { "name": "identifier", "type": "integer" },
+ { "name": "finishTime", "type": "number" }
]
},
{
"name": "didFailLoading",
"parameters": [
- { "name": "identifier", "type": "long" },
- { "name": "time", "type": "float" },
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" },
{ "name": "localizedDescription", "type": "string" }
]
},
{
"name": "didLoadResourceFromMemoryCache",
"parameters": [
- { "name": "time", "type": "float" },
+ { "name": "time", "type": "number" },
{ "name": "resource", "$ref": "NetworkCachedResource" }
]
},
{
"name": "setInitialContent",
"parameters": [
- { "name": "identifier", "type": "long" },
+ { "name": "identifier", "type": "integer" },
{ "name": "sourceString", "type": "string" },
{ "name": "type", "type": "string" }
]
@@ -366,31 +366,31 @@
{
"name": "didCreateWebSocket",
"parameters": [
- { "name": "identifier", "type": "unsigned" },
+ { "name": "identifier", "type": "integer" },
{ "name": "requestURL", "type": "string" }
]
},
{
"name": "willSendWebSocketHandshakeRequest",
"parameters": [
- { "name": "identifier", "type": "unsigned" },
- { "name": "time", "type": "float" },
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" },
{ "name": "request", "$ref": "NetworkWebSocketRequest" }
]
},
{
"name": "didReceiveWebSocketHandshakeResponse",
"parameters": [
- { "name": "identifier", "type": "unsigned" },
- { "name": "time", "type": "float" },
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" },
{ "name": "response", "$ref": "NetworkWebSocketResponse" }
]
},
{
"name": "didCloseWebSocket",
"parameters": [
- { "name": "identifier", "type": "unsigned" },
- { "name": "time", "type": "float" }
+ { "name": "identifier", "type": "integer" },
+ { "name": "time", "type": "number" }
]
}
]
@@ -402,7 +402,7 @@
{
"name": "getDatabaseTableNames",
"parameters": [
- { "name": "databaseId", "type": "long" }
+ { "name": "databaseId", "type": "integer" }
],
"returns": [
{ "name": "tableNames", "type": ["string"] }
@@ -411,12 +411,12 @@
{
"name": "executeSQL",
"parameters": [
- { "name": "databaseId", "type": "long" },
+ { "name": "databaseId", "type": "integer" },
{ "name": "query", "type": "string" }
],
"returns": [
{ "name": "success", "type": "boolean" },
- { "name": "transactionId", "type": "long" }
+ { "name": "transactionId", "type": "integer" }
]
}
],
@@ -430,7 +430,7 @@
{
"name": "sqlTransactionSucceeded",
"parameters": [
- { "name": "transactionId", "type": "long" },
+ { "name": "transactionId", "type": "integer" },
{ "name": "columnNames", "type": ["string"] },
{ "name": "values", "type": ["string or number"] }
]
@@ -438,7 +438,7 @@
{
"name": "sqlTransactionFailed",
"parameters": [
- { "name": "transactionId", "type": "long" },
+ { "name": "transactionId", "type": "integer" },
{ "name": "sqlError", "$ref": "DatabaseError" }
]
}
@@ -451,7 +451,7 @@
{
"name": "getDOMStorageEntries",
"parameters": [
- { "name": "storageId", "type": "long" }
+ { "name": "storageId", "type": "integer" }
],
"returns": [
{ "name": "entries", "$ref": ["DOMStorageEntry"] }
@@ -460,7 +460,7 @@
{
"name": "setDOMStorageItem",
"parameters": [
- { "name": "storageId", "type": "long" },
+ { "name": "storageId", "type": "integer" },
{ "name": "key", "type": "string" },
{ "name": "value", "type": "string" }
],
@@ -471,7 +471,7 @@
{
"name": "removeDOMStorageItem",
"parameters": [
- { "name": "storageId", "type": "long" },
+ { "name": "storageId", "type": "integer" },
{ "name": "key", "type": "string" }
],
"returns": [
@@ -533,45 +533,45 @@
{
"name": "getChildNodes",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
]
},
{
"name": "querySelector",
"parameters": [
- { "name": "nodeId", "type": "long" },
+ { "name": "nodeId", "type": "integer" },
{ "name": "selectors", "type": "string" },
{ "name": "documentWide", "type": "boolean" }
],
"returns": [
- { "name": "elementId", "type": "long" }
+ { "name": "elementId", "type": "integer" }
]
},
{
"name": "querySelectorAll",
"parameters": [
- { "name": "nodeId", "type": "long" },
+ { "name": "nodeId", "type": "integer" },
{ "name": "selectors", "type": "string" },
{ "name": "documentWide", "type": "boolean" }
],
"returns": [
- { "name": "nodeIds", "type": ["long"] }
+ { "name": "nodeIds", "type": ["integer"] }
]
},
{
"name": "setNodeName",
"parameters": [
- { "name": "nodeId", "type": "long" },
+ { "name": "nodeId", "type": "integer" },
{ "name": "name", "type": "string" }
],
"returns": [
- { "name": "outNodeId", "type": "long" }
+ { "name": "outNodeId", "type": "integer" }
]
},
{
"name": "setNodeValue",
"parameters": [
- { "name": "nodeId", "type": "long" },
+ { "name": "nodeId", "type": "integer" },
{ "name": "value", "type": "string" }
],
"returns": [
@@ -581,16 +581,16 @@
{
"name": "removeNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
- { "name": "outNodeId", "type": "long" }
+ { "name": "outNodeId", "type": "integer" }
]
},
{
"name": "setAttribute",
"parameters": [
- { "name": "elementId", "type": "long" },
+ { "name": "elementId", "type": "integer" },
{ "name": "name", "type": "string" },
{ "name": "value", "type": "string" }
]
@@ -598,14 +598,14 @@
{
"name": "removeAttribute",
"parameters": [
- { "name": "elementId", "type": "long" },
+ { "name": "elementId", "type": "integer" },
{ "name": "name", "type": "string" }
]
},
{
"name": "getEventListenersForNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
{ "name": "listenersArray", "$ref": ["DOMListener"] }
@@ -614,13 +614,13 @@
{
"name": "copyNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
]
},
{
"name": "getOuterHTML",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
{ "name": "outerHTML", "type": "string" }
@@ -629,11 +629,11 @@
{
"name": "setOuterHTML",
"parameters": [
- { "name": "nodeId", "type": "long" },
+ { "name": "nodeId", "type": "integer" },
{ "name": "outerHTML", "type": "string" }
],
"returns": [
- { "name": "outNodeId", "type": "long" }
+ { "name": "outNodeId", "type": "integer" }
]
},
{
@@ -652,7 +652,7 @@
{ "name": "objectId", "type": "string" }
],
"returns": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
]
},
{
@@ -661,13 +661,13 @@
{ "name": "path", "type": "string" }
],
"returns": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
]
},
{
"name": "resolveNode",
"parameters": [
- { "name": "nodeId", "type": "long" },
+ { "name": "nodeId", "type": "integer" },
{ "name": "objectGroup", "type": "string" }
],
"returns": [
@@ -682,21 +682,21 @@
{
"name": "setChildNodes",
"parameters": [
- { "name": "parentId", "type": "long" },
+ { "name": "parentId", "type": "integer" },
{ "name": "nodes", "$ref": ["DOMNode"] }
]
},
{
"name": "attributesUpdated",
"parameters": [
- { "name": "id", "type": "long" },
+ { "name": "id", "type": "integer" },
{ "name": "attributes", "$ref": ["DOMAttribute"] }
]
},
{
"name": "characterDataModified",
"parameters": [
- { "name": "id", "type": "long" },
+ { "name": "id", "type": "integer" },
{ "name": "newValue", "type": "string" }
]
},
@@ -709,29 +709,29 @@
{
"name": "childNodeCountUpdated",
"parameters": [
- { "name": "id", "type": "long" },
+ { "name": "id", "type": "integer" },
{ "name": "newValue", "type": "integer" }
]
},
{
"name": "childNodeInserted",
"parameters": [
- { "name": "parentId", "type": "long" },
- { "name": "prevId", "type": "long" },
+ { "name": "parentId", "type": "integer" },
+ { "name": "prevId", "type": "integer" },
{ "name": "node", "$ref": "DOMNode" }
]
},
{
"name": "childNodeRemoved",
"parameters": [
- { "name": "parentId", "type": "long" },
- { "name": "id", "type": "long" }
+ { "name": "parentId", "type": "integer" },
+ { "name": "id", "type": "integer" }
]
},
{
"name": "searchResults",
"parameters": [
- { "name": "nodeIds", "type": ["long"] }
+ { "name": "nodeIds", "type": ["integer"] }
]
}
]
@@ -743,7 +743,7 @@
{
"name": "getStylesForNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
{ "name": "styles", "$ref": "CSSNodeStyles" }
@@ -752,7 +752,7 @@
{
"name": "getComputedStyleForNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
{ "name": "style", "$ref": "CSSComputedStyle" }
@@ -761,7 +761,7 @@
{
"name": "getInlineStyleForNode",
"parameters": [
- { "name": "nodeId", "type": "long" }
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
{ "name": "style", "$ref": "CSSStyle" }
@@ -806,7 +806,7 @@
"name": "setPropertyText",
"parameters": [
{ "name": "styleId", "$ref": "CSSStyleId" },
- { "name": "propertyIndex", "type": "long" },
+ { "name": "propertyIndex", "type": "integer" },
{ "name": "text", "type": "string" },
{ "name": "overwrite", "type": "boolean" }
],
@@ -818,7 +818,7 @@
"name": "toggleProperty",
"parameters": [
{ "name": "styleId", "$ref": "CSSStyleId" },
- { "name": "propertyIndex", "type": "long" },
+ { "name": "propertyIndex", "type": "integer" },
{ "name": "disable", "type": "boolean" }
],
"returns": [
@@ -838,7 +838,7 @@
{
"name": "addRule",
"parameters": [
- { "name": "contextNodeId", "type": "long" },
+ { "name": "contextNodeId", "type": "integer" },
{ "name": "selector", "type": "string" }
],
"returns": [
@@ -980,10 +980,10 @@
{
"name": "setPauseOnExceptionsState",
"parameters": [
- { "name": "pauseOnExceptionsState", "type": "long" }
+ { "name": "pauseOnExceptionsState", "type": "integer" }
],
"returns": [
- { "name": "newState", "type": "long" }
+ { "name": "newState", "type": "integer" }
]
},
{
@@ -1048,7 +1048,7 @@
{
"name": "didCreateWorker",
"parameters": [
- { "name": "id", "type": "long" },
+ { "name": "id", "type": "integer" },
{ "name": "url", "type": "string" },
{ "name": "isShared", "type": "boolean" }
]
@@ -1056,7 +1056,7 @@
{
"name": "didDestroyWorker",
"parameters": [
- { "name": "id", "type": "long" }
+ { "name": "id", "type": "integer" }
]
}
]
@@ -1068,15 +1068,15 @@
{
"name": "setDOMBreakpoint",
"parameters": [
- { "name": "nodeId", "type": "long" },
- { "name": "type", "type": "long" }
+ { "name": "nodeId", "type": "integer" },
+ { "name": "type", "type": "integer" }
]
},
{
"name": "removeDOMBreakpoint",
"parameters": [
- { "name": "nodeId", "type": "long" },
- { "name": "type", "type": "long" }
+ { "name": "nodeId", "type": "integer" },
+ { "name": "type", "type": "integer" }
]
},
{
@@ -1140,7 +1140,7 @@
"name": "getProfile",
"parameters": [
{ "name": "type", "type": "string" },
- { "name": "uid", "type": "unsigned" }
+ { "name": "uid", "type": "integer" }
],
"returns": [
{ "name": "profile", "$ref": "Profile" }
@@ -1150,7 +1150,7 @@
"name": "removeProfile",
"parameters": [
{ "name": "type", "type": "string" },
- { "name": "uid", "type": "unsigned" }
+ { "name": "uid", "type": "integer" }
]
},
{
@@ -1165,11 +1165,11 @@
{
"name": "getExactHeapSnapshotNodeRetainedSize",
"parameters": [
- { "name": "uid", "type": "unsigned" },
- { "name": "nodeId", "type": "unsigned" }
+ { "name": "uid", "type": "integer" },
+ { "name": "nodeId", "type": "integer" }
],
"returns": [
- { "name": "size", "type": "long" }
+ { "name": "size", "type": "integer" }
]
},
{
@@ -1192,14 +1192,14 @@
{
"name": "addHeapSnapshotChunk",
"parameters": [
- { "name": "uid", "type": "unsigned" },
+ { "name": "uid", "type": "integer" },
{ "name": "chunk", "type": "string" }
]
},
{
"name": "finishHeapSnapshot",
"parameters": [
- { "name": "uid", "type": "unsigned" }
+ { "name": "uid", "type": "integer" }
]
},
{
diff --git a/Source/WebCore/inspector/InspectorAgent.cpp b/Source/WebCore/inspector/InspectorAgent.cpp
index 02ee8af..bdafe2e 100644
--- a/Source/WebCore/inspector/InspectorAgent.cpp
+++ b/Source/WebCore/inspector/InspectorAgent.cpp
@@ -276,7 +276,7 @@
m_client->highlight(node);
}
-void InspectorAgent::highlightDOMNode(ErrorString* error, long nodeId)
+void InspectorAgent::highlightDOMNode(ErrorString* error, int nodeId)
{
Node* node = 0;
if (m_domAgent && (node = m_domAgent->nodeForId(nodeId)))
diff --git a/Source/WebCore/inspector/InspectorAgent.h b/Source/WebCore/inspector/InspectorAgent.h
index bdca2ce..580a7b6 100644
--- a/Source/WebCore/inspector/InspectorAgent.h
+++ b/Source/WebCore/inspector/InspectorAgent.h
@@ -120,7 +120,7 @@
void highlight(ErrorString*, Node*);
void hideHighlight(ErrorString*);
void inspect(Node*);
- void highlightDOMNode(ErrorString*, long nodeId);
+ void highlightDOMNode(ErrorString*, int nodeId);
void hideDOMNodeHighlight(ErrorString* error) { hideHighlight(error); }
void highlightFrame(ErrorString*, const String& frameId);
diff --git a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp
index edb0916..afadf2d 100644
--- a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp
@@ -169,7 +169,7 @@
}
}
-void InspectorBrowserDebuggerAgent::setDOMBreakpoint(ErrorString*, long nodeId, long type)
+void InspectorBrowserDebuggerAgent::setDOMBreakpoint(ErrorString*, int nodeId, int type)
{
Node* node = m_domAgent->nodeForId(nodeId);
if (!node)
@@ -183,7 +183,7 @@
}
}
-void InspectorBrowserDebuggerAgent::removeDOMBreakpoint(ErrorString*, long nodeId, long type)
+void InspectorBrowserDebuggerAgent::removeDOMBreakpoint(ErrorString*, int nodeId, int type)
{
Node* node = m_domAgent->nodeForId(nodeId);
if (!node)
@@ -250,7 +250,7 @@
}
}
-void InspectorBrowserDebuggerAgent::descriptionForDOMEvent(Node* target, long breakpointType, bool insertion, InspectorObject* description)
+void InspectorBrowserDebuggerAgent::descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, InspectorObject* description)
{
ASSERT(hasBreakpoint(target, breakpointType));
@@ -274,13 +274,13 @@
description->setBoolean("insertion", insertion);
}
- long breakpointOwnerNodeId = m_domAgent->boundNodeId(breakpointOwner);
+ int breakpointOwnerNodeId = m_domAgent->boundNodeId(breakpointOwner);
ASSERT(breakpointOwnerNodeId);
description->setNumber("nodeId", breakpointOwnerNodeId);
description->setNumber("type", breakpointType);
}
-bool InspectorBrowserDebuggerAgent::hasBreakpoint(Node* node, long type)
+bool InspectorBrowserDebuggerAgent::hasBreakpoint(Node* node, int type)
{
uint32_t rootBit = 1 << type;
uint32_t derivedBit = rootBit << domBreakpointDerivedTypeShift;
diff --git a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
index dc0a040..add0c05 100644
--- a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
@@ -63,12 +63,12 @@
void clearFrontend();
// BrowserDebugger API for InspectorFrontend
- void setXHRBreakpoint(ErrorString* error, const String& url);
- void removeXHRBreakpoint(ErrorString* error, const String& url);
- void setEventListenerBreakpoint(ErrorString* error, const String& eventName);
- void removeEventListenerBreakpoint(ErrorString* error, const String& eventName);
- void setDOMBreakpoint(ErrorString* error, long nodeId, long type);
- void removeDOMBreakpoint(ErrorString* error, long nodeId, long type);
+ void setXHRBreakpoint(ErrorString*, const String& url);
+ void removeXHRBreakpoint(ErrorString*, const String& url);
+ void setEventListenerBreakpoint(ErrorString*, const String& eventName);
+ void removeEventListenerBreakpoint(ErrorString*, const String& eventName);
+ void setDOMBreakpoint(ErrorString*, int nodeId, int type);
+ void removeDOMBreakpoint(ErrorString*, int nodeId, int type);
// InspectorInstrumentation API
void willInsertDOMNode(Node*, Node* parent);
@@ -87,9 +87,9 @@
virtual void debuggerWasDisabled();
void disable();
- void descriptionForDOMEvent(Node* target, long breakpointType, bool insertion, InspectorObject* description);
+ void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, InspectorObject* description);
void updateSubtreeBreakpoints(Node*, uint32_t rootMask, bool set);
- bool hasBreakpoint(Node*, long type);
+ bool hasBreakpoint(Node*, int type);
void discardBindings();
void clear();
diff --git a/Source/WebCore/inspector/InspectorCSSAgent.cpp b/Source/WebCore/inspector/InspectorCSSAgent.cpp
index 4e28e0e..a8873bf 100644
--- a/Source/WebCore/inspector/InspectorCSSAgent.cpp
+++ b/Source/WebCore/inspector/InspectorCSSAgent.cpp
@@ -171,7 +171,7 @@
m_documentToInspectorStyleSheet.clear();
}
-void InspectorCSSAgent::getStylesForNode(ErrorString* errorString, long nodeId, RefPtr<InspectorObject>* result)
+void InspectorCSSAgent::getStylesForNode(ErrorString* errorString, int nodeId, RefPtr<InspectorObject>* result)
{
Element* element = elementForId(errorString, nodeId);
if (!element)
@@ -226,7 +226,7 @@
*result = resultObject.release();
}
-void InspectorCSSAgent::getInlineStyleForNode(ErrorString* errorString, long nodeId, RefPtr<InspectorObject>* style)
+void InspectorCSSAgent::getInlineStyleForNode(ErrorString* errorString, int nodeId, RefPtr<InspectorObject>* style)
{
Element* element = elementForId(errorString, nodeId);
if (!element)
@@ -239,7 +239,7 @@
*style = styleSheet->buildObjectForStyle(element->style());
}
-void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, long nodeId, RefPtr<InspectorObject>* style)
+void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int nodeId, RefPtr<InspectorObject>* style)
{
Element* element = elementForId(errorString, nodeId);
if (!element)
@@ -296,7 +296,7 @@
inspectorStyleSheet->reparseStyleSheet(text);
}
-void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, long propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result)
+void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result)
{
InspectorCSSId compoundId(fullStyleId);
ASSERT(!compoundId.isEmpty());
@@ -310,7 +310,7 @@
*result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
}
-void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, long propertyIndex, bool disable, RefPtr<InspectorObject>* result)
+void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<InspectorObject>* result)
{
InspectorCSSId compoundId(fullStyleId);
ASSERT(!compoundId.isEmpty());
@@ -340,7 +340,7 @@
*result = inspectorStyleSheet->buildObjectForRule(inspectorStyleSheet->ruleForId(compoundId));
}
-void InspectorCSSAgent::addRule(ErrorString*, const long contextNodeId, const String& selector, RefPtr<InspectorObject>* result)
+void InspectorCSSAgent::addRule(ErrorString*, const int contextNodeId, const String& selector, RefPtr<InspectorObject>* result)
{
Node* node = m_domAgent->nodeForId(contextNodeId);
if (!node)
@@ -394,7 +394,7 @@
return it->second.get();
}
-Element* InspectorCSSAgent::elementForId(ErrorString* errorString, long nodeId)
+Element* InspectorCSSAgent::elementForId(ErrorString* errorString, int nodeId)
{
Node* node = m_domAgent->nodeForId(nodeId);
if (!node) {
diff --git a/Source/WebCore/inspector/InspectorCSSAgent.h b/Source/WebCore/inspector/InspectorCSSAgent.h
index 95a64df..87eca1e 100644
--- a/Source/WebCore/inspector/InspectorCSSAgent.h
+++ b/Source/WebCore/inspector/InspectorCSSAgent.h
@@ -61,17 +61,17 @@
~InspectorCSSAgent();
void reset();
- void getStylesForNode(ErrorString*, long nodeId, RefPtr<InspectorObject>* result);
- void getInlineStyleForNode(ErrorString*, long nodeId, RefPtr<InspectorObject>* style);
- void getComputedStyleForNode(ErrorString*, long nodeId, RefPtr<InspectorObject>* style);
+ void getStylesForNode(ErrorString*, int nodeId, RefPtr<InspectorObject>* result);
+ void getInlineStyleForNode(ErrorString*, int nodeId, RefPtr<InspectorObject>* style);
+ void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<InspectorObject>* style);
void getAllStyles(ErrorString*, RefPtr<InspectorArray>* styles);
void getStyleSheet(ErrorString*, const String& styleSheetId, RefPtr<InspectorObject>* result);
void getStyleSheetText(ErrorString*, const String& styleSheetId, String* url, String* result);
void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text, bool* success);
- void setPropertyText(ErrorString*, const RefPtr<InspectorObject>& styleId, long propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result);
- void toggleProperty(ErrorString*, const RefPtr<InspectorObject>& styleId, long propertyIndex, bool disable, RefPtr<InspectorObject>* result);
+ void setPropertyText(ErrorString*, const RefPtr<InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result);
+ void toggleProperty(ErrorString*, const RefPtr<InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<InspectorObject>* result);
void setRuleSelector(ErrorString*, const RefPtr<InspectorObject>& ruleId, const String& selector, RefPtr<InspectorObject>* result);
- void addRule(ErrorString*, const long contextNodeId, const String& selector, RefPtr<InspectorObject>* result);
+ void addRule(ErrorString*, const int contextNodeId, const String& selector, RefPtr<InspectorObject>* result);
void getSupportedCSSProperties(ErrorString*, RefPtr<InspectorArray>* result);
private:
@@ -83,7 +83,7 @@
static Element* inlineStyleElement(CSSStyleDeclaration*);
InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element);
- Element* elementForId(ErrorString*, long nodeId);
+ Element* elementForId(ErrorString*, int nodeId);
InspectorStyleSheet* bindStyleSheet(CSSStyleSheet*);
InspectorStyleSheet* viaInspectorStyleSheet(Document*, bool createIfAbsent);
@@ -106,9 +106,9 @@
NodeToInspectorStyleSheet m_nodeToInspectorStyleSheet;
DocumentToViaInspectorStyleSheet m_documentToInspectorStyleSheet;
- long m_lastStyleSheetId;
- long m_lastRuleId;
- long m_lastStyleId;
+ int m_lastStyleSheetId;
+ int m_lastRuleId;
+ int m_lastStyleId;
};
#endif
diff --git a/Source/WebCore/inspector/InspectorConsoleAgent.cpp b/Source/WebCore/inspector/InspectorConsoleAgent.cpp
index 38d7aeb..2e671b7 100644
--- a/Source/WebCore/inspector/InspectorConsoleAgent.cpp
+++ b/Source/WebCore/inspector/InspectorConsoleAgent.cpp
@@ -49,7 +49,7 @@
namespace WebCore {
static const unsigned maximumConsoleMessages = 1000;
-static const unsigned expireConsoleMessagesStep = 100;
+static const int expireConsoleMessagesStep = 100;
namespace ConsoleAgentState {
static const char monitoringXHR[] = "monitoringXHR";
@@ -218,7 +218,7 @@
m_inspectorState->setBoolean(ConsoleAgentState::monitoringXHR, enabled);
}
-void InspectorConsoleAgent::addInspectedNode(ErrorString*, long nodeId)
+void InspectorConsoleAgent::addInspectedNode(ErrorString*, int nodeId)
{
Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
if (!node)
diff --git a/Source/WebCore/inspector/InspectorConsoleAgent.h b/Source/WebCore/inspector/InspectorConsoleAgent.h
index 8749d98..7989457 100644
--- a/Source/WebCore/inspector/InspectorConsoleAgent.h
+++ b/Source/WebCore/inspector/InspectorConsoleAgent.h
@@ -79,7 +79,7 @@
void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL);
#endif
void setMonitoringXHREnabled(ErrorString* error, bool enabled);
- void addInspectedNode(ErrorString*, long nodeId);
+ void addInspectedNode(ErrorString*, int nodeId);
private:
void setConsoleMessagesEnabled(bool);
@@ -93,7 +93,7 @@
InspectorFrontend::Console* m_frontend;
ConsoleMessage* m_previousMessage;
Vector<OwnPtr<ConsoleMessage> > m_consoleMessages;
- unsigned m_expiredConsoleMessageCount;
+ int m_expiredConsoleMessageCount;
HashMap<String, unsigned> m_counts;
HashMap<String, double> m_times;
};
diff --git a/Source/WebCore/inspector/InspectorDOMAgent.cpp b/Source/WebCore/inspector/InspectorDOMAgent.cpp
index 494779c..b50d707 100644
--- a/Source/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMAgent.cpp
@@ -340,9 +340,9 @@
m_danglingNodeToIdMaps.clear();
}
-long InspectorDOMAgent::bind(Node* node, NodeToIdMap* nodesMap)
+int InspectorDOMAgent::bind(Node* node, NodeToIdMap* nodesMap)
{
- long id = nodesMap->get(node);
+ int id = nodesMap->get(node);
if (id)
return id;
id = m_lastNodeId++;
@@ -360,7 +360,7 @@
m_domListener->didRemoveDocument(frameOwner->contentDocument());
}
- long id = nodesMap->get(node);
+ int id = nodesMap->get(node);
if (!id)
return;
m_idToNode.remove(id);
@@ -377,7 +377,7 @@
}
}
-Node* InspectorDOMAgent::assertNode(ErrorString* errorString, long nodeId)
+Node* InspectorDOMAgent::assertNode(ErrorString* errorString, int nodeId)
{
Node* node = nodeForId(nodeId);
if (!node) {
@@ -387,7 +387,7 @@
return node;
}
-Element* InspectorDOMAgent::assertElement(ErrorString* errorString, long nodeId)
+Element* InspectorDOMAgent::assertElement(ErrorString* errorString, int nodeId)
{
Node* node = assertNode(errorString, nodeId);
if (!node)
@@ -401,7 +401,7 @@
}
-HTMLElement* InspectorDOMAgent::assertHTMLElement(ErrorString* errorString, long nodeId)
+HTMLElement* InspectorDOMAgent::assertHTMLElement(ErrorString* errorString, int nodeId)
{
Element* element = assertElement(errorString, nodeId);
if (!element)
@@ -414,7 +414,7 @@
return toHTMLElement(element);
}
-Node* InspectorDOMAgent::nodeToSelectOn(ErrorString* errorString, long nodeId, bool documentWide)
+Node* InspectorDOMAgent::nodeToSelectOn(ErrorString* errorString, int nodeId, bool documentWide)
{
Node* node;
if (!nodeId) {
@@ -448,7 +448,7 @@
*root = buildObjectForNode(m_document.get(), 2, &m_documentNodeToIdMap);
}
-void InspectorDOMAgent::pushChildNodesToFrontend(long nodeId)
+void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId)
{
Node* node = nodeForId(nodeId);
if (!node || (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE && node->nodeType() != Node::DOCUMENT_FRAGMENT_NODE))
@@ -470,23 +470,23 @@
m_childrenRequested.clear();
}
-Node* InspectorDOMAgent::nodeForId(long id)
+Node* InspectorDOMAgent::nodeForId(int id)
{
if (!id)
return 0;
- HashMap<long, Node*>::iterator it = m_idToNode.find(id);
+ HashMap<int, Node*>::iterator it = m_idToNode.find(id);
if (it != m_idToNode.end())
return it->second;
return 0;
}
-void InspectorDOMAgent::getChildNodes(ErrorString*, long nodeId)
+void InspectorDOMAgent::getChildNodes(ErrorString*, int nodeId)
{
pushChildNodesToFrontend(nodeId);
}
-void InspectorDOMAgent::querySelector(ErrorString* errorString, long nodeId, const String& selectors, bool documentWide, long* elementId)
+void InspectorDOMAgent::querySelector(ErrorString* errorString, int nodeId, const String& selectors, bool documentWide, int* elementId)
{
*elementId = 0;
Node* node = nodeToSelectOn(errorString, nodeId, documentWide);
@@ -504,7 +504,7 @@
*elementId = pushNodePathToFrontend(element.get());
}
-void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, long nodeId, const String& selectors, bool documentWide, RefPtr<InspectorArray>* result)
+void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, bool documentWide, RefPtr<InspectorArray>* result)
{
Node* node = nodeToSelectOn(errorString, nodeId, documentWide);
if (!node)
@@ -521,7 +521,7 @@
(*result)->pushNumber(pushNodePathToFrontend(nodes->item(i)));
}
-long InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
+int InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
{
ASSERT(nodeToPush); // Invalid input
@@ -531,7 +531,7 @@
return 0;
// Return id in case the node is known.
- long result = m_documentNodeToIdMap.get(nodeToPush);
+ int result = m_documentNodeToIdMap.get(nodeToPush);
if (result)
return result;
@@ -560,19 +560,19 @@
NodeToIdMap* map = danglingMap ? danglingMap : &m_documentNodeToIdMap;
for (int i = path.size() - 1; i >= 0; --i) {
- long nodeId = map->get(path.at(i));
+ int nodeId = map->get(path.at(i));
ASSERT(nodeId);
pushChildNodesToFrontend(nodeId);
}
return map->get(nodeToPush);
}
-long InspectorDOMAgent::boundNodeId(Node* node)
+int InspectorDOMAgent::boundNodeId(Node* node)
{
return m_documentNodeToIdMap.get(node);
}
-void InspectorDOMAgent::setAttribute(ErrorString* errorString, long elementId, const String& name, const String& value)
+void InspectorDOMAgent::setAttribute(ErrorString* errorString, int elementId, const String& name, const String& value)
{
Element* element = assertElement(errorString, elementId);
if (element) {
@@ -583,7 +583,7 @@
}
}
-void InspectorDOMAgent::removeAttribute(ErrorString* errorString, long elementId, const String& name)
+void InspectorDOMAgent::removeAttribute(ErrorString* errorString, int elementId, const String& name)
{
Element* element = assertElement(errorString, elementId);
if (element) {
@@ -594,7 +594,7 @@
}
}
-void InspectorDOMAgent::removeNode(ErrorString*, long nodeId, long* outNodeId)
+void InspectorDOMAgent::removeNode(ErrorString*, int nodeId, int* outNodeId)
{
Node* node = nodeForId(nodeId);
if (!node)
@@ -612,7 +612,7 @@
*outNodeId = nodeId;
}
-void InspectorDOMAgent::setNodeName(ErrorString*, long nodeId, const String& tagName, long* newId)
+void InspectorDOMAgent::setNodeName(ErrorString*, int nodeId, const String& tagName, int* newId)
{
*newId = 0;
@@ -649,14 +649,14 @@
pushChildNodesToFrontend(*newId);
}
-void InspectorDOMAgent::getOuterHTML(ErrorString* errorString, long nodeId, WTF::String* outerHTML)
+void InspectorDOMAgent::getOuterHTML(ErrorString* errorString, int nodeId, WTF::String* outerHTML)
{
HTMLElement* element = assertHTMLElement(errorString, nodeId);
if (element)
*outerHTML = element->outerHTML();
}
-void InspectorDOMAgent::setOuterHTML(ErrorString* errorString, long nodeId, const String& outerHTML, long* newId)
+void InspectorDOMAgent::setOuterHTML(ErrorString* errorString, int nodeId, const String& outerHTML, int* newId)
{
HTMLElement* htmlElement = assertHTMLElement(errorString, nodeId);
if (!htmlElement)
@@ -693,7 +693,7 @@
pushChildNodesToFrontend(*newId);
}
-void InspectorDOMAgent::setNodeValue(ErrorString*, long nodeId, const String& value, bool* success)
+void InspectorDOMAgent::setNodeValue(ErrorString*, int nodeId, const String& value, bool* success)
{
Node* node = nodeForId(nodeId);
if (node && (node->nodeType() == Node::TEXT_NODE)) {
@@ -706,7 +706,7 @@
*success = false;
}
-void InspectorDOMAgent::getEventListenersForNode(ErrorString*, long nodeId, RefPtr<InspectorArray>* listenersArray)
+void InspectorDOMAgent::getEventListenersForNode(ErrorString*, int nodeId, RefPtr<InspectorArray>* listenersArray)
{
Node* node = nodeForId(nodeId);
EventTargetData* d;
@@ -868,7 +868,7 @@
m_searchResults.clear();
}
-void InspectorDOMAgent::resolveNode(ErrorString* error, long nodeId, const String& objectGroup, RefPtr<InspectorObject>* result)
+void InspectorDOMAgent::resolveNode(ErrorString* error, int nodeId, const String& objectGroup, RefPtr<InspectorObject>* result)
{
Node* node = nodeForId(nodeId);
if (!node) {
@@ -878,7 +878,7 @@
*result = resolveNode(node, objectGroup);
}
-void InspectorDOMAgent::pushNodeToFrontend(ErrorString*, const String& objectId, long* nodeId)
+void InspectorDOMAgent::pushNodeToFrontend(ErrorString*, const String& objectId, int* nodeId)
{
InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
Node* node = injectedScript.nodeForObjectId(objectId);
@@ -899,7 +899,7 @@
{
RefPtr<InspectorObject> value = InspectorObject::create();
- long id = bind(node, nodesMap);
+ int id = bind(node, nodesMap);
String nodeName;
String localName;
String nodeValue;
@@ -1085,7 +1085,7 @@
if (!frameOwner)
return;
- long frameOwnerId = m_documentNodeToIdMap.get(frameOwner);
+ int frameOwnerId = m_documentNodeToIdMap.get(frameOwner);
if (!frameOwnerId)
return;
@@ -1094,11 +1094,11 @@
m_frontend->childNodeCountUpdated(frameOwnerId, innerChildNodeCount(frameOwner));
} else {
// Re-add frame owner element together with its new children.
- long parentId = m_documentNodeToIdMap.get(innerParentNode(frameOwner));
+ int parentId = m_documentNodeToIdMap.get(innerParentNode(frameOwner));
m_frontend->childNodeRemoved(parentId, frameOwnerId);
RefPtr<InspectorObject> value = buildObjectForNode(frameOwner, 0, &m_documentNodeToIdMap);
Node* previousSibling = innerPreviousSibling(frameOwner);
- long prevId = previousSibling ? m_documentNodeToIdMap.get(previousSibling) : 0;
+ int prevId = previousSibling ? m_documentNodeToIdMap.get(previousSibling) : 0;
m_frontend->childNodeInserted(parentId, prevId, value.release());
// Invalidate children requested flag for the element.
m_childrenRequested.remove(m_childrenRequested.find(frameOwnerId));
@@ -1114,7 +1114,7 @@
unbind(node, &m_documentNodeToIdMap);
ContainerNode* parent = node->parentNode();
- long parentId = m_documentNodeToIdMap.get(parent);
+ int parentId = m_documentNodeToIdMap.get(parent);
// Return if parent is not mapped yet.
if (!parentId)
return;
@@ -1125,7 +1125,7 @@
} else {
// Children have been requested -> return value of a new child.
Node* prevSibling = innerPreviousSibling(node);
- long prevId = prevSibling ? m_documentNodeToIdMap.get(prevSibling) : 0;
+ int prevId = prevSibling ? m_documentNodeToIdMap.get(prevSibling) : 0;
RefPtr<InspectorObject> value = buildObjectForNode(node, 0, &m_documentNodeToIdMap);
m_frontend->childNodeInserted(parentId, prevId, value.release());
}
@@ -1137,7 +1137,7 @@
return;
ContainerNode* parent = node->parentNode();
- long parentId = m_documentNodeToIdMap.get(parent);
+ int parentId = m_documentNodeToIdMap.get(parent);
// If parent is not mapped yet -> ignore the event.
if (!parentId)
return;
@@ -1156,7 +1156,7 @@
void InspectorDOMAgent::didModifyDOMAttr(Element* element)
{
- long id = m_documentNodeToIdMap.get(element);
+ int id = m_documentNodeToIdMap.get(element);
// If node is not mapped yet -> ignore the event.
if (!id)
return;
@@ -1169,7 +1169,7 @@
void InspectorDOMAgent::characterDataModified(CharacterData* characterData)
{
- long id = m_documentNodeToIdMap.get(characterData);
+ int id = m_documentNodeToIdMap.get(characterData);
if (!id)
return;
m_frontend->characterDataModified(id, characterData->data());
@@ -1177,7 +1177,7 @@
void InspectorDOMAgent::didInvalidateStyleAttr(Node* node)
{
- long id = m_documentNodeToIdMap.get(node);
+ int id = m_documentNodeToIdMap.get(node);
// If node is not mapped yet -> ignore the event.
if (!id)
return;
@@ -1251,12 +1251,12 @@
if (m_searchResults.contains(*it))
continue;
m_searchResults.add(*it);
- nodeIds->pushNumber(static_cast<long long>(pushNodePathToFrontend(*it)));
+ nodeIds->pushNumber(pushNodePathToFrontend(*it));
}
m_frontend->searchResults(nodeIds.release());
}
-void InspectorDOMAgent::copyNode(ErrorString*, long nodeId)
+void InspectorDOMAgent::copyNode(ErrorString*, int nodeId)
{
Node* node = nodeForId(nodeId);
if (!node)
@@ -1265,7 +1265,7 @@
Pasteboard::generalPasteboard()->writePlainText(markup);
}
-void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString*, const String& path, long* nodeId)
+void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId)
{
if (Node* node = nodeForPath(path))
*nodeId = pushNodePathToFrontend(node);
diff --git a/Source/WebCore/inspector/InspectorDOMAgent.h b/Source/WebCore/inspector/InspectorDOMAgent.h
index 6effbd9..c1aaa9b 100644
--- a/Source/WebCore/inspector/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMAgent.h
@@ -108,23 +108,23 @@
void reset();
// Methods called from the frontend for DOM nodes inspection.
- void querySelector(ErrorString*, long nodeId, const String& selectors, bool documentWide, long* elementId);
- void querySelectorAll(ErrorString*, long nodeId, const String& selectors, bool documentWide, RefPtr<InspectorArray>* result);
+ void querySelector(ErrorString*, int nodeId, const String& selectors, bool documentWide, int* elementId);
+ void querySelectorAll(ErrorString*, int nodeId, const String& selectors, bool documentWide, RefPtr<InspectorArray>* result);
void getDocument(ErrorString*, RefPtr<InspectorObject>* root);
- void getChildNodes(ErrorString*, long nodeId);
- void setAttribute(ErrorString*, long elementId, const String& name, const String& value);
- void removeAttribute(ErrorString*, long elementId, const String& name);
- void removeNode(ErrorString*, long nodeId, long* outNodeId);
- void setNodeName(ErrorString*, long nodeId, const String& name, long* newId);
- void getOuterHTML(ErrorString*, long nodeId, WTF::String* outerHTML);
- void setOuterHTML(ErrorString*, long nodeId, const String& outerHTML, long* newId);
- void setNodeValue(ErrorString*, long nodeId, const String& value, bool* success);
- void getEventListenersForNode(ErrorString*, long nodeId, RefPtr<InspectorArray>* listenersArray);
+ void getChildNodes(ErrorString*, int nodeId);
+ void setAttribute(ErrorString*, int elementId, const String& name, const String& value);
+ void removeAttribute(ErrorString*, int elementId, const String& name);
+ void removeNode(ErrorString*, int nodeId, int* outNodeId);
+ void setNodeName(ErrorString*, int nodeId, const String& name, int* newId);
+ void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML);
+ void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML, int* newId);
+ void setNodeValue(ErrorString*, int nodeId, const String& value, bool* success);
+ void getEventListenersForNode(ErrorString*, int nodeId, RefPtr<InspectorArray>* listenersArray);
void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, bool runSynchronously);
void cancelSearch(ErrorString*);
- void resolveNode(ErrorString*, long nodeId, const String& objectGroup, RefPtr<InspectorObject>* result);
- void pushNodeToFrontend(ErrorString*, const String& objectId, long* nodeId);
- void pushNodeByPathToFrontend(ErrorString*, const String& path, long* nodeId);
+ void resolveNode(ErrorString*, int nodeId, const String& objectGroup, RefPtr<InspectorObject>* result);
+ void pushNodeToFrontend(ErrorString*, const String& objectId, int* nodeId);
+ void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId);
// Methods called from the InspectorInstrumentation.
void setDocument(Document*);
@@ -139,9 +139,9 @@
void characterDataModified(CharacterData*);
void didInvalidateStyleAttr(Node*);
- Node* nodeForId(long nodeId);
- long boundNodeId(Node*);
- void copyNode(ErrorString*, long nodeId);
+ Node* nodeForId(int nodeId);
+ int boundNodeId(Node*);
+ void copyNode(ErrorString*, int nodeId);
void setDOMListener(DOMListener*);
String documentURLString(Document*) const;
@@ -161,20 +161,20 @@
InspectorDOMAgent(InstrumentingAgents*, Page*, InspectorState*, InjectedScriptManager*);
// Node-related methods.
- typedef HashMap<RefPtr<Node>, long> NodeToIdMap;
- long bind(Node*, NodeToIdMap*);
+ typedef HashMap<RefPtr<Node>, int> NodeToIdMap;
+ int bind(Node*, NodeToIdMap*);
void unbind(Node*, NodeToIdMap*);
- Node* assertNode(ErrorString*, long nodeId);
- Element* assertElement(ErrorString*, long nodeId);
- HTMLElement* assertHTMLElement(ErrorString*, long nodeId);
- Node* nodeToSelectOn(ErrorString*, long nodeId, bool documentWide);
+ Node* assertNode(ErrorString*, int nodeId);
+ Element* assertElement(ErrorString*, int nodeId);
+ HTMLElement* assertHTMLElement(ErrorString*, int nodeId);
+ Node* nodeToSelectOn(ErrorString*, int nodeId, bool documentWide);
- long pushNodePathToFrontend(Node*);
- void pushChildNodesToFrontend(long nodeId);
+ int pushNodePathToFrontend(Node*);
+ void pushChildNodesToFrontend(int nodeId);
- bool hasBreakpoint(Node*, long type);
+ bool hasBreakpoint(Node*, int type);
void updateSubtreeBreakpoints(Node* root, uint32_t rootMask, bool value);
- void descriptionForDOMEvent(Node* target, long breakpointType, bool insertion, PassRefPtr<InspectorObject> description);
+ void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, PassRefPtr<InspectorObject> description);
PassRefPtr<InspectorObject> buildObjectForNode(Node*, int depth, NodeToIdMap*);
PassRefPtr<InspectorArray> buildArrayForElementAttributes(Element*);
@@ -198,10 +198,10 @@
NodeToIdMap m_documentNodeToIdMap;
// Owns node mappings for dangling nodes.
Vector<NodeToIdMap*> m_danglingNodeToIdMaps;
- HashMap<long, Node*> m_idToNode;
- HashMap<long, NodeToIdMap*> m_idToNodesMap;
- HashSet<long> m_childrenRequested;
- long m_lastNodeId;
+ HashMap<int, Node*> m_idToNode;
+ HashMap<int, NodeToIdMap*> m_idToNodesMap;
+ HashSet<int> m_childrenRequested;
+ int m_lastNodeId;
RefPtr<Document> m_document;
Deque<MatchJob*> m_pendingMatchJobs;
Timer<InspectorDOMAgent> m_matchJobsTimer;
diff --git a/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp b/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
index 6ea72f6..c44bbd8 100644
--- a/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
@@ -79,7 +79,7 @@
m_frontend = 0;
}
-void InspectorDOMStorageAgent::getDOMStorageEntries(ErrorString*, long storageId, RefPtr<InspectorArray>* entries)
+void InspectorDOMStorageAgent::getDOMStorageEntries(ErrorString*, int storageId, RefPtr<InspectorArray>* entries)
{
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
@@ -96,7 +96,7 @@
}
}
-void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString*, long storageId, const String& key, const String& value, bool* success)
+void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString*, int storageId, const String& key, const String& value, bool* success)
{
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
@@ -106,7 +106,7 @@
}
}
-void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString*, long storageId, const String& key, bool* success)
+void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString*, int storageId, const String& key, bool* success)
{
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
@@ -115,7 +115,7 @@
}
}
-long InspectorDOMStorageAgent::storageId(Storage* storage)
+int InspectorDOMStorageAgent::storageId(Storage* storage)
{
ASSERT(storage);
Frame* frame = storage->frame();
@@ -129,7 +129,7 @@
return 0;
}
-InspectorDOMStorageResource* InspectorDOMStorageAgent::getDOMStorageResourceForId(long storageId)
+InspectorDOMStorageResource* InspectorDOMStorageAgent::getDOMStorageResourceForId(int storageId)
{
DOMStorageResourcesMap::iterator it = m_resources.find(storageId);
if (it == m_resources.end())
diff --git a/Source/WebCore/inspector/InspectorDOMStorageAgent.h b/Source/WebCore/inspector/InspectorDOMStorageAgent.h
index adae9b2..567a713 100644
--- a/Source/WebCore/inspector/InspectorDOMStorageAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMStorageAgent.h
@@ -59,12 +59,12 @@
void clearResources();
// Called from the front-end.
- void getDOMStorageEntries(ErrorString*, long storageId, RefPtr<InspectorArray>* entries);
- void setDOMStorageItem(ErrorString*, long storageId, const String& key, const String& value, bool* success);
- void removeDOMStorageItem(ErrorString*, long storageId, const String& key, bool* success);
+ void getDOMStorageEntries(ErrorString*, int storageId, RefPtr<InspectorArray>* entries);
+ void setDOMStorageItem(ErrorString*, int storageId, const String& key, const String& value, bool* success);
+ void removeDOMStorageItem(ErrorString*, int storageId, const String& key, bool* success);
// Called from the injected script.
- long storageId(Storage*);
+ int storageId(Storage*);
// Called from InspectorInstrumentation
void didUseDOMStorage(StorageArea*, bool isLocalStorage, Frame*);
@@ -72,10 +72,10 @@
private:
explicit InspectorDOMStorageAgent(InstrumentingAgents*);
- InspectorDOMStorageResource* getDOMStorageResourceForId(long storageId);
+ InspectorDOMStorageResource* getDOMStorageResourceForId(int storageId);
InstrumentingAgents* m_instrumentingAgents;
- typedef HashMap<long, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
+ typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
DOMStorageResourcesMap m_resources;
InspectorFrontend* m_frontend;
};
diff --git a/Source/WebCore/inspector/InspectorDOMStorageResource.cpp b/Source/WebCore/inspector/InspectorDOMStorageResource.cpp
index 6ff6418..d618eb5 100644
--- a/Source/WebCore/inspector/InspectorDOMStorageResource.cpp
+++ b/Source/WebCore/inspector/InspectorDOMStorageResource.cpp
@@ -46,7 +46,7 @@
namespace WebCore {
-long InspectorDOMStorageResource::s_nextUnusedId = 1;
+int InspectorDOMStorageResource::s_nextUnusedId = 1;
InspectorDOMStorageResource::InspectorDOMStorageResource(Storage* domStorage, bool isLocalStorage, Frame* frame)
: EventListener(InspectorDOMStorageResourceType)
diff --git a/Source/WebCore/inspector/InspectorDOMStorageResource.h b/Source/WebCore/inspector/InspectorDOMStorageResource.h
index 9ad5b91..eb75113 100644
--- a/Source/WebCore/inspector/InspectorDOMStorageResource.h
+++ b/Source/WebCore/inspector/InspectorDOMStorageResource.h
@@ -66,7 +66,7 @@
virtual bool operator==(const EventListener& listener);
bool isSameHostAndType(Frame*, bool isLocalStorage) const;
- long id() const { return m_id; }
+ int id() const { return m_id; }
Storage* domStorage() const { return m_domStorage.get(); }
private:
@@ -77,10 +77,10 @@
bool m_isLocalStorage;
RefPtr<Frame> m_frame;
InspectorFrontend::DOMStorage* m_frontend;
- long m_id;
+ int m_id;
bool m_reportingChangesToFrontend;
- static long s_nextUnusedId;
+ static int s_nextUnusedId;
};
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
index 45ec42a..7f6e379 100644
--- a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
@@ -70,9 +70,9 @@
namespace {
-long lastTransactionId = 0;
+int lastTransactionId = 0;
-void reportTransactionFailed(InspectorFrontend::Database* frontend, long transactionId, SQLError* error)
+void reportTransactionFailed(InspectorFrontend::Database* frontend, int transactionId, SQLError* error)
{
if (!frontend)
return;
@@ -84,7 +84,7 @@
class StatementCallback : public SQLStatementCallback {
public:
- static PassRefPtr<StatementCallback> create(long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ static PassRefPtr<StatementCallback> create(int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
{
return adoptRef(new StatementCallback(transactionId, frontendProvider));
}
@@ -118,16 +118,16 @@
}
private:
- StatementCallback(long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ StatementCallback(int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
: m_transactionId(transactionId)
, m_frontendProvider(frontendProvider) { }
- long m_transactionId;
+ int m_transactionId;
RefPtr<InspectorDatabaseAgent::FrontendProvider> m_frontendProvider;
};
class StatementErrorCallback : public SQLStatementErrorCallback {
public:
- static PassRefPtr<StatementErrorCallback> create(long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ static PassRefPtr<StatementErrorCallback> create(int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
{
return adoptRef(new StatementErrorCallback(transactionId, frontendProvider));
}
@@ -141,16 +141,16 @@
}
private:
- StatementErrorCallback(long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ StatementErrorCallback(int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
: m_transactionId(transactionId)
, m_frontendProvider(frontendProvider) { }
- long m_transactionId;
+ int m_transactionId;
RefPtr<InspectorDatabaseAgent::FrontendProvider> m_frontendProvider;
};
class TransactionCallback : public SQLTransactionCallback {
public:
- static PassRefPtr<TransactionCallback> create(const String& sqlStatement, long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ static PassRefPtr<TransactionCallback> create(const String& sqlStatement, int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
{
return adoptRef(new TransactionCallback(sqlStatement, transactionId, frontendProvider));
}
@@ -170,18 +170,18 @@
return true;
}
private:
- TransactionCallback(const String& sqlStatement, long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ TransactionCallback(const String& sqlStatement, int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
: m_sqlStatement(sqlStatement)
, m_transactionId(transactionId)
, m_frontendProvider(frontendProvider) { }
String m_sqlStatement;
- long m_transactionId;
+ int m_transactionId;
RefPtr<InspectorDatabaseAgent::FrontendProvider> m_frontendProvider;
};
class TransactionErrorCallback : public SQLTransactionErrorCallback {
public:
- static PassRefPtr<TransactionErrorCallback> create(long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ static PassRefPtr<TransactionErrorCallback> create(int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
{
return adoptRef(new TransactionErrorCallback(transactionId, frontendProvider));
}
@@ -194,10 +194,10 @@
return true;
}
private:
- TransactionErrorCallback(long transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
+ TransactionErrorCallback(int transactionId, PassRefPtr<InspectorDatabaseAgent::FrontendProvider> frontendProvider)
: m_transactionId(transactionId)
, m_frontendProvider(frontendProvider) { }
- long m_transactionId;
+ int m_transactionId;
RefPtr<InspectorDatabaseAgent::FrontendProvider> m_frontendProvider;
};
@@ -257,7 +257,7 @@
m_frontendProvider.clear();
}
-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, long databaseId, RefPtr<InspectorArray>* names)
+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>* names)
{
Database* database = databaseForId(databaseId);
if (database) {
@@ -268,7 +268,7 @@
}
}
-void InspectorDatabaseAgent::executeSQL(ErrorString*, long databaseId, const String& query, bool* success, long* transactionId)
+void InspectorDatabaseAgent::executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId)
{
Database* database = databaseForId(databaseId);
if (!database) {
@@ -284,7 +284,7 @@
*success = true;
}
-long InspectorDatabaseAgent::databaseId(Database* database)
+int InspectorDatabaseAgent::databaseId(Database* database)
{
for (DatabaseResourcesMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
if (it->second->database() == database)
@@ -293,7 +293,7 @@
return 0;
}
-Database* InspectorDatabaseAgent::databaseForId(long databaseId)
+Database* InspectorDatabaseAgent::databaseForId(int databaseId)
{
DatabaseResourcesMap::iterator it = m_resources.find(databaseId);
if (it == m_resources.end())
diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.h b/Source/WebCore/inspector/InspectorDatabaseAgent.h
index 7e42211..45fbfa4 100644
--- a/Source/WebCore/inspector/InspectorDatabaseAgent.h
+++ b/Source/WebCore/inspector/InspectorDatabaseAgent.h
@@ -59,17 +59,17 @@
void clearResources();
// Called from the front-end.
- void getDatabaseTableNames(ErrorString* error, long databaseId, RefPtr<InspectorArray>* names);
- void executeSQL(ErrorString* error, long databaseId, const String& query, bool* success, long* transactionId);
+ void getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>* names);
+ void executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId);
// Called from the injected script.
- long databaseId(Database*);
+ int databaseId(Database*);
void didOpenDatabase(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
private:
explicit InspectorDatabaseAgent(InstrumentingAgents*);
- Database* databaseForId(long databaseId);
+ Database* databaseForId(int databaseId);
InstrumentingAgents* m_instrumentingAgents;
typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.cpp b/Source/WebCore/inspector/InspectorDatabaseResource.cpp
index 41342a4..852370e 100644
--- a/Source/WebCore/inspector/InspectorDatabaseResource.cpp
+++ b/Source/WebCore/inspector/InspectorDatabaseResource.cpp
@@ -38,7 +38,7 @@
namespace WebCore {
-static long nextUnusedId = 1;
+static int nextUnusedId = 1;
PassRefPtr<InspectorDatabaseResource> InspectorDatabaseResource::create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
{
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.h b/Source/WebCore/inspector/InspectorDatabaseResource.h
index 550fcd8..9fa7ebd 100644
--- a/Source/WebCore/inspector/InspectorDatabaseResource.h
+++ b/Source/WebCore/inspector/InspectorDatabaseResource.h
@@ -48,13 +48,13 @@
void bind(InspectorFrontend::Database*);
Database* database() { return m_database.get(); }
- long id() const { return m_id; }
+ int id() const { return m_id; }
private:
InspectorDatabaseResource(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
RefPtr<Database> m_database;
- long m_id;
+ int m_id;
String m_domain;
String m_name;
String m_version;
diff --git a/Source/WebCore/inspector/InspectorDebuggerAgent.cpp b/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
index b335396..b2293f6 100644
--- a/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
@@ -316,7 +316,7 @@
ScriptDebugServer::shared().stepOutOfFunction();
}
-void InspectorDebuggerAgent::setPauseOnExceptionsState(ErrorString*, long pauseState, long* newState)
+void InspectorDebuggerAgent::setPauseOnExceptionsState(ErrorString*, int pauseState, int* newState)
{
ScriptDebugServer::shared().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
*newState = ScriptDebugServer::shared().pauseOnExceptionsState();
diff --git a/Source/WebCore/inspector/InspectorDebuggerAgent.h b/Source/WebCore/inspector/InspectorDebuggerAgent.h
index a3e6b8d..8b825b6 100644
--- a/Source/WebCore/inspector/InspectorDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorDebuggerAgent.h
@@ -97,7 +97,7 @@
void stepOver(ErrorString*);
void stepInto(ErrorString*);
void stepOut(ErrorString*);
- void setPauseOnExceptionsState(ErrorString*, long pauseState, long* newState);
+ void setPauseOnExceptionsState(ErrorString*, int pauseState, int* newState);
void evaluateOnCallFrame(ErrorString*, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, RefPtr<InspectorObject>* result);
class Listener {
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.cpp b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
index 1867df1..26afc73 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
@@ -181,7 +181,7 @@
return makeString(UserInitiatedProfileName, '.', String::number(m_currentUserInitiatedProfileNumber));
}
-void InspectorProfilerAgent::getExactHeapSnapshotNodeRetainedSize(ErrorString*, unsigned long uid, unsigned long nodeId, long* size)
+void InspectorProfilerAgent::getExactHeapSnapshotNodeRetainedSize(ErrorString*, unsigned uid, int nodeId, int* size)
{
HeapSnapshotsMap::iterator it = m_snapshots.find(uid);
if (it != m_snapshots.end()) {
@@ -205,13 +205,13 @@
class OutputStream : public ScriptHeapSnapshot::OutputStream {
public:
- OutputStream(InspectorFrontend::Profiler* frontend, unsigned long uid)
+ OutputStream(InspectorFrontend::Profiler* frontend, unsigned uid)
: m_frontend(frontend), m_uid(uid) { }
void Write(const String& chunk) { m_frontend->addHeapSnapshotChunk(m_uid, chunk); }
void Close() { m_frontend->finishHeapSnapshot(m_uid); }
private:
InspectorFrontend::Profiler* m_frontend;
- unsigned long m_uid;
+ int m_uid;
};
} // namespace
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.h b/Source/WebCore/inspector/InspectorProfilerAgent.h
index 89b9126..eb4c0ad 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.h
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.h
@@ -76,7 +76,7 @@
void enable(bool skipRecompile);
bool enabled() { return m_enabled; }
String getCurrentUserInitiatedProfileName(bool incrementProfileNumber = false);
- void getExactHeapSnapshotNodeRetainedSize(ErrorString*, unsigned long uid, unsigned long nodeId, long* size);
+ void getExactHeapSnapshotNodeRetainedSize(ErrorString*, unsigned uid, int nodeId, int* size);
void getProfileHeaders(ErrorString* error, RefPtr<InspectorArray>* headers);
void getProfile(ErrorString* error, const String& type, unsigned uid, RefPtr<InspectorObject>* profileObject);
bool isRecordingUserInitiatedProfile() { return m_recordingUserInitiatedProfile; }
diff --git a/Source/WebCore/inspector/InspectorResourceAgent.cpp b/Source/WebCore/inspector/InspectorResourceAgent.cpp
index 32fff75..ee35be2 100644
--- a/Source/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/Source/WebCore/inspector/InspectorResourceAgent.cpp
@@ -321,7 +321,7 @@
callStackValue = callStack->buildInspectorArray();
else
callStackValue = InspectorArray::create();
- m_frontend->identifierForInitialRequest(identifier, url.string(), loaderObject, callStackValue);
+ m_frontend->identifierForInitialRequest(static_cast<int>(identifier), url.string(), loaderObject, callStackValue);
}
void InspectorResourceAgent::setExtraHeaders(ErrorString*, PassRefPtr<InspectorObject> headers)
@@ -346,12 +346,12 @@
request.setReportLoadTiming(true);
request.setReportRawHeaders(true);
- m_frontend->willSendRequest(identifier, currentTime(), buildObjectForResourceRequest(request), buildObjectForResourceResponse(redirectResponse));
+ m_frontend->willSendRequest(static_cast<int>(identifier), currentTime(), buildObjectForResourceRequest(request), buildObjectForResourceResponse(redirectResponse));
}
void InspectorResourceAgent::markResourceAsCached(unsigned long identifier)
{
- m_frontend->markResourceAsCached(identifier);
+ m_frontend->markResourceAsCached(static_cast<int>(identifier));
}
void InspectorResourceAgent::didReceiveResponse(unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response)
@@ -374,7 +374,7 @@
else if (equalIgnoringFragmentIdentifier(response.url(), loader->url()) && type == "Other")
type = "Document";
}
- m_frontend->didReceiveResponse(identifier, currentTime(), type, resourceResponse);
+ m_frontend->didReceiveResponse(static_cast<int>(identifier), currentTime(), type, resourceResponse);
// If we revalidated the resource and got Not modified, send content length following didReceiveResponse
// as there will be no calls to didReceiveContentLength from the network stack.
if (cachedResourceSize && response.httpStatusCode() == 304)
@@ -383,7 +383,7 @@
void InspectorResourceAgent::didReceiveContentLength(unsigned long identifier, int lengthReceived)
{
- m_frontend->didReceiveContentLength(identifier, currentTime(), lengthReceived);
+ m_frontend->didReceiveContentLength(static_cast<int>(identifier), currentTime(), lengthReceived);
}
void InspectorResourceAgent::didFinishLoading(unsigned long identifier, double finishTime)
@@ -391,12 +391,12 @@
if (!finishTime)
finishTime = currentTime();
- m_frontend->didFinishLoading(identifier, finishTime);
+ m_frontend->didFinishLoading(static_cast<int>(identifier), finishTime);
}
void InspectorResourceAgent::didFailLoading(unsigned long identifier, const ResourceError& error)
{
- m_frontend->didFailLoading(identifier, currentTime(), error.localizedDescription());
+ m_frontend->didFailLoading(static_cast<int>(identifier), currentTime(), error.localizedDescription());
}
void InspectorResourceAgent::didLoadResourceFromMemoryCache(DocumentLoader* loader, const CachedResource* resource)
@@ -406,7 +406,7 @@
void InspectorResourceAgent::setInitialContent(unsigned long identifier, const String& sourceString, const String& type)
{
- m_frontend->setInitialContent(identifier, sourceString, type);
+ m_frontend->setInitialContent(static_cast<int>(identifier), sourceString, type);
}
static PassRefPtr<InspectorObject> buildObjectForFrame(Frame* frame)
@@ -474,7 +474,7 @@
void InspectorResourceAgent::didCreateWebSocket(unsigned long identifier, const KURL& requestURL)
{
- m_frontend->didCreateWebSocket(identifier, requestURL.string());
+ m_frontend->didCreateWebSocket(static_cast<int>(identifier), requestURL.string());
}
void InspectorResourceAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, const WebSocketHandshakeRequest& request)
@@ -482,7 +482,7 @@
RefPtr<InspectorObject> requestObject = InspectorObject::create();
requestObject->setObject("webSocketHeaderFields", buildObjectForHeaders(request.headerFields()));
requestObject->setString("webSocketRequestKey3", createReadableStringFromBinary(request.key3().value, sizeof(request.key3().value)));
- m_frontend->willSendWebSocketHandshakeRequest(identifier, currentTime(), requestObject);
+ m_frontend->willSendWebSocketHandshakeRequest(static_cast<int>(identifier), currentTime(), requestObject);
}
void InspectorResourceAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse& response)
@@ -492,12 +492,12 @@
responseObject->setString("statusText", response.statusText());
responseObject->setObject("webSocketHeaderFields", buildObjectForHeaders(response.headerFields()));
responseObject->setString("webSocketChallengeResponse", createReadableStringFromBinary(response.challengeResponse().value, sizeof(response.challengeResponse().value)));
- m_frontend->didReceiveWebSocketHandshakeResponse(identifier, currentTime(), responseObject);
+ m_frontend->didReceiveWebSocketHandshakeResponse(static_cast<int>(identifier), currentTime(), responseObject);
}
void InspectorResourceAgent::didCloseWebSocket(unsigned long identifier)
{
- m_frontend->didCloseWebSocket(identifier, currentTime());
+ m_frontend->didCloseWebSocket(static_cast<int>(identifier), currentTime());
}
#endif // ENABLE(WEB_SOCKETS)
diff --git a/Source/WebCore/inspector/generate-inspector-idl b/Source/WebCore/inspector/generate-inspector-idl
index a929a48..5712f40 100755
--- a/Source/WebCore/inspector/generate-inspector-idl
+++ b/Source/WebCore/inspector/generate-inspector-idl
@@ -74,9 +74,7 @@
type_traits = {
"string": "String",
"integer": "int",
- "long": "long",
- "unsigned": "unsigned long",
- "float": "double",
+ "number": "double",
"boolean": "boolean",
"object": "Object"
}
