Bug 60015

gistfile1.diff

diff --git a/Source/WebKit/qt/Api/qwebframe.cpp b/Source/WebKit/qt/Api/qwebframe.cpp
index 857ca63..770d18a 100644
--- a/Source/WebKit/qt/Api/qwebframe.cpp
+++ b/Source/WebKit/qt/Api/qwebframe.cpp
@@ -1296,6 +1296,16 @@ qreal QWebFrame::zoomFactor() const
     return page()->settings()->testAttribute(QWebSettings::ZoomTextOnly) ? d->frame->textZoomFactor() : d->frame->pageZoomFactor();
 }
 
+void QWebFrame::scalePage(qreal scalefactor, const QPoint& origin)
+{
+    d->frame->scalePage(scalefactor, origin);
+}
+
+qreal QWebFrame::pageScaleFactor() const
+{
+    return d->frame->pageScaleFactor();
+}
+
 /*!
     \property QWebFrame::focus
     \since 4.6
diff --git a/Source/WebKit/qt/Api/qwebframe.h b/Source/WebKit/qt/Api/qwebframe.h
index 3c5a28e..be82188 100644
--- a/Source/WebKit/qt/Api/qwebframe.h
+++ b/Source/WebKit/qt/Api/qwebframe.h
@@ -182,6 +182,9 @@ public:
     qreal zoomFactor() const;
     void setZoomFactor(qreal factor);
 
+    void scalePage(qreal scalefactor, const QPoint& origin);
+    qreal pageScaleFactor() const;
+    
     bool hasFocus() const;
     void setFocus();
 
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.cpp b/Tools/DumpRenderTree/qt/EventSenderQt.cpp
index ef89e02..732dcd3 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())
+        frame->scalePage(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);