[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[christian at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit df51e584a327b36bc59c9b23b070e4bb84048a96
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 12 18:24:42 2009 +0000

    2009-12-12  Christian Dywan  <christian at twotoasts.de>
    
            Rubber-stamped by Maciej Stachowiak.
    
            Only include SVGFEDisplacementMap.h if SVG is enabled.
    
            * platform/graphics/filters/FEComponentTransfer.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52052 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 84483e0..6eb45c4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-12  Christian Dywan  <christian at twotoasts.de>
+
+        Rubber-stamped by Maciej Stachowiak.
+
+        Only include SVGFEDisplacementMap.h if SVG is enabled.
+
+        * platform/graphics/filters/FEComponentTransfer.h:
+
 2009-12-12  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/filters/FEComponentTransfer.h b/WebCore/platform/graphics/filters/FEComponentTransfer.h
index 773aba7..e4ebf98 100644
--- a/WebCore/platform/graphics/filters/FEComponentTransfer.h
+++ b/WebCore/platform/graphics/filters/FEComponentTransfer.h
@@ -25,7 +25,9 @@
 #if ENABLE(FILTERS)
 #include "FilterEffect.h"
 
+#if ENABLE(SVG)
 #include "SVGFEDisplacementMap.h"
+#endif
 #include "Filter.h"
 #include <wtf/Vector.h>
 

-- 
WebKit Debian packaging