Changeset 56316 in webkit

Timestamp:

Mar 21, 2010, 12:09:40 PM (15 years ago)

Author:

Martin Robinson

Message:

2010-03-20 Martin Robinson <Martin Robinson>

Reviewed by Xan Lopez

[GTK] eventSender.zoomPageOut() bug?
​https://bugs.webkit.org/show_bug.cgi?id=30575

Unskip some tests that were failing because of the bug in DRT.

• platform/gtk/Skipped:

2010-03-20 Martin Robinson <Martin Robinson>

Reviewed by Xan Lopez.

[GTK] eventSender.zoomPageOut() bug?
​https://bugs.webkit.org/show_bug.cgi?id=30575

Make zoomPage{In/Out}Callback respect the 1.2f zoom factor that DRT should be using.

• DumpRenderTree/gtk/EventSender.cpp: (zoomIn): Added. (zoomOut): Added. (textZoomInCallback): Use zoomIn helper function. (textZoomOutCallback): Use zoomOut helper function. (zoomPageInCallback): Use zoomIn helper function, which respects zoom factor. (zoomPageOutCallback): Use zoomOut helper function, which respects zoom factor.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (3 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-20  Martin Robinson  <mrobinson@webkit.org>
+
+        Reviewed by Xan Lopez
+
+        [GTK] eventSender.zoomPageOut() bug?
+        https://bugs.webkit.org/show_bug.cgi?id=30575
+
+        Unskip some tests that were failing because of the bug in DRT.
+
+        * platform/gtk/Skipped:
+
 2010-03-20  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -1279 +1279 @@
 fast/css/invalid-percentage-property.html
 fast/css/text-align.html
-fast/css/zoom-body-scroll.html
 fast/css/getComputedStyle/computed-style-without-renderer.html
 fast/css/getComputedStyle/computed-style.html
@@ -1465 +1464 @@
 
 # Possible bug in eventSender.zoomPageOut() ? https://bugs.webkit.org/show_bug.cgi?id=30575
-fast/events/clientXY-in-zoom-and-scroll.html
 fast/dom/elementFromPoint-relative-to-viewport.html
 
@@ -5809 +5807 @@
 http/tests/cookies/third-party-cookie-relaxing.html
 
-# Needs double click support in DRT
-# See https://bugs.webkit.org/show_bug.cgi?id=35862
-fast/events/zoom-dblclick.html
-
 # For some reason crashes when run with all tests. Passes individually.
 fast/forms/multiple-form-submission-protection-mouse.html

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-20  Martin Robinson  <mrobinson@webkit.org>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] eventSender.zoomPageOut() bug?
+        https://bugs.webkit.org/show_bug.cgi?id=30575
+
+        Make zoomPage{In/Out}Callback respect the 1.2f zoom factor that DRT should be using.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (zoomIn): Added.
+        (zoomOut): Added.
+        (textZoomInCallback): Use zoomIn helper function.
+        (textZoomOutCallback): Use zoomOut helper function.
+        (zoomPageInCallback): Use zoomIn helper function, which respects zoom factor.
+        (zoomPageOutCallback): Use zoomOut helper function, which respects zoom factor.
+
 2010-03-20  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -578 +578 @@
 }
 
-static JSValueRef textZoomInCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
-    if (!view)
-        return JSValueMakeUndefined(context);
-
+static void zoomIn(gboolean fullContentsZoom)
+{
+    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+    if (!view)
+        return;
+
+    webkit_web_view_set_full_content_zoom(view, fullContentsZoom);
     gfloat currentZoom = webkit_web_view_get_zoom_level(view);
     webkit_web_view_set_zoom_level(view, currentZoom * zoomMultiplierRatio);
-
-    return JSValueMakeUndefined(context);
-}
-
-static JSValueRef textZoomOutCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
-    if (!view)
-        return JSValueMakeUndefined(context);
-
+}
+
+static void zoomOut(gboolean fullContentsZoom)
+{
+    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+    if (!view)
+        return;
+
+    webkit_web_view_set_full_content_zoom(view, fullContentsZoom);
     gfloat currentZoom = webkit_web_view_get_zoom_level(view);
     webkit_web_view_set_zoom_level(view, currentZoom / zoomMultiplierRatio);
-
+}
+
+static JSValueRef textZoomInCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    zoomIn(FALSE);
+    return JSValueMakeUndefined(context);
+}
+
+static JSValueRef textZoomOutCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    zoomOut(FALSE);
     return JSValueMakeUndefined(context);
 }
@@ -604 +614 @@
 static JSValueRef zoomPageInCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
-    if (!view)
-        return JSValueMakeUndefined(context);
-
-    webkit_web_view_zoom_in(view);
+    zoomIn(TRUE);
     return JSValueMakeUndefined(context);
 }
@@ -614 +620 @@
 static JSValueRef zoomPageOutCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
-    if (!view)
-        return JSValueMakeUndefined(context);
-
-    webkit_web_view_zoom_out(view);
+    zoomOut(TRUE);
     return JSValueMakeUndefined(context);
 }