[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 012c01083d0018db3299b30f990e4d925bba42ee
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 01:56:46 2009 +0000

    Not reviewed. GTK DRT try 2.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f9e18b8..8836ac7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
 
+        Not reviewed. GTK DRT try 2.
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::sampleSVGAnimationForElementAtTime):
+
+2009-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
+
         Not reviewed. Try to fix gtk DRT build.
 
         * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index e09a480..6e94c1c 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -451,8 +451,10 @@ bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(JSStringRef prop
 
 bool LayoutTestController::sampleSVGAnimationForElementAtTime(JSStringRef animationId, double time, JSStringRef elementId)
 {    
-    gchar* animationElement = JSStringCopyUTF8CString(animationId);
-    bool returnValue = webkit_web_frame_pause_svg_animation(mainFrame, elementId, time, animationElement);
+    gchar* name = JSStringCopyUTF8CString(animationId);
+    gchar* element = JSStringCopyUTF8CString(elementId);
+    bool returnValue = webkit_web_frame_pause_svg_animation(mainFrame, name, time, element);
+    g_free(name);
     g_free(element);
     return returnValue;
 }

-- 
WebKit Debian packaging