[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[tonikitoo at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 12ae21fb4b90098ab109f4a4b29511efb61289cb
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 04:01:26 2010 +0000

    [Qt] Add page zooming support to Qt DumpRenderTree
    https://bugs.webkit.org/show_bug.cgi?id=32898
    
    Patch by Kim Grönholm  <kim.gronholm at nomovok.com>,
             Diego Gonzalez <diego.gonzalez at openbossa.org> and
             Afonso Costa <afonso.costa at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 52f7735..21b6c4b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-06  Diego Gonzalez  <diego.gonzalez at 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 at nomovok.com>,
+                 Diego Gonzalez <diego.gonzalez at openbossa.org> and
+                 Afonso Costa <afonso.costa at openbossa.org>
+
+        * platform/qt/Skipped:
+
 2010-01-06  Jakub Wieczorek  <faw217 at gmail.com>
 
         Reviewed by Adam Treat.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 8db09b3..7bb7c33 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -235,13 +235,6 @@ http/tests/security/clipboard/clipboard-file-access.html
 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
 # See bug https://bugs.webkit.org/show_bug.cgi?id=31332
 fast/events/drag-parent-node.html
@@ -1145,6 +1138,7 @@ fast/dom/frame-loading-via-document-write.html
 fast/dom/set-frame-src-while-running-script-in-frame.html
 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
 fast/dynamic/move-node-with-selection.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eb81000..a72dcb5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-06  Diego Gonzalez  <diego.gonzalez at 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 at nomovok.com>,
+                 Diego Gonzalez <diego.gonzalez at openbossa.org> and
+                 Afonso Costa <afonso.costa at openbossa.org>
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::zoomPageIn):
+        (EventSender::zoomPageOut):
+        * DumpRenderTree/qt/EventSenderQt.h:
+
 2010-01-06  Eric Seidel  <eric at webkit.org>
 
         No review, just adding Mike Belshe's new bugzilla email at his request.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index 13c3419..22b8ff3 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -40,6 +40,12 @@
 #define KEYCODE_UPARROW     0xf700
 #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)
 
 struct DRTEventQueue {
@@ -378,6 +384,20 @@ void EventSender::sendTouchEvent(QEvent::Type type)
 #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);
+}
+
 QWebFrame* EventSender::frameUnderMouse() const
 {
     QWebFrame* frame = m_page->mainFrame();
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
index 0a30cd5..ab51912 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
@@ -66,6 +66,8 @@ public slots:
     void touchStart();
     void touchMove();
     void touchEnd();
+    void zoomPageIn();
+    void zoomPageOut();
     void clearTouchPoints();
     void releaseTouchPoint(int index);
 

-- 
WebKit Debian packaging