[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 236b5d8c7c5724ef05b341b5d66e750077026a8e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 11:14:41 2010 +0000

    2010-10-12  Juha Savolainen  <juha.savolainen at weego.fi>
    
            Reviewed by Antti Koivisto.
    
            [Qt] Adding Qt WebKit2 API for zooming.
            https://bugs.webkit.org/show_bug.cgi?id=47539
    
            Adding zoom methods to QWKPage.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::textZoomFactor): Added
            (QWKPage::setTextZoomFactor): Added
            (QWKPage::pageZoomFactor): Added
            (QWKPage::setPageZoomFactor): Added
            (QWKPage::setPageAndTextZoomFactors): Added
            * UIProcess/API/qt/qwkpage.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1d4f723..6706909 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-12  Juha Savolainen  <juha.savolainen at weego.fi>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] Adding Qt WebKit2 API for zooming.
+        https://bugs.webkit.org/show_bug.cgi?id=47539
+
+        Adding zoom methods to QWKPage.
+        
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::textZoomFactor): Added
+        (QWKPage::setTextZoomFactor): Added
+        (QWKPage::pageZoomFactor): Added
+        (QWKPage::setPageZoomFactor): Added
+        (QWKPage::setPageAndTextZoomFactors): Added
+        * UIProcess/API/qt/qwkpage.h:
+
 2010-10-11  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Darin Adler of the past.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index b54d628..4c51966 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -437,6 +437,31 @@ void QWKPage::setViewportSize(const QSize& size)
         d->page->drawingArea()->setSize(IntSize(size));
 }
 
+qreal QWKPage::textZoomFactor() const
+{
+    return WKPageGetTextZoomFactor(pageRef());
+}
+
+void QWKPage::setTextZoomFactor(qreal zoomFactor)
+{
+    WKPageSetTextZoomFactor(pageRef(), zoomFactor);
+}
+
+qreal QWKPage::pageZoomFactor() const
+{
+    return WKPageGetPageZoomFactor(pageRef());
+}
+
+void QWKPage::setPageZoomFactor(qreal zoomFactor)
+{
+    WKPageSetPageZoomFactor(pageRef(), zoomFactor);
+}
+
+void QWKPage::setPageAndTextZoomFactors(qreal pageZoomFactor, qreal textZoomFactor)
+{
+    WKPageSetPageAndTextZoomFactors(pageRef(), pageZoomFactor, textZoomFactor);
+}
+
 #ifndef QT_NO_ACTION
 void QWKPage::triggerAction(WebAction action, bool)
 {
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.h b/WebKit2/UIProcess/API/qt/qwkpage.h
index ed54a61..869d4c3 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -89,6 +89,12 @@ public:
 
     void setCustomUserAgent(const QString&);
 
+    qreal textZoomFactor() const;
+    qreal pageZoomFactor() const;
+    void setTextZoomFactor(qreal zoomFactor);
+    void setPageZoomFactor(qreal zoomFactor);
+    void setPageAndTextZoomFactors(qreal pageZoomFactor, qreal textZoomFactor);
+
 public:
     Q_SIGNAL void statusBarMessage(const QString&);
     Q_SIGNAL void titleChanged(const QString&);

-- 
WebKit Debian packaging