[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

aroben at apple.com aroben at apple.com
Wed Dec 22 12:49:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 92e957de12ab8641cb3226008a04c3056811f002
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 01:04:44 2010 +0000

    Fix crash on launch on Windows due to changing IWebFramePrivate's vtable
    
    This regressed in r65107.
    
    Fixes <http://webkit.org/b/44755>.
    
    Rubber-stamped by Jon Honeycutt.
    
    * Interfaces/IWebFramePrivate.idl: Moved suspendAnimations and
    resumeAnimations to the end of the interface so that the vtable will
    match what Safari expects.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 20ccc21..afbb125 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-30  Adam Roben  <aroben at apple.com>
+
+        Fix crash on launch on Windows due to changing IWebFramePrivate's
+        vtable
+
+        This regressed in r65107.
+
+        Fixes <http://webkit.org/b/44755>.
+
+        Rubber-stamped by Jon Honeycutt.
+
+        * Interfaces/IWebFramePrivate.idl: Moved suspendAnimations and
+        resumeAnimations to the end of the interface so that the vtable will
+        match what Safari expects.
+
 2010-08-30  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r66198.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index cf25204..bc9a4bd 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -90,8 +90,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 numberOfActiveAnimations([out, retval] UINT* number);
-    HRESULT suspendAnimations();
-    HRESULT resumeAnimations();
 
     HRESULT isDisplayingStandaloneImage([out, retval] BOOL* result);
 
@@ -116,4 +114,7 @@ interface IWebFramePrivate : IUnknown
     HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE deviceContext);
 
     HRESULT renderTreeAsExternalRepresentation([in] BOOL forPrinting, [out, retval] BSTR* result);
+
+    HRESULT suspendAnimations();
+    HRESULT resumeAnimations();
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list