[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[enrica at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit d27135fe4f26bcd7c43ef84c2c381caf6905e4f0
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 22:40:59 2010 +0000

    Horizontal scrollbar works in reverse at milliondollarcu.be
    <rdar://problem/7556121>
    https://bugs.webkit.org/show_bug.cgi?id=33848
    
    Reviewed by Simon Fraser.
    
    Added a manual test.
    
    * manual-tests/win: Added.
    * manual-tests/win/horizontal-scroll-composited.html: Added.
    * platform/graphics/win/WKCACFLayerRenderer.cpp:
    (WebCore::WKCACFLayerRenderer::setScrollFrame):
    (WebCore::WKCACFLayerRenderer::setRootChildLayer):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 194f867..8f7b9c0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-05  Enrica Casucci  <enrica at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Horizontal scrollbar works in reverse at milliondollarcu.be
+        <rdar://problem/7556121>
+        https://bugs.webkit.org/show_bug.cgi?id=33848
+        
+        Added a manual test.
+
+        * manual-tests/win: Added.
+        * manual-tests/win/horizontal-scroll-composited.html: Added.
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::setScrollFrame):
+        (WebCore::WKCACFLayerRenderer::setRootChildLayer):
+
 2010-02-05  Ryan Leavengood  <leavengood at gmail.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/manual-tests/win/horizontal-scroll-composited.html b/WebCore/manual-tests/win/horizontal-scroll-composited.html
new file mode 100644
index 0000000..c977300
--- /dev/null
+++ b/WebCore/manual-tests/win/horizontal-scroll-composited.html
@@ -0,0 +1,8 @@
+<div>
+<b>Scroll test for composited elements on Windows.</b>
+</div>
+<div>Make sure you browser window is smaller than 1000 pixels so that you see an horizontal scroll bar.
+<br />
+Try scolling right and left and verify that the content is displayed correctly. 
+</div>
+<div style="-webkit-transform: translatez(0); width: 1000px; height: 800px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 3bbd4f8..20983d8 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -157,7 +157,7 @@ void WKCACFLayerRenderer::setScrollFrame(const IntRect& scrollFrame)
     m_scrollLayer->setPosition(CGPointMake(0, frameBounds.size.height));
 
     if (m_rootChildLayer)
-        m_rootChildLayer->setPosition(CGPointMake(m_scrollFrame.x(), m_scrollFrame.height() + m_scrollFrame.y()));
+        m_rootChildLayer->setPosition(CGPointMake(-m_scrollFrame.x(), m_scrollFrame.height() + m_scrollFrame.y()));
 }
 
 void WKCACFLayerRenderer::setRootContents(CGImageRef image)
@@ -173,6 +173,7 @@ void WKCACFLayerRenderer::setRootChildLayer(WebCore::PlatformLayer* layer)
         return;
 
     m_scrollLayer->removeAllSublayers();
+    m_rootChildLayer = layer;
     if (layer) {
         m_scrollLayer->addSublayer(layer);
 
@@ -180,9 +181,6 @@ void WKCACFLayerRenderer::setRootChildLayer(WebCore::PlatformLayer* layer)
         layer->setAnchorPoint(CGPointMake(0, 1));
         setScrollFrame(m_scrollFrame);
     }
-
-    m_rootChildLayer = layer;
-
 }
    
 void WKCACFLayerRenderer::setNeedsDisplay()

-- 
WebKit Debian packaging