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

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9d9eb134fa7e9f1bcb08e1e83c999f669b11e1b8
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 04:07:27 2009 +0000

    <http://webkit.org/b/30938> REGRESSION(r50233): Windows nightlies crash on launch due to changes
    to IWebFramePrivate vtable ordering
    
    Rubber-stamped by Dan Bernstein.
    
    * Interfaces/IWebFramePrivate.idl: Move the newly-added method to the end of the interface so that
    it doesn't affect the ordering of the vtable.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 6253010..6f18aff 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-29  Mark Rowe  <mrowe at apple.com>
+
+        Rubber-stamped by Dan Bernstein.
+
+        <http://webkit.org/b/30938> REGRESSION(r50233): Windows nightlies crash on launch due to changes
+        to IWebFramePrivate vtable ordering
+
+        * Interfaces/IWebFramePrivate.idl: Move the newly-added method to the end of the interface so that
+        it doesn't affect the ordering of the vtable.
+
 2009-10-28  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Sam "Horatio" Weinig.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index d56239b..15a8dc3 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -57,7 +57,6 @@ typedef enum {
 interface IWebFramePrivate : IUnknown
 {
     HRESULT renderTreeAsExternalRepresentation([out, retval] BSTR* result);
-    HRESULT counterValueForElementById([in] BSTR id, [out, retval] BSTR* result);
     HRESULT scrollOffset([out, retval] SIZE* offset);
 
     // FIXME: This shouldn't be needed once IWebDocumentView is implemented.
@@ -98,4 +97,6 @@ interface IWebFramePrivate : IUnknown
     HRESULT stringByEvaluatingJavaScriptInIsolatedWorld([in] unsigned worldID, [in] OLE_HANDLE jsGlobalObject, [in] BSTR script, [out, retval] BSTR* result);
 
     [local] JSGlobalContextRef contextForWorldID([in] unsigned worldID);
+
+    HRESULT counterValueForElementById([in] BSTR id, [out, retval] BSTR* result);
 }

-- 
WebKit Debian packaging