Changeset 146976 in webkit for trunk/Source/JavaScriptCore/API/JSStringRefQt.cpp

Timestamp:

Mar 27, 2013, 4:04:04 AM (12 years ago)

Author:

[email protected]

Message:

[Qt] Remove Qt specific WorkQueueItem definitions.
​https://bugs.webkit.org/show_bug.cgi?id=112891

This patch is preparation work for removing
WorkQueue related code from TestRunnerQt and
replacing it with generic TestRunner code.

Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

• API/JSStringRefQt.cpp:

(JSStringCreateWithQString):

Adding a convenience function to create a
JSStringRef from a QString.

• API/JSStringRefQt.h:

Tools:

• DumpRenderTree/qt/TestRunnerQt.cpp:

(TestRunnerQt::queueBackNavigation):
(TestRunnerQt::queueForwardNavigation):
(TestRunnerQt::queueLoadHTMLString):
(TestRunnerQt::queueReload):
(TestRunnerQt::queueLoadingScript):
(TestRunnerQt::queueNonLoadingScript):
(TestRunner::queueLoad):

• DumpRenderTree/qt/TestRunnerQt.h:

(TestRunnerQt):

• DumpRenderTree/qt/WorkQueueItemQt.cpp:

(LoadItem::invoke):
(LoadHTMLStringItem::invoke):
(LoadAlternateHTMLStringItem::invoke):
(ReloadItem::invoke):
(ScriptItem::invoke):
(BackForwardItem::invoke):

• DumpRenderTree/qt/WorkQueueItemQt.h:

(LoadAlternateHTMLStringItem::LoadAlternateHTMLStringItem):
(LoadAlternateHTMLStringItem):

File:

• trunk/Source/JavaScriptCore/API/JSStringRefQt.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSStringRefQt.cpp

@@ -39 +39 @@
     return string->qString();
 }
+
+JSRetainPtr<JSStringRef> JSStringCreateWithQString(const QString& qString)
+{
+    RefPtr<OpaqueJSString> jsString = OpaqueJSString::create(qString);
+
+    if (jsString)
+        return JSRetainPtr<JSStringRef>(Adopt, jsString.release().leakRef());
+
+    return JSRetainPtr<JSStringRef>(Adopt, OpaqueJSString::create().leakRef());
+}