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

[bdakin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c8220e70746dae4330d8e0b1d06f6f21f4ce8678
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 22:59:29 2010 +0000

    Fix for https://bugs.webkit.org/show_bug.cgi?id=49555
    Frame::scalePage() should treat the origin as an absolute
    coordinate
    -and corresponding-
    <rdar://problem/8667138>
    
    Reviewed by Darin Adler.
    
    * page/Frame.cpp:
    (WebCore::Frame::scalePage):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72042 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3807945..09e66bc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-15  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=49555 
+        Frame::scalePage() should treat the origin as an absolute 
+        coordinate
+        -and corresponding-
+        <rdar://problem/8667138>
+
+        * page/Frame.cpp:
+        (WebCore::Frame::scalePage):
+
 2010-11-15  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index c14a3d8..970078e 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -964,15 +964,12 @@ void Frame::setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor
 
 void Frame::scalePage(float scale, const IntPoint& origin)
 {
-    if (m_pageScaleFactor == scale)
-        return;
-
-    m_pageScaleFactor = scale;
-
     Document* document = this->document();
     if (!document)
         return;
 
+    m_pageScaleFactor = scale;
+
     if (document->renderer())
         document->renderer()->setNeedsLayout(true);
 
@@ -981,9 +978,7 @@ void Frame::scalePage(float scale, const IntPoint& origin)
     if (FrameView* view = this->view()) {
         if (document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
             view->layout();
-        IntPoint scrollPosition = view->scrollPosition();
-        view->setScrollPosition(IntPoint(scrollPosition.x() + origin.x() * scale, 
-            scrollPosition.y() + origin.y() * scale));
+        view->setScrollPosition(origin);
     }
 }
 

-- 
WebKit Debian packaging