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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit a3291294cde9ea9afee7d20c80ea65904b8ae00b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 21:37:26 2009 +0000

    2009-12-03  İsmail Dönmez  <ismail at namtrac.org>
    
            Reviewed by Eric Seidel.
    
            Fix compilation when SVG is disabled.
    
            * Api/qwebframe.cpp:
            (qt_drt_pauseSVGAnimation):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 0b4d16a..ec5debf 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -153,6 +153,9 @@ bool QWEBKIT_EXPORT qt_drt_pauseTransitionOfProperty(QWebFrame *qframe, const QS
 // This method is only intended to be used for testing the SVG animation system.
 bool QWEBKIT_EXPORT qt_drt_pauseSVGAnimation(QWebFrame *qframe, const QString &animationId, double time, const QString &elementId)
 {
+#if !ENABLE(SVG)
+    return false;
+#else
     Frame* frame = QWebFramePrivate::core(qframe);
     if (!frame)
         return false;
@@ -167,10 +170,7 @@ bool QWEBKIT_EXPORT qt_drt_pauseSVGAnimation(QWebFrame *qframe, const QString &a
     if (!coreNode || !SVGSMILElement::isSMILElement(coreNode))
         return false;
 
-#if ENABLE(SVG)
     return doc->accessSVGExtensions()->sampleAnimationAtTime(elementId, static_cast<SVGSMILElement*>(coreNode), time);
-#else
-    return false;
 #endif
 }
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e40a74b..cc1dc4b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-03  İsmail Dönmez  <ismail at namtrac.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix compilation when SVG is disabled.
+
+        * Api/qwebframe.cpp:
+        (qt_drt_pauseSVGAnimation):
+
 2009-12-03  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.

-- 
WebKit Debian packaging