[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 f610c5fffed3352b659bd231f5e585fe2e189d60
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 04:13:42 2010 +0000

    2010-11-15  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] ZoomTextOnly doesn't work
            https://bugs.webkit.org/show_bug.cgi?id=49568
    
            Check QWebSettings::ZoomTextOnly attribute before applying zoom
    
            * Api/qwebframe.cpp:
            (QWebFrame::textSizeMultiplier):
            (QWebFrame::setZoomFactor):
            (QWebFrame::zoomFactor):
            * Api/qwebframe_p.h:
            (QWebFramePrivate::QWebFramePrivate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 7d423d5..203bd60 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1189,7 +1189,7 @@ void QWebFrame::setTextSizeMultiplier(qreal factor)
 */
 qreal QWebFrame::textSizeMultiplier() const
 {
-    return d->zoomTextOnly ? d->frame->textZoomFactor() : d->frame->pageZoomFactor();
+    return page()->settings()->testAttribute(QWebSettings::ZoomTextOnly) ? d->frame->textZoomFactor() : d->frame->pageZoomFactor();
 }
 
 /*!
@@ -1200,7 +1200,7 @@ qreal QWebFrame::textSizeMultiplier() const
 
 void QWebFrame::setZoomFactor(qreal factor)
 {
-    if (d->zoomTextOnly)
+    if (page()->settings()->testAttribute(QWebSettings::ZoomTextOnly))
         d->frame->setTextZoomFactor(factor);
     else
         d->frame->setPageZoomFactor(factor);
@@ -1208,7 +1208,7 @@ void QWebFrame::setZoomFactor(qreal factor)
 
 qreal QWebFrame::zoomFactor() const
 {
-    return d->zoomTextOnly ? d->frame->textZoomFactor() : d->frame->pageZoomFactor();
+    return page()->settings()->testAttribute(QWebSettings::ZoomTextOnly) ? d->frame->textZoomFactor() : d->frame->pageZoomFactor();
 }
 
 /*!
diff --git a/WebKit/qt/Api/qwebframe_p.h b/WebKit/qt/Api/qwebframe_p.h
index 7c0d235..1af1c95 100644
--- a/WebKit/qt/Api/qwebframe_p.h
+++ b/WebKit/qt/Api/qwebframe_p.h
@@ -80,7 +80,6 @@ public:
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
         , rootGraphicsLayer(0)
 #endif
-        , zoomTextOnly(false)
         {}
     void init(QWebFrame* qframe, QWebFrameData* frameData);
     void setPage(QWebPage*);
@@ -115,7 +114,6 @@ public:
     WebCore::TextureMapperContentLayer* rootGraphicsLayer;
     OwnPtr<WebCore::TextureMapper> textureMapper;
 #endif
-    bool zoomTextOnly;
 };
 
 class QWebHitTestResultPrivate {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b284620..502f63c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-15  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] ZoomTextOnly doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=49568
+
+        Check QWebSettings::ZoomTextOnly attribute before applying zoom
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::textSizeMultiplier):
+        (QWebFrame::setZoomFactor):
+        (QWebFrame::zoomFactor):
+        * Api/qwebframe_p.h:
+        (QWebFramePrivate::QWebFramePrivate):
+
 2010-11-14  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging