Changeset 96411 in webkit

Timestamp:

Sep 30, 2011 11:44:46 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Support and keep track of extra windows (views).
​https://bugs.webkit.org/show_bug.cgi?id=68454

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-09-30
Reviewed by Antonio Gomes.

So far, window.open and related JavaScript code would not work, as
DRTView did not implementation
Ewk_View_Smart_Class::window_{open,close}. The default implementation
in ewk just returns the current window/view, which broke any
layouttest which relied on window.open.

We now properly create and remove these new views. Unfortunately, the
current way ewk works (and due to the fact that we cannot pass class
methods as function pointers to the EFL functions), DRTView needs to
know that DRTChrome exists and call `browser' directly in some points.

• DumpRenderTree/efl/DumpRenderTreeView.cpp:

(onWindowCreate):
(onWindowCloseDelayed):
(onWindowClose):
(drtViewTiledAdd):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/efl/DumpRenderTreeView.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-30  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [EFL] Support and keep track of extra windows (views).
+        https://bugs.webkit.org/show_bug.cgi?id=68454
+
+        Reviewed by Antonio Gomes.
+
+        So far, window.open and related JavaScript code would not work, as
+        DRTView did not implementation
+        Ewk_View_Smart_Class::window_{open,close}. The default implementation
+        in ewk just returns the current window/view, which broke any
+        layouttest which relied on window.open.
+
+        We now properly create and remove these new views. Unfortunately, the
+        current way ewk works (and due to the fact that we cannot pass class
+        methods as function pointers to the EFL functions), DRTView needs to
+        know that DRTChrome exists and call `browser' directly in some points.
+
+        * DumpRenderTree/efl/DumpRenderTreeView.cpp:
+        (onWindowCreate):
+        (onWindowCloseDelayed):
+        (onWindowClose):
+        (drtViewTiledAdd):
+
 2011-09-30  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp

@@ -27 +27 @@
 #include "DumpRenderTreeView.h"
 
+#include "DumpRenderTree.h"
+#include "DumpRenderTreeChrome.h"
+#include "LayoutTestController.h"
 #include <EWebKit.h>
+#include <Ecore.h>
 #include <Eina.h>
 #include <Evas.h>
@@ -59 +63 @@
 }
 
+static Evas_Object* onWindowCreate(Ewk_View_Smart_Data*, Eina_Bool, const Ewk_Window_Features*)
+{
+    return gLayoutTestController->canOpenWindows() ? browser->createNewWindow() : 0;
+}
+
+static Eina_Bool onWindowCloseDelayed(void* data)
+{
+    Evas_Object* view = static_cast<Evas_Object*>(data);
+    browser->removeWindow(view);
+    return EINA_FALSE;
+}
+
+static void onWindowClose(Ewk_View_Smart_Data* smartData)
+{
+    Evas_Object* view = smartData->self;
+    ecore_idler_add(onWindowCloseDelayed, view);
+}
+
 Evas_Object* drtViewTiledAdd(Evas* evas)
 {
@@ -73 +95 @@
     api.run_javascript_confirm = onJavaScriptConfirm;
     api.run_javascript_prompt = onJavaScriptPrompt;
+    api.window_create = onWindowCreate;
+    api.window_close = onWindowClose;
 
     return evas_object_smart_add(evas, evas_smart_class_new(&api.sc));