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

[zimmermann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2981fd1cd6a60995538ffec6e24590972e9f70d6
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 00:53:17 2009 +0000

    Not reviewed. Try to fix qt/win builds.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51568 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 2a11b01..0b4d16a 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -168,7 +168,7 @@ bool QWEBKIT_EXPORT qt_drt_pauseSVGAnimation(QWebFrame *qframe, const QString &a
         return false;
 
 #if ENABLE(SVG)
-    return document->accessSVGExtensions()->sampleAnimationAtTime(elementId, static_cast<SVGSMILElement*>(coreNode), time);
+    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 ff3fc9f..f02140b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed. Try to fix Qt build.
+
+        * Api/qwebframe.cpp:
+        (qt_drt_pauseSVGAnimation):
+
+2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Reviewed by Simon Fraser.
 
         Add SVG animation test framework with 'snapshot' functionality
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f5c5e46..cd9d3a7 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed. Try to fix windows build.
+
+        * WebFrame.cpp:
+
+2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Reviewed by Simon Fraser.
 
         Add SVG animation test framework with 'snapshot' functionality
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index a2c5766..0b8ebbf 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -92,7 +92,7 @@
 #include <WebCore/RenderView.h>
 #include <WebCore/RenderTreeAsText.h>
 #include <WebCore/Settings.h>
-#include <WebCore/SVGSMILElement.h>
+#include <WebCore/svg/animation/SVGSMILElement.h>
 #include <WebCore/TextIterator.h>
 #include <WebCore/JSDOMBinding.h>
 #include <WebCore/ScriptController.h>

-- 
WebKit Debian packaging