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

noam.rosenthal at nokia.com noam.rosenthal at nokia.com
Wed Dec 22 15:26:56 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 575e7b5389a06ec890964d808f8afc95394cd287
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 20:15:42 2010 +0000

    Unreviewed build fix for r71253
    
    #endif for TILED_BACKING_STORE was at the wrong place.
    
    * platform/graphics/qt/GraphicsLayerQt.cpp:
    (WebCore::GraphicsLayerQtImpl::tiledBackingStoreBackgroundColor):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 79b695f..3765039 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-03  No'am Rosenthal  <noam.rosenthal at nokia.com>
+
+        Unreviewed build fix for r71253
+
+        #endif for TILED_BACKING_STORE was at the wrong place.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::tiledBackingStoreBackgroundColor):
+
 2010-11-03  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 430b51b..49387a2 100644
--- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -926,7 +926,6 @@ Color GraphicsLayerQtImpl::tiledBackingStoreBackgroundColor() const
     // We return a transparent color so that the tiles initialize with alpha.
     return Color(0, 0, 0, 0);
 }
-#endif
 
 IntRect GraphicsLayerQtImpl::tiledBackingStoreVisibleRect()
 {
@@ -937,6 +936,7 @@ IntRect GraphicsLayerQtImpl::tiledBackingStoreVisibleRect()
     // All we get is the viewport's visible region. We have to map it to the scene and then to item coordinates.
     return mapFromScene(view->mapToScene(view->viewport()->visibleRegion().boundingRect()).boundingRect()).boundingRect().toAlignedRect();
 }
+#endif
 
 void GraphicsLayerQtImpl::notifyAnimationStarted()
 {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list