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

[bdakin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f48eb4a554a6c5c651c8e8176c26ae0dd6bd10ef
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 02:13:24 2010 +0000

    Fix for https://bugs.webkit.org/show_bug.cgi?id=51150 WebView's
    _scaleWebView SPI doesn't work on pages with compositing layers
    -and corresponding-
    <rdar://problem/8604713>
    
    Reviewed by Darin Adler.
    
    paintingGoesToWindow() should return false if the owning layer has
    a transform.
    * rendering/RenderLayerBacking.cpp:
    (WebCore::RenderLayerBacking::paintingGoesToWindow):
    
    Use docWidth() and docHeight() instead of rightLayoutOverflow() and
    bottomLayoutOverflow() since docWidth/Height are now the preferred
    way to query physical dimensions of the document.
    * rendering/RenderLayerCompositor.cpp:
    (WebCore::RenderLayerCompositor::updateRootLayerPosition):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74168 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c975816..8e9d13a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-15  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=51150 WebView's 
+        _scaleWebView SPI doesn't work on pages with compositing layers
+        -and corresponding-
+        <rdar://problem/8604713>
+
+        paintingGoesToWindow() should return false if the owning layer has 
+        a transform.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintingGoesToWindow):
+
+        Use docWidth() and docHeight() instead of rightLayoutOverflow() and 
+        bottomLayoutOverflow() since docWidth/Height are now the preferred 
+        way to query physical dimensions of the document.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateRootLayerPosition):
+
 2010-12-15  Alex Bredariol Grilo  <abgrilo at profusion.mobi>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp
index 0a32eda..e718044 100644
--- a/WebCore/rendering/RenderLayerBacking.cpp
+++ b/WebCore/rendering/RenderLayerBacking.cpp
@@ -911,7 +911,7 @@ FloatPoint RenderLayerBacking::contentsToGraphicsLayerCoordinates(const Graphics
 bool RenderLayerBacking::paintingGoesToWindow() const
 {
     if (m_owningLayer->isRootLayer())
-        return compositor()->rootLayerAttachment() != RenderLayerCompositor::RootLayerAttachedViaEnclosingIframe;
+        return !m_owningLayer->hasTransform() && (compositor()->rootLayerAttachment() != RenderLayerCompositor::RootLayerAttachedViaEnclosingIframe);
     
     return false;
 }
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index c6935f6..fa25348 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1057,10 +1057,10 @@ void RenderLayerCompositor::willMoveOffscreen()
 
 void RenderLayerCompositor::updateRootLayerPosition()
 {
-    // Eventually we will need to account for scrolling here.
-    // https://bugs.webkit.org/show_bug.cgi?id=38518
-    if (m_rootPlatformLayer)
-        m_rootPlatformLayer->setSize(FloatSize(m_renderView->rightLayoutOverflow(), m_renderView->bottomLayoutOverflow()));
+    if (m_rootPlatformLayer) {
+        m_rootPlatformLayer->setSize(FloatSize(m_renderView->docWidth(), m_renderView->docHeight()));
+        m_rootPlatformLayer->setPosition(FloatPoint(m_renderView->docLeft(), m_renderView->docTop()));
+    }
 }
 
 void RenderLayerCompositor::didStartAcceleratedAnimation(CSSPropertyID property)

-- 
WebKit Debian packaging