[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c61dc02c7f348ae6c89554d98ac3938433d28c18
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 25 23:07:40 2010 +0000

            Fixed bug in positioning of scroll layer within the
            parent root layer.
            https://bugs.webkit.org/show_bug.cgi?id=33847
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53814 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9147834..39c9a00 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-25  Chris Marrin  <cmarrin at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Fixed bug in positioning of scroll layer within the
+        parent root layer.
+        https://bugs.webkit.org/show_bug.cgi?id=33847
+        
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::setScrollFrame):
+        (WebCore::WKCACFLayerRenderer::createRenderer):
+
 2010-01-25  Alexey Proskuryakov  <ap at apple.com>
 
         Rubber-stamped by Geoffrey Garen.
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 68f9c9e..5e63439 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -148,9 +148,9 @@ WKCACFLayerRenderer::~WKCACFLayerRenderer()
 void WKCACFLayerRenderer::setScrollFrame(const IntRect& scrollFrame)
 {
     m_scrollFrame = scrollFrame;
-
+    CGRect frameBounds = bounds();
     m_scrollLayer->setBounds(CGRectMake(0, 0, m_scrollFrame.width(), m_scrollFrame.height()));
-    m_scrollLayer->setPosition(CGPointMake(0, m_scrollFrame.height()));
+    m_scrollLayer->setPosition(CGPointMake(0, frameBounds.size.height));
 
     if (m_rootChildLayer)
         m_rootChildLayer->setPosition(CGPointMake(m_scrollFrame.x(), m_scrollFrame.height() + m_scrollFrame.y()));
@@ -238,14 +238,9 @@ void WKCACFLayerRenderer::createRenderer()
     CGColorRelease(debugColor);
 #endif
 
-    if (IsWindow(m_hostWindow)) {
+    if (IsWindow(m_hostWindow))
         m_rootLayer->setFrame(bounds());
 
-        // For now this will include the scroll bars. Later in the setScrollFrame
-        // we will fix it
-        m_scrollLayer->setFrame(bounds());
-    }
-
     if (m_context)
         m_rootLayer->becomeRootLayerForContext(m_context.get());
 }

-- 
WebKit Debian packaging