[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4507e21b7211eb65680c733298ced61943beb76c
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 15:38:26 2009 +0000

    Move the new IWebViewPrivate::inspectorPrivate function after all functions that existed when Safari 4.0.3 was released
    
    Fixes <http://webkit.org/b/30085> REGRESSION (r49091): run-safari
    crashes in Safari.dll
    
    Reviewed by John Sullivan.
    
    * Interfaces/IWebViewPrivate.idl: Moved inspectorPrivate to the end of
    the interface, so it won't modify the vtable that Safari 4.0.3 sees.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 98eab01..656f224 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-08  Adam Roben  <aroben at apple.com>
+
+        Move the new IWebViewPrivate::inspectorPrivate function after all
+        functions that existed when Safari 4.0.3 was released
+
+        Fixes <http://webkit.org/b/30085> REGRESSION (r49091): run-safari
+        crashes in Safari.dll
+
+        Reviewed by John Sullivan.
+
+        * Interfaces/IWebViewPrivate.idl: Moved inspectorPrivate to the end of
+        the interface, so it won't modify the vtable that Safari 4.0.3 sees.
+
 2009-10-07  Adam Roben  <aroben at apple.com>
 
         Expose origin whitelisting in the WebKit API on Windows
diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
index 92a50f0..e0b4f8e 100644
--- a/WebKit/win/Interfaces/IWebViewPrivate.idl
+++ b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -116,8 +116,6 @@ interface IWebViewPrivate : IUnknown
 
     HRESULT inspector([out, retval] IWebInspector**);
 
-    HRESULT inspectorPrivate([out, retval] IWebInspectorPrivate**);
-
     HRESULT clearUndoRedoOperations();
 
     HRESULT setProhibitsMainFrameScrolling([in] BOOL prohibits);
@@ -210,4 +208,6 @@ interface IWebViewPrivate : IUnknown
 
     // Removes all white list entries created with whiteListAccessFromOrigin.
     HRESULT resetOriginAccessWhiteLists();
+
+    HRESULT inspectorPrivate([out, retval] IWebInspectorPrivate**);
 }

-- 
WebKit Debian packaging