Changeset 110028 in webkit

Timestamp:

Mar 6, 2012 11:54:34 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][DRT] Implements LayoutTestController's setPopupBlockingEnabled.
​https://bugs.webkit.org/show_bug.cgi?id=80137

Patch by Grzegorz Czajkowski <​g.czajkowski@samsung.com> on 2012-03-06
Reviewed by Eric Seidel.

Tools:

Adds implementation LayoutTestController's setPopupBlockingEnabled.
To pass popup-blocking-click-in-iframe.html EventSender should not
repeat click events in idler's function. EventSender allows to
asynchronously send click event through ecore_idler_add.
This event will be called repeatedly as long as it return true.
Click event should be called only once by returning ECORE_CALLBACK_CANCEL.

• DumpRenderTree/efl/EventSender.cpp:

(sendMouseEvent): Changed return value from bool to void because it always returns true.
(sendClick): Idler is deleted by returning ECORE_CALLBACK_CANCEL.
(mouseDownCallback): Remove unnecessary checking of return value.

• DumpRenderTree/efl/LayoutTestControllerEfl.cpp:

(LayoutTestController::setPopupBlockingEnabled):

LayoutTests:

Enables tests connected with setPopupBlockingEnabled.

• platform/efl/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/EventSender.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-06  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [EFL][DRT] Implements LayoutTestController's setPopupBlockingEnabled.
+        https://bugs.webkit.org/show_bug.cgi?id=80137
+
+        Reviewed by Eric Seidel.
+
+        Enables tests connected with setPopupBlockingEnabled.
+
+        * platform/efl/Skipped:
+
 2012-03-06  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -554 +554 @@
 editing/selection/doubleclick-whitespace-img-crash.html
 editing/selection/doubleclick-whitespace.html
-
-# EFL's LayoutTestController does not implement setPopupBlockingEnabled
-fast/events/open-window-from-another-frame.html
-fast/events/popup-allowed-from-gesture-initiated-event.html
-fast/events/popup-allowed-from-gesture-initiated-form-submit.html
-fast/events/popup-blocked-from-fake-button-click.html
-fast/events/popup-blocked-from-fake-focus.html
-fast/events/popup-blocked-from-fake-user-gesture.html
-fast/events/popup-blocked-from-history-reload.html
-fast/events/popup-blocked-from-iframe-script.html
-fast/events/popup-blocked-from-iframe-src.html
-fast/events/popup-blocked-from-mousemove.html
-fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
-fast/events/popup-blocked-from-untrusted-mouse-click.html
-fast/events/popup-blocked-from-window-open.html
-fast/events/popup-blocked-to-post-blank.html
-fast/events/popup-blocking-click-in-iframe.html
-fast/events/popup-blocking-timers.html
-fast/events/popup-when-select-change.html
 
 # EFL's LayoutTestController does not implement elementDoesAutoCompleteForElementWithId

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-06  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [EFL][DRT] Implements LayoutTestController's setPopupBlockingEnabled.
+        https://bugs.webkit.org/show_bug.cgi?id=80137
+
+        Reviewed by Eric Seidel.
+
+        Adds implementation LayoutTestController's setPopupBlockingEnabled.
+        To pass popup-blocking-click-in-iframe.html EventSender should not
+        repeat click events in idler's function. EventSender allows to
+        asynchronously send click event through ecore_idler_add.
+        This event will be called repeatedly as long as it return true.
+        Click event should be called only once by returning ECORE_CALLBACK_CANCEL.
+
+        * DumpRenderTree/efl/EventSender.cpp:
+        (sendMouseEvent): Changed return value from bool to void because it always returns true.
+        (sendClick): Idler is deleted by returning ECORE_CALLBACK_CANCEL.
+        (mouseDownCallback): Remove unnecessary checking of return value.
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+        (LayoutTestController::setPopupBlockingEnabled):
+
 2012-03-06  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/DumpRenderTree/efl/EventSender.cpp

@@ -131 +131 @@
 }
 
-static bool sendMouseEvent(Evas* evas, EvasMouseEvent event, int buttonNumber, EvasKeyModifier modifiers)
+static void sendMouseEvent(Evas* evas, EvasMouseEvent event, int buttonNumber, EvasKeyModifier modifiers)
 {
     unsigned timeStamp = 0;
@@ -156 +156 @@
 
     setEvasModifiers(evas, EvasKeyModifierNone);
-
-    return true;
 }
 
 static Eina_Bool sendClick(void*)
 {
-    return !!sendMouseEvent(evas_object_evas_get(browser->mainFrame()), EvasMouseEventClick, EvasMouseButtonLeft, EvasKeyModifierNone);
+    sendMouseEvent(evas_object_evas_get(browser->mainFrame()), EvasMouseEventClick, EvasMouseButtonLeft, EvasKeyModifierNone);
+    return ECORE_CALLBACK_CANCEL;
 }
 
@@ -233 +232 @@
 
     EvasKeyModifier modifiers = argumentCount >= 2 ? modifiersFromJSValue(context, arguments[1]) : EvasKeyModifierNone;
-    if (!sendMouseEvent(evas_object_evas_get(browser->mainFrame()), EvasMouseEventDown, button, modifiers))
-        return JSValueMakeUndefined(context);
+    sendMouseEvent(evas_object_evas_get(browser->mainFrame()), EvasMouseEventDown, button, modifiers);
 
     gButtonCurrentlyDown = button;

trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

@@ -437 +437 @@
 }
 
-void LayoutTestController::setPopupBlockingEnabled(bool)
-{
-    notImplemented();
+void LayoutTestController::setPopupBlockingEnabled(bool flag)
+{
+    ewk_view_setting_scripts_can_open_windows_set(browser->mainView(), !flag);
 }