Changeset 52897 in webkit

Timestamp:

Jan 6, 2010 8:01:26 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

[Qt] Add page zooming support to Qt DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=32898

Patch by Kim Grönholm <​kim.gronholm@nomovok.com>,

Diego Gonzalez <​diego.gonzalez@openbossa.org> and
Afonso Costa <​afonso.costa@openbossa.org> on 2010-01-06

Reviewed by Kenneth Christiansen.

WebKitTools:

• DumpRenderTree/qt/EventSenderQt.cpp:

(EventSender::zoomPageIn):
(EventSender::zoomPageOut):

• DumpRenderTree/qt/EventSenderQt.h:

LayoutTests:

• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/EventSenderQt.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-06  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] Add page zooming support to Qt DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=32898
+
+        Patch by Kim Grönholm  <kim.gronholm@nomovok.com>,
+                 Diego Gonzalez <diego.gonzalez@openbossa.org> and
+                 Afonso Costa <afonso.costa@openbossa.org>
+
+        * platform/qt/Skipped:
+
 2010-01-06  Jakub Wieczorek  <faw217@gmail.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -235 +235 @@
 fast/images/drag-svg-as-image.html
 fast/forms/slider-delete-while-dragging-thumb.html
-
-# ------- missing eventSender.zoomPageIn
-fast/events/clientXY-in-zoom-and-scroll.html
-fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html
-
-# ------- missing eventSender.zoomPageOut
-fast/dom/elementFromPoint-relative-to-viewport.html
 
 # ------- missing drag-and-drop support
@@ -1146 +1139 @@
 fast/dom/wrapper-classes.html
 fast/dom/HTMLDocument/hasFocus.html
+fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html
 fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html
 fast/dom/Range/range-expand.html

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-06  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] Add page zooming support to Qt DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=32898
+
+        Patch by Kim Grönholm  <kim.gronholm@nomovok.com>,
+                 Diego Gonzalez <diego.gonzalez@openbossa.org> and
+                 Afonso Costa <afonso.costa@openbossa.org>
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::zoomPageIn):
+        (EventSender::zoomPageOut):
+        * DumpRenderTree/qt/EventSenderQt.h:
+
 2010-01-06  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp

@@ -41 +41 @@
 #define KEYCODE_DOWNARROW   0xf701
 
+// Ports like Gtk and Windows expose a different approach for their zooming
+// API if compared to Qt: they have specific methods for zooming in and out,
+// as well as a settable zoom factor, while Qt has only a 'setZoomValue' method.
+// Hence Qt DRT adopts a fixed zoom-factor (1.2) for compatibility.
+#define ZOOM_STEP           1.2
+
 #define DRT_MESSAGE_DONE (QEvent::User + 1)
 
@@ -377 +383 @@
     }
 #endif
+}
+
+void EventSender::zoomPageIn()
+{
+    QWebFrame* frame = m_page->mainFrame();
+    if (frame)
+        frame->setZoomFactor(frame->zoomFactor() * ZOOM_STEP);
+}
+
+void EventSender::zoomPageOut()
+{
+    QWebFrame* frame = m_page->mainFrame();
+    if (frame)
+        frame->setZoomFactor(frame->zoomFactor() / ZOOM_STEP);
 }
 

trunk/WebKitTools/DumpRenderTree/qt/EventSenderQt.h

@@ -67 +67 @@
     void touchMove();
     void touchEnd();
+    void zoomPageIn();
+    void zoomPageOut();
     void clearTouchPoints();
     void releaseTouchPoint(int index);