[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
oliver at apple.com
oliver at apple.com
Thu Apr 8 00:13:15 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 3ac3ec8d7c321b339b4552617f623cbdaa7d166b
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 3 05:20:24 2009 +0000
Web Inspector frontend heap allocates ScriptFunctionCall which is unsafe
https://bugs.webkit.org/show_bug.cgi?id=32098
Reviewed by Sam Weinig.
Fix is simply to make the ScriptFunctionCall stack allocated as nature intended
Doing this required adding an appendArgument(char*) to ScriptFunctionCall so
that an explicit String cast would not be necessary.
To prevent something like this happening again in future i've added private
operator new implementations to ScriptFunctionCall making this type of mistake
produce errors when compiling.
Test case: Inspector tests now pass with GC on every alloc enabled.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1450a12..2773432 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,67 @@
+2009-12-02 Oliver Hunt <oliver at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Web Inspector frontend heap allocates ScriptFunctionCall which is unsafe
+ https://bugs.webkit.org/show_bug.cgi?id=32098
+
+ Fix is simply to make the ScriptFunctionCall stack allocated as nature intended.
+ Doing this required adding an appendArgument(char*) to ScriptFunctionCall so
+ that an explicit String cast would not be necessary.
+
+ To prevent something like this happening again in future i've added private
+ operator new implementations to ScriptFunctionCall making this type of mistake
+ produce errors when compiling.
+
+ Test case: Inspector tests now pass with GC on every alloc enabled.
+
+ * bindings/js/ScriptFunctionCall.cpp:
+ (WebCore::ScriptFunctionCall::appendArgument):
+ * bindings/js/ScriptFunctionCall.h:
+ (WebCore::ScriptFunctionCall::operator new):
+ (WebCore::ScriptFunctionCall::operator new[]):
+ * inspector/InspectorFrontend.cpp:
+ (WebCore::InspectorFrontend::addConsoleMessage):
+ (WebCore::InspectorFrontend::updateConsoleMessageRepeatCount):
+ (WebCore::InspectorFrontend::addResource):
+ (WebCore::InspectorFrontend::updateResource):
+ (WebCore::InspectorFrontend::removeResource):
+ (WebCore::InspectorFrontend::updateFocusedNode):
+ (WebCore::InspectorFrontend::setAttachedWindow):
+ (WebCore::InspectorFrontend::addRecordToTimeline):
+ (WebCore::InspectorFrontend::parsedScriptSource):
+ (WebCore::InspectorFrontend::failedToParseScriptSource):
+ (WebCore::InspectorFrontend::addProfileHeader):
+ (WebCore::InspectorFrontend::setRecordingProfile):
+ (WebCore::InspectorFrontend::didGetProfileHeaders):
+ (WebCore::InspectorFrontend::didGetProfile):
+ (WebCore::InspectorFrontend::pausedScript):
+ (WebCore::InspectorFrontend::setDocument):
+ (WebCore::InspectorFrontend::setDetachedRoot):
+ (WebCore::InspectorFrontend::setChildNodes):
+ (WebCore::InspectorFrontend::childNodeCountUpdated):
+ (WebCore::InspectorFrontend::childNodeInserted):
+ (WebCore::InspectorFrontend::childNodeRemoved):
+ (WebCore::InspectorFrontend::attributesUpdated):
+ (WebCore::InspectorFrontend::didRemoveNode):
+ (WebCore::InspectorFrontend::didGetChildNodes):
+ (WebCore::InspectorFrontend::didApplyDomChange):
+ (WebCore::InspectorFrontend::didGetEventListenersForNode):
+ (WebCore::InspectorFrontend::didGetCookies):
+ (WebCore::InspectorFrontend::didDispatchOnInjectedScript):
+ (WebCore::InspectorFrontend::addDatabase):
+ (WebCore::InspectorFrontend::selectDatabase):
+ (WebCore::InspectorFrontend::didGetDatabaseTableNames):
+ (WebCore::InspectorFrontend::addDOMStorage):
+ (WebCore::InspectorFrontend::selectDOMStorage):
+ (WebCore::InspectorFrontend::didGetDOMStorageEntries):
+ (WebCore::InspectorFrontend::didSetDOMStorageItem):
+ (WebCore::InspectorFrontend::didRemoveDOMStorageItem):
+ (WebCore::InspectorFrontend::updateDOMStorage):
+ (WebCore::InspectorFrontend::addNodesToSearchResult):
+ (WebCore::InspectorFrontend::evaluateForTestInFrontend):
+ * inspector/InspectorFrontend.h:
+
2009-12-02 Dave Hyatt <hyatt at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/bindings/js/ScriptFunctionCall.cpp b/WebCore/bindings/js/ScriptFunctionCall.cpp
index 3bac089..e38acb9 100644
--- a/WebCore/bindings/js/ScriptFunctionCall.cpp
+++ b/WebCore/bindings/js/ScriptFunctionCall.cpp
@@ -72,6 +72,13 @@ void ScriptFunctionCall::appendArgument(const String& argument)
void ScriptFunctionCall::appendArgument(const JSC::UString& argument)
{
+ JSLock lock(SilenceAssertionsOnly);
+ m_arguments.append(jsString(m_exec, argument));
+}
+
+void ScriptFunctionCall::appendArgument(const char* argument)
+{
+ JSLock lock(SilenceAssertionsOnly);
m_arguments.append(jsString(m_exec, argument));
}
diff --git a/WebCore/bindings/js/ScriptFunctionCall.h b/WebCore/bindings/js/ScriptFunctionCall.h
index e10c758..7c5074f 100644
--- a/WebCore/bindings/js/ScriptFunctionCall.h
+++ b/WebCore/bindings/js/ScriptFunctionCall.h
@@ -55,6 +55,7 @@ namespace WebCore {
void appendArgument(const ScriptString&);
void appendArgument(const ScriptValue&);
void appendArgument(const String&);
+ void appendArgument(const char*);
void appendArgument(const JSC::UString&);
void appendArgument(JSC::JSValue);
void appendArgument(long);
@@ -72,6 +73,12 @@ namespace WebCore {
ScriptObject m_thisObject;
String m_name;
JSC::MarkedArgumentBuffer m_arguments;
+
+ private:
+ // MarkedArgumentBuffer must be stack allocated, so prevent heap
+ // alloc of ScriptFunctionCall as well.
+ void* operator new(size_t) { ASSERT_NOT_REACHED(); return reinterpret_cast<void*>(0xbadbeef); }
+ void* operator new[](size_t) { ASSERT_NOT_REACHED(); return reinterpret_cast<void*>(0xbadbeef); }
};
} // namespace WebCore
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index baa8318..5dba52c 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -79,24 +79,26 @@ void InspectorFrontend::didCommitLoad()
void InspectorFrontend::addConsoleMessage(const ScriptObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addConsoleMessage"));
- function->appendArgument(messageObj);
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addConsoleMessage");
+ function.appendArgument(messageObj);
if (!frames.isEmpty()) {
for (unsigned i = 0; i < frames.size(); ++i)
- function->appendArgument(frames[i]);
+ function.appendArgument(frames[i]);
} else if (!wrappedArguments.isEmpty()) {
for (unsigned i = 0; i < wrappedArguments.size(); ++i)
- function->appendArgument(m_inspectorController->wrapObject(wrappedArguments[i], "console"));
+ function.appendArgument(m_inspectorController->wrapObject(wrappedArguments[i], "console"));
} else
- function->appendArgument(message);
- function->call();
+ function.appendArgument(message);
+ function.call();
}
void InspectorFrontend::updateConsoleMessageRepeatCount(const int count)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateConsoleMessageRepeatCount"));
- function->appendArgument(count);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("updateConsoleMessageRepeatCount");
+ function.appendArgument(count);
+ function.call();
}
void InspectorFrontend::clearConsoleMessages()
@@ -106,43 +108,48 @@ void InspectorFrontend::clearConsoleMessages()
bool InspectorFrontend::addResource(unsigned long identifier, const ScriptObject& resourceObj)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addResource"));
- function->appendArgument(identifier);
- function->appendArgument(resourceObj);
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addResource");
+ function.appendArgument(identifier);
+ function.appendArgument(resourceObj);
bool hadException = false;
- function->call(hadException);
+ function.call(hadException);
return !hadException;
}
bool InspectorFrontend::updateResource(unsigned long identifier, const ScriptObject& resourceObj)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateResource"));
- function->appendArgument(identifier);
- function->appendArgument(resourceObj);
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("updateResource");
+ function.appendArgument(identifier);
+ function.appendArgument(resourceObj);
bool hadException = false;
- function->call(hadException);
+ function.call(hadException);
return !hadException;
}
void InspectorFrontend::removeResource(unsigned long identifier)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("removeResource"));
- function->appendArgument(identifier);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("removeResource");
+ function.appendArgument(identifier);
+ function.call();
}
void InspectorFrontend::updateFocusedNode(long nodeId)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateFocusedNode"));
- function->appendArgument(nodeId);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("updateFocusedNode");
+ function.appendArgument(nodeId);
+ function.call();
}
void InspectorFrontend::setAttachedWindow(bool attached)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("setAttachedWindow"));
- function->appendArgument(attached);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("setAttachedWindow");
+ function.appendArgument(attached);
+ function.call();
}
void InspectorFrontend::showPanel(int panel)
@@ -211,9 +218,10 @@ void InspectorFrontend::timelineProfilerWasStopped()
void InspectorFrontend::addRecordToTimeline(const ScriptObject& record)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addRecordToTimeline"));
- function->appendArgument(record);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addRecordToTimeline");
+ function.appendArgument(record);
+ function.call();
}
#if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -244,60 +252,67 @@ void InspectorFrontend::profilerWasDisabled()
void InspectorFrontend::parsedScriptSource(const JSC::SourceCode& source)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("parsedScriptSource"));
- function->appendArgument(JSC::UString(JSC::UString::from(source.provider()->asID())));
- function->appendArgument(source.provider()->url());
- function->appendArgument(JSC::UString(source.data(), source.length()));
- function->appendArgument(source.firstLine());
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("parsedScriptSource");
+ function.appendArgument(JSC::UString(JSC::UString::from(source.provider()->asID())));
+ function.appendArgument(source.provider()->url());
+ function.appendArgument(JSC::UString(source.data(), source.length()));
+ function.appendArgument(source.firstLine());
+ function.call();
}
void InspectorFrontend::failedToParseScriptSource(const JSC::SourceCode& source, int errorLine, const JSC::UString& errorMessage)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("failedToParseScriptSource"));
- function->appendArgument(source.provider()->url());
- function->appendArgument(JSC::UString(source.data(), source.length()));
- function->appendArgument(source.firstLine());
- function->appendArgument(errorLine);
- function->appendArgument(errorMessage);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("failedToParseScriptSource");
+ function.appendArgument(source.provider()->url());
+ function.appendArgument(JSC::UString(source.data(), source.length()));
+ function.appendArgument(source.firstLine());
+ function.appendArgument(errorLine);
+ function.appendArgument(errorMessage);
+ function.call();
}
void InspectorFrontend::addProfileHeader(const ScriptValue& profile)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addProfileHeader"));
- function->appendArgument(profile);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addProfileHeader");
+ function.appendArgument(profile);
+ function.call();
}
void InspectorFrontend::setRecordingProfile(bool isProfiling)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("setRecordingProfile"));
- function->appendArgument(isProfiling);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("setRecordingProfile");
+ function.appendArgument(isProfiling);
+ function.call();
}
void InspectorFrontend::didGetProfileHeaders(int callId, const ScriptArray& headers)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetProfileHeaders"));
- function->appendArgument(callId);
- function->appendArgument(headers);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetProfileHeaders");
+ function.appendArgument(callId);
+ function.appendArgument(headers);
+ function.call();
}
void InspectorFrontend::didGetProfile(int callId, const ScriptValue& profile)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetProfile"));
- function->appendArgument(callId);
- function->appendArgument(profile);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetProfile");
+ function.appendArgument(callId);
+ function.appendArgument(profile);
+ function.call();
}
void InspectorFrontend::pausedScript(const ScriptValue& callFrames)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("pausedScript"));
- function->appendArgument(callFrames);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("pausedScript");
+ function.appendArgument(callFrames);
+ function.call();
}
void InspectorFrontend::resumedScript()
@@ -308,203 +323,220 @@ void InspectorFrontend::resumedScript()
void InspectorFrontend::setDocument(const ScriptObject& root)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("setDocument"));
- function->appendArgument(root);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("setDocument");
+ function.appendArgument(root);
+ function.call();
}
void InspectorFrontend::setDetachedRoot(const ScriptObject& root)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("setDetachedRoot"));
- function->appendArgument(root);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("setDetachedRoot");
+ function.appendArgument(root);
+ function.call();
}
void InspectorFrontend::setChildNodes(int parentId, const ScriptArray& nodes)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("setChildNodes"));
- function->appendArgument(parentId);
- function->appendArgument(nodes);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("setChildNodes");
+ function.appendArgument(parentId);
+ function.appendArgument(nodes);
+ function.call();
}
void InspectorFrontend::childNodeCountUpdated(int id, int newValue)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("childNodeCountUpdated"));
- function->appendArgument(id);
- function->appendArgument(newValue);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("childNodeCountUpdated");
+ function.appendArgument(id);
+ function.appendArgument(newValue);
+ function.call();
}
void InspectorFrontend::childNodeInserted(int parentId, int prevId, const ScriptObject& node)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("childNodeInserted"));
- function->appendArgument(parentId);
- function->appendArgument(prevId);
- function->appendArgument(node);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("childNodeInserted");
+ function.appendArgument(parentId);
+ function.appendArgument(prevId);
+ function.appendArgument(node);
+ function.call();
}
void InspectorFrontend::childNodeRemoved(int parentId, int id)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("childNodeRemoved"));
- function->appendArgument(parentId);
- function->appendArgument(id);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("childNodeRemoved");
+ function.appendArgument(parentId);
+ function.appendArgument(id);
+ function.call();
}
void InspectorFrontend::attributesUpdated(int id, const ScriptArray& attributes)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("attributesUpdated"));
- function->appendArgument(id);
- function->appendArgument(attributes);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("attributesUpdated");
+ function.appendArgument(id);
+ function.appendArgument(attributes);
+ function.call();
}
void InspectorFrontend::didRemoveNode(int callId, int nodeId)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didRemoveNode"));
- function->appendArgument(callId);
- function->appendArgument(nodeId);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didRemoveNode");
+ function.appendArgument(callId);
+ function.appendArgument(nodeId);
+ function.call();
}
void InspectorFrontend::didGetChildNodes(int callId)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetChildNodes"));
- function->appendArgument(callId);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetChildNodes");
+ function.appendArgument(callId);
+ function.call();
}
void InspectorFrontend::didApplyDomChange(int callId, bool success)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didApplyDomChange"));
- function->appendArgument(callId);
- function->appendArgument(success);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didApplyDomChange");
+ function.appendArgument(callId);
+ function.appendArgument(success);
+ function.call();
}
void InspectorFrontend::didGetEventListenersForNode(int callId, int nodeId, ScriptArray& listenersArray)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetEventListenersForNode"));
- function->appendArgument(callId);
- function->appendArgument(nodeId);
- function->appendArgument(listenersArray);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetEventListenersForNode");
+ function.appendArgument(callId);
+ function.appendArgument(nodeId);
+ function.appendArgument(listenersArray);
+ function.call();
}
void InspectorFrontend::didGetCookies(int callId, const ScriptArray& cookies, const String& cookiesString)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetCookies"));
- function->appendArgument(callId);
- function->appendArgument(cookies);
- function->appendArgument(cookiesString);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetCookies");
+ function.appendArgument(callId);
+ function.appendArgument(cookies);
+ function.appendArgument(cookiesString);
+ function.call();
}
void InspectorFrontend::didDispatchOnInjectedScript(int callId, const String& result, bool isException)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didDispatchOnInjectedScript"));
- function->appendArgument(callId);
- function->appendArgument(result);
- function->appendArgument(isException);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didDispatchOnInjectedScript");
+ function.appendArgument(callId);
+ function.appendArgument(result);
+ function.appendArgument(isException);
+ function.call();
}
#if ENABLE(DATABASE)
bool InspectorFrontend::addDatabase(const ScriptObject& dbObject)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDatabase"));
- function->appendArgument(dbObject);
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addDatabase");
+ function.appendArgument(dbObject);
bool hadException = false;
- function->call(hadException);
+ function.call(hadException);
return !hadException;
}
void InspectorFrontend::selectDatabase(int databaseId)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("selectDatabase"));
- function->appendArgument(databaseId);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("selectDatabase");
+ function.appendArgument(databaseId);
+ function.call();
}
void InspectorFrontend::didGetDatabaseTableNames(int callId, const ScriptArray& tableNames)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetDatabaseTableNames"));
- function->appendArgument(callId);
- function->appendArgument(tableNames);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetDatabaseTableNames");
+ function.appendArgument(callId);
+ function.appendArgument(tableNames);
+ function.call();
}
#endif
#if ENABLE(DOM_STORAGE)
bool InspectorFrontend::addDOMStorage(const ScriptObject& domStorageObj)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDOMStorage"));
- function->appendArgument(domStorageObj);
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addDOMStorage");
+ function.appendArgument(domStorageObj);
bool hadException = false;
- function->call(hadException);
+ function.call(hadException);
return !hadException;
}
void InspectorFrontend::selectDOMStorage(int storageId)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("selectDOMStorage"));
- function->appendArgument(storageId);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("selectDOMStorage");
+ function.appendArgument(storageId);
+ function.call();
}
void InspectorFrontend::didGetDOMStorageEntries(int callId, const ScriptArray& entries)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didGetDOMStorageEntries"));
- function->appendArgument(callId);
- function->appendArgument(entries);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didGetDOMStorageEntries");
+ function.appendArgument(callId);
+ function.appendArgument(entries);
+ function.call();
}
void InspectorFrontend::didSetDOMStorageItem(int callId, bool success)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didSetDOMStorageItem"));
- function->appendArgument(callId);
- function->appendArgument(success);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didSetDOMStorageItem");
+ function.appendArgument(callId);
+ function.appendArgument(success);
+ function.call();
}
void InspectorFrontend::didRemoveDOMStorageItem(int callId, bool success)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("didRemoveDOMStorageItem"));
- function->appendArgument(callId);
- function->appendArgument(success);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("didRemoveDOMStorageItem");
+ function.appendArgument(callId);
+ function.appendArgument(success);
+ function.call();
}
void InspectorFrontend::updateDOMStorage(int storageId)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateDOMStorage"));
- function->appendArgument(storageId);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("updateDOMStorage");
+ function.appendArgument(storageId);
+ function.call();
}
#endif
void InspectorFrontend::addNodesToSearchResult(const String& nodeIds)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("addNodesToSearchResult"));
- function->appendArgument(nodeIds);
- function->call();
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("addNodesToSearchResult");
+ function.appendArgument(nodeIds);
+ function.call();
}
void InspectorFrontend::evaluateForTestInFrontend(int callId, const String& script)
{
- OwnPtr<ScriptFunctionCall> function(newFunctionCall("evaluateForTestInFrontend"));
- function->appendArgument(callId);
- function->appendArgument(script);
- function->call();
-}
-
-PassOwnPtr<ScriptFunctionCall> InspectorFrontend::newFunctionCall(const String& functionName)
-{
- ScriptFunctionCall* function = new ScriptFunctionCall(m_scriptState, m_webInspector, "dispatch");
- function->appendArgument(functionName);
- return function;
+ ScriptFunctionCall function(m_scriptState, m_webInspector, "dispatch");
+ function.appendArgument("evaluateForTestInFrontend");
+ function.appendArgument(callId);
+ function.appendArgument(script);
+ function.call();
}
void InspectorFrontend::callSimpleFunction(const String& functionName)
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index c318f04..2c53c52 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -136,7 +136,6 @@ namespace WebCore {
void evaluateForTestInFrontend(int callId, const String& script);
private:
- PassOwnPtr<ScriptFunctionCall> newFunctionCall(const String& functionName);
void callSimpleFunction(const String& functionName);
InspectorController* m_inspectorController;
ScriptState* m_scriptState;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list