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

[ajwong at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 9bedd60cfaaae7e8e5921096298540df607be796
Author: ajwong at chromium.org <ajwong at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 23:51:11 2010 +0000

    r69181 breaks compilation of WebCore/platform/graphics/filters/FETile.cpp if ENABLE(SVG) is false.
    https://bugs.webkit.org/show_bug.cgi?id=47315
    
    Reviewed by Andreas Kling.
    
    Compile fix. No tests.
    
    * platform/graphics/filters/FETile.cpp:
    (WebCore::FETile::apply):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69255 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 84f422f..9da107a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-06  Albert J. Wong  <ajwong at chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        r69181 breaks compilation of WebCore/platform/graphics/filters/FETile.cpp if ENABLE(SVG) is false.
+        https://bugs.webkit.org/show_bug.cgi?id=47315
+
+        Compile fix. No tests.
+
+        * platform/graphics/filters/FETile.cpp:
+        (WebCore::FETile::apply):
+
 2010-10-06  Kinuko Yasuda  <kinuko at chromium.org>
 
         Unreviewed, fixing screwed up ChangeLogs.
diff --git a/WebCore/platform/graphics/filters/FETile.cpp b/WebCore/platform/graphics/filters/FETile.cpp
index e40580c..743ce9f 100644
--- a/WebCore/platform/graphics/filters/FETile.cpp
+++ b/WebCore/platform/graphics/filters/FETile.cpp
@@ -51,6 +51,8 @@ FloatRect FETile::determineFilterPrimitiveSubregion(Filter* filter)
 
 void FETile::apply(Filter* filter)
 {
+// FIXME: See bug 47315. This is a hack to work around a compile failure, but is incorrect behavior otherwise.
+#if ENABLE(SVG)
     FilterEffect* in = inputEffect(0);
     in->apply(filter);
     if (!in->resultImage())
@@ -87,6 +89,7 @@ void FETile::apply(Filter* filter)
     pattern->setPatternSpaceTransform(patternTransform);
     filterContext->setFillPattern(pattern);
     filterContext->fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()));
+#endif
 }
 
 void FETile::dump()
@@ -107,4 +110,3 @@ TextStream& FETile::externalRepresentation(TextStream& ts, int indent) const
 } // namespace WebCore
 
 #endif // ENABLE(FILTERS)
-

-- 
WebKit Debian packaging