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

[mario at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3f832a67da7b235a625547c927b9cbc5eba16e8f
Author: mario at webkit.org <mario at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 10:24:31 2010 +0000

    2010-12-15  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Unreviewed, fix compilation warnings after r74066.
    
            * rendering/RenderBox.cpp:
            (WebCore::layersUseImage): Place this static function between the
            same if-def region used in the only place where it's called from.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74102 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9aa54c7..1162554 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-15  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Unreviewed, fix compilation warnings after r74066.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::layersUseImage): Place this static function between the
+        same if-def region used in the only place where it's called from.
+
 2010-12-15  Emil Eklund  <eae at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 9c86868..5de98e7 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -937,6 +937,7 @@ void RenderBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const
     paintFillLayerExtended(paintInfo, c, fillLayer, tx, ty, width, height, 0, op, backgroundObject);
 }
 
+#if USE(ACCELERATED_COMPOSITING)
 static bool layersUseImage(WrappedImagePtr image, const FillLayer* layers)
 {
     for (const FillLayer* curLayer = layers; curLayer; curLayer = curLayer->next()) {
@@ -946,6 +947,7 @@ static bool layersUseImage(WrappedImagePtr image, const FillLayer* layers)
 
     return false;
 }
+#endif
 
 void RenderBox::imageChanged(WrappedImagePtr image, const IntRect*)
 {

-- 
WebKit Debian packaging