[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 0057c5aaf1148b29272ac2630f2a5851c6658a9a
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 01:24:33 2011 +0000

    2011-01-12  Chris Marrin  <cmarrin at apple.com>
    
            Unreviewed.
    
            A couple of lines of the patch for https://bugs.webkit.org/show_bug.cgi?id=52321
            were omitted.
    
            * platform/graphics/ca/GraphicsLayerCA.cpp:
            (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75660 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7192b5b..bffed42 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed.
 
+        A couple of lines of the patch for https://bugs.webkit.org/show_bug.cgi?id=52321
+        were omitted. 
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+
+2011-01-12  Chris Marrin  <cmarrin at apple.com>
+
+        Unreviewed.
+
         Getting rid of an assert that was causing build failures that turns out not to be needed.
 
         * rendering/RenderLayer.cpp:
diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
index 460dbba..509b6ac 100644
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -857,6 +857,9 @@ void GraphicsLayerCA::commitLayerChangesBeforeSublayers()
     
     if (m_uncommittedChanges & AcceleratesDrawingChanged)
         updateAcceleratesDrawing();
+    
+    if (m_uncommittedChanges & ContentsScaleChanged)
+        updateContentsScale();
 }
 
 void GraphicsLayerCA::commitLayerChangesAfterSublayers()

-- 
WebKit Debian packaging