[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[christian at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit cc893bcfd9e09e20da7dc2222d6330e51160074e
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 12 17:14:39 2009 +0000

    2009-12-11  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Eric Seidel.
    
            [GTK] Build with --disable-svg is broken
            http://bugs.webkit.org/show_bug.cgi?id=32361
    
            * webkit/webkitwebframe.cpp:
            (webkit_web_frame_pause_svg_animation): Fix ENABLE(SVG) guards.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52050 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index ac80deb..09fbd1c 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-11  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Build with --disable-svg is broken
+        http://bugs.webkit.org/show_bug.cgi?id=32361
+
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_pause_svg_animation): Fix ENABLE(SVG) guards.
+
 2009-12-10  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 64fdc40..f3e74a7 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -54,7 +54,9 @@
 #include "JSDOMBinding.h"
 #include "ScriptController.h"
 #include "SubstituteData.h"
+#if ENABLE(SVG)
 #include "SVGSMILElement.h"
+#endif
 
 #include <atk/atk.h>
 #include <JavaScriptCore/APICast.h>
@@ -963,13 +965,13 @@ bool webkit_web_frame_pause_transition(WebKitWebFrame* frame, const gchar* name,
 bool webkit_web_frame_pause_svg_animation(WebKitWebFrame* frame, const gchar* animationId, double time, const gchar* elementId)
 {
     ASSERT(core(frame));
+#if ENABLE(SVG)
     Document* document = core(frame)->document();
     if (!document || !document->svgExtensions())
         return false;
     Element* coreElement = document->getElementById(AtomicString(animationId));
     if (!coreElement || !SVGSMILElement::isSMILElement(coreElement))
         return false;
-#if ENABLE(SVG)
     return document->accessSVGExtensions()->sampleAnimationAtTime(elementId, static_cast<SVGSMILElement*>(coreElement), time);
 #else
     return false;

-- 
WebKit Debian packaging