Changeset 91898 in webkit

Timestamp:

Jul 27, 2011, 9:08:40 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Drop WorkQueueItemEfl.h in favour of the general WorkQueueItem.h
​https://bugs.webkit.org/show_bug.cgi?id=65269

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-07-27
Reviewed by Kent Tamura.

WorkQueueItemEfl.h was being included by efl's
LayoutTestControllerEfl.cpp, however the top-level
LayoutTestController still included WorkQueueItem.h, causing a lot of
type mismatches when running the WorkQueueItem code.

We can stick to the original WorkQueueItem header by making a few
changes to EFL's LayoutTestController.

This should make tests such as
fast/loader/non-deferred-substitute-load.html stop crashing.

• DumpRenderTree/efl/LayoutTestControllerEfl.cpp:

(LayoutTestController::queueLoad):

• DumpRenderTree/efl/WorkQueueItemEfl.cpp:

(LoadItem::invoke):
(LoadHTMLStringItem::invoke):
(ScriptItem::invoke):

• DumpRenderTree/efl/WorkQueueItemEfl.h: Removed.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/efl/LayoutTestControllerEfl.cpp (modified) (2 diffs)
• DumpRenderTree/efl/WorkQueueItemEfl.cpp (modified) (5 diffs)
• DumpRenderTree/efl/WorkQueueItemEfl.h (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-27  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [EFL] Drop WorkQueueItemEfl.h in favour of the general WorkQueueItem.h
+        https://bugs.webkit.org/show_bug.cgi?id=65269
+
+        Reviewed by Kent Tamura.
+
+        WorkQueueItemEfl.h was being included by efl's
+        LayoutTestControllerEfl.cpp, however the top-level
+        LayoutTestController still included WorkQueueItem.h, causing a lot of
+        type mismatches when running the WorkQueueItem code.
+
+        We can stick to the original WorkQueueItem header by making a few
+        changes to EFL's LayoutTestController.
+
+        This should make tests such as
+        fast/loader/non-deferred-substitute-load.html stop crashing.
+
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+        (LayoutTestController::queueLoad):
+        * DumpRenderTree/efl/WorkQueueItemEfl.cpp:
+        (LoadItem::invoke):
+        (LoadHTMLStringItem::invoke):
+        (ScriptItem::invoke):
+        * DumpRenderTree/efl/WorkQueueItemEfl.h: Removed.
+
 2011-07-27  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

@@ -42 +42 @@
 #include "OwnFastMallocPtr.h"
 #include "WorkQueue.h"
-#include "WorkQueueItemEfl.h"
+#include "WorkQueueItem.h"
 #include "ewk_private.h"
 #include <EWebKit.h>
@@ -177 +177 @@
     String absoluteUrl = String::fromUTF8(ewk_frame_uri_get(mainFrame));
     absoluteUrl.append(url->characters(), url->length());
-    String targetString(target->characters(), target->length());
-
-    WorkQueue::shared()->queue(new LoadItem(absoluteUrl, targetString));
+
+    JSRetainPtr<JSStringRef> jsAbsoluteURL(
+        Adopt, JSStringCreateWithUTF8CString(absoluteUrl.utf8().data()));
+
+    WorkQueue::shared()->queue(new LoadItem(jsAbsoluteURL.get(), target));
 }
 

trunk/Tools/DumpRenderTree/efl/WorkQueueItemEfl.cpp

@@ -21 +21 @@
 
 #include "config.h"
-#include "WorkQueueItemEfl.h"
+#include "WorkQueueItem.h"
 
 #include "DumpRenderTree.h"
@@ -27 +27 @@
 #include <EWebKit.h>
 #include <JavaScriptCore/JSStringRef.h>
+#include <JavaScriptCore/OpaqueJSString.h>
+#include <JavaScriptCore/runtime/UString.h>
 #include <JavaScriptCore/wtf/text/CString.h>
 
@@ -33 +35 @@
     Evas_Object* targetFrame;
 
-    if (m_target.isEmpty())
+    if (!m_target->length())
         targetFrame = mainFrame;
     else
-        targetFrame = ewk_frame_child_find(mainFrame, m_target.utf8().data());
+        targetFrame = ewk_frame_child_find(mainFrame, m_target->ustring().utf8().data());
 
-    ewk_frame_uri_set(targetFrame, m_url.utf8().data());
+    ewk_frame_uri_set(targetFrame, m_url->ustring().utf8().data());
 
     return true;
@@ -45 +47 @@
 bool LoadHTMLStringItem::invoke() const
 {
-    if (m_unreachableURL.isEmpty())
-        ewk_frame_contents_set(mainFrame, m_content.utf8().data(), 0, 0, 0, m_baseURL.utf8().data());
+    if (!m_unreachableURL->length())
+        ewk_frame_contents_set(mainFrame, m_content->ustring().utf8().data(), 0, 0, 0, m_baseURL->ustring().utf8().data());
     else
-        ewk_frame_contents_alternate_set(mainFrame, m_content.utf8().data(), 0, 0, 0, m_baseURL.utf8().data(), m_unreachableURL.utf8().data());
+        ewk_frame_contents_alternate_set(mainFrame, m_content->ustring().utf8().data(), 0, 0, 0, m_baseURL->ustring().utf8().data(), m_unreachableURL->ustring().utf8().data());
 
     return true;
@@ -61 +63 @@
 bool ScriptItem::invoke() const
 {
-    return ewk_frame_script_execute(mainFrame, m_script.utf8().data());
+    return ewk_frame_script_execute(mainFrame, m_script->ustring().utf8().data());
 }