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

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit b3286490e44bfe0123dc63a923f88a34fb4198ec
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 17:46:11 2009 +0000

    Change IWebFramePrivate's vtable to be compatible with Safari 4.0.4
    
    Reviewed by Steve Falkenburg.
    
    Fixes <http://webkit.org/b/32433> REGRESSION (r51567): Right click on
    a link element crashes WebKit nightly
    
    * Interfaces/IWebFramePrivate.idl: Moved pauseSVGAnimation to the end
    of the interface so the vtable that Safari 4.0.4 sees is unchanged.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52098 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index e1d08cf..742c325 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,17 @@
 2009-12-14  Adam Roben  <aroben at apple.com>
 
+        Change IWebFramePrivate's vtable to be compatible with Safari 4.0.4
+
+        Reviewed by Steve Falkenburg.
+
+        Fixes <http://webkit.org/b/32433> REGRESSION (r51567): Right click on
+        a link element crashes WebKit nightly
+
+        * Interfaces/IWebFramePrivate.idl: Moved pauseSVGAnimation to the end
+        of the interface so the vtable that Safari 4.0.4 sees is unchanged.
+
+2009-12-14  Adam Roben  <aroben at apple.com>
+
         Build fix
 
         * WebKit.vcproj/WebKit.vcproj: Added $(DXSDK_DIR)\Lib\x86 to the
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index 3ba71c8..ef1c133 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -89,7 +89,6 @@ interface IWebFramePrivate : IUnknown
 
     HRESULT pauseAnimation([in] BSTR animationName, [in] IDOMNode* node, [in] double secondsFromNow, [out, retval] BOOL* animationWasRunning);
     HRESULT pauseTransition([in] BSTR propertyName, [in] IDOMNode* node, [in] double secondsFromNow, [out, retval] BOOL* transitionWasRunning);
-    HRESULT pauseSVGAnimation([in] BSTR elementId, [in] IDOMNode* node, [in] double secondsFromNow, [out, retval] BOOL* animationWasRunning);
     HRESULT numberOfActiveAnimations([out, retval] UINT* number);
 
     HRESULT isDisplayingStandaloneImage([out, retval] BOOL* result);
@@ -101,4 +100,6 @@ interface IWebFramePrivate : IUnknown
     [local] JSGlobalContextRef globalContextForScriptWorld([in] IWebScriptWorld*);
 
     HRESULT counterValueForElementById([in] BSTR id, [out, retval] BSTR* result);
+
+    HRESULT pauseSVGAnimation([in] BSTR elementId, [in] IDOMNode* node, [in] double secondsFromNow, [out, retval] BOOL* animationWasRunning);
 }

-- 
WebKit Debian packaging