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

[zimmermann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit adf4e19f2d37ae517055de143738fd88fd235c0c
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 01:03:18 2009 +0000

    Not reviewed. Qt build almost fixed, DumpRenderTree should compile now as well.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9e77bf6..255c8a2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed. Qt build almost fixed, DumpRenderTree should compile now as well.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.h: Update old function signature.
+
+2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Reviewed by Simon Fraser.
 
         Add SVG animation test framework with 'snapshot' functionality
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index ecad947..f023f67 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -115,7 +115,8 @@ public slots:
 
     bool pauseAnimationAtTimeOnElementWithId(const QString& animationName, double time, const QString& elementId);
     bool pauseTransitionAtTimeOnElementWithId(const QString& propertyName, double time, const QString& elementId);
-    bool pauseSVGAnimationAtTimeOnElementWithId(double time, const QString& elementId);
+    bool sampleSVGAnimationForElementAtTime(const QString& animationId, double time, const QString& elementId);
+
     unsigned numberOfActiveAnimations() const;
 
     void whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);

-- 
WebKit Debian packaging