scalePageBy

gistfile1.diff

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 915f2f7..1f020f1 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-17  Zsolt Fehér  <h490267@stud.u-szeged.hu>
+
+        Reviewed by NOBODY (OOPS!).
+
+        [Qt] Implement eventSender.scalePageBy
+        https://bugs.webkit.org/show_bug.cgi?id=60015
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::scalePage):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2011-05-07  Joe Mason  <jmason@rim.com>
 
         Reviewed by Daniel Bates.
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 682b878..fdacd22 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -768,6 +768,12 @@ QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, int deviceDPI, c
     return res;
 }
 
+void DumpRenderTreeSupportQt::scalePageBy(QWebFrame* frame, float scalefactor, const QPoint& origin)
+{
+    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
+    coreFrame->scalePage(scalefactor, origin);
+}
+
 void DumpRenderTreeSupportQt::activeMockDeviceOrientationClient(bool b)
 {
 #if ENABLE(DEVICE_ORIENTATION)
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
index c027d2a..e10c82d 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
@@ -190,6 +190,8 @@ public:
     static void simulateDesktopNotificationClick(const QString& title);
     static QString viewportAsText(QWebPage*, int deviceDPI, const QSize& deviceSize, const QSize& availableSize);
 
+    static void scalePageBy(QWebFrame*, float scale, const QPoint& origin);
+
     static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
     static QString responseMimeType(QWebFrame*);
     static void clearOpener(QWebFrame*);
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c71dc45..74b61df 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-17  Zsolt Fehér  <h490267@stud.u-szeged.hu>
+
+        Reviewed by NOBODY (OOPS!).
+
+        [Qt] Implement eventSender.scalePageBy
+        https://bugs.webkit.org/show_bug.cgi?id=60015
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::scalePageBy):
+        * DumpRenderTree/qt/EventSenderQt.h:
+
 2011-05-09  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 2bb7aa5..ad7b8ba 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -564,6 +564,7 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
 #endif
     
     clearHistory(m_page);
+    DumpRenderTreeSupportQt::scalePageBy(m_page->mainFrame(), 1, QPoint(0, 0));
     DumpRenderTreeSupportQt::clearFrameName(m_page->mainFrame());
 
     m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.cpp b/Tools/DumpRenderTree/qt/EventSenderQt.cpp
index ef89e02..17aa7f7 100644
--- a/Tools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/Tools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -513,6 +513,12 @@ void EventSender::textZoomOut()
         frame->setTextSizeMultiplier(frame->textSizeMultiplier() / ZOOM_STEP);
 }
 
+void EventSender::scalePageBy(float scaleFactor, float x, float y)
+{
+    if (QWebFrame* frame = m_page->mainFrame())
+        DumpRenderTreeSupportQt::scalePageBy(frame, scaleFactor, QPoint(x, y));
+}
+
 QWebFrame* EventSender::frameUnderMouse() const
 {
     QWebFrame* frame = m_page->mainFrame();
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.h b/Tools/DumpRenderTree/qt/EventSenderQt.h
index ecb06e2..d7ceaed 100644
--- a/Tools/DumpRenderTree/qt/EventSenderQt.h
+++ b/Tools/DumpRenderTree/qt/EventSenderQt.h
@@ -77,6 +77,7 @@ public slots:
     void zoomPageOut();
     void textZoomIn();
     void textZoomOut();
+    void scalePageBy(float scaleFactor, float x, float y);
     void clearTouchPoints();
     void releaseTouchPoint(int index);