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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0b979db1861045f8461529b19a3e37711219989d
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 16:55:08 2010 +0000

    <rdar://problem/8740920> Gestures: Frame::scalePage() broken by r73885
    
    Reviewed by Beth Dakin.
    
    Make sure the transform applied to the RenderView for page scaling is incorporated into the
    docTop/Bottom/Left/Right accessors.
    
    * rendering/RenderView.cpp:
    (WebCore::RenderView::docTop):
    (WebCore::RenderView::docBottom):
    (WebCore::RenderView::docLeft):
    (WebCore::RenderView::docRight):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cd68dad..f537bc8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-08  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        <rdar://problem/8740920> Gestures: Frame::scalePage() broken by r73885
+
+        Make sure the transform applied to the RenderView for page scaling is incorporated into the
+        docTop/Bottom/Left/Right accessors.
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::docTop):
+        (WebCore::RenderView::docBottom):
+        (WebCore::RenderView::docLeft):
+        (WebCore::RenderView::docRight):
+
 2010-12-08  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index 846098d..7ae1a5f 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -616,6 +616,8 @@ int RenderView::docTop() const
 {
     IntRect overflowRect(0, topLayoutOverflow(), 0, bottomLayoutOverflow() - topLayoutOverflow());
     flipForWritingMode(overflowRect);
+    if (hasTransform())
+        overflowRect = layer()->currentTransform().mapRect(overflowRect);
     return overflowRect.y();
 }
 
@@ -623,6 +625,8 @@ int RenderView::docBottom() const
 {
     IntRect overflowRect(layoutOverflowRect());
     flipForWritingMode(overflowRect);
+    if (hasTransform())
+        overflowRect = layer()->currentTransform().mapRect(overflowRect);
     return overflowRect.bottom();
 }
 
@@ -630,6 +634,8 @@ int RenderView::docLeft() const
 {
     IntRect overflowRect(layoutOverflowRect());
     flipForWritingMode(overflowRect);
+    if (hasTransform())
+        overflowRect = layer()->currentTransform().mapRect(overflowRect);
     return overflowRect.x();
 }
 
@@ -637,6 +643,8 @@ int RenderView::docRight() const
 {
     IntRect overflowRect(layoutOverflowRect());
     flipForWritingMode(overflowRect);
+    if (hasTransform())
+        overflowRect = layer()->currentTransform().mapRect(overflowRect);
     return overflowRect.right();
 }
 

-- 
WebKit Debian packaging