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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 7ed699da6310029fd9c2c8592916200e9858534e
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 17:05:38 2009 +0000

    Touch WebKit.idl to fix the Windows build
    
    * Interfaces/WebKit.idl: Sorted #includes.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50944 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 27cc953..715236a 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-13  Adam Roben  <aroben at apple.com>
 
+        Touch WebKit.idl to fix the Windows build
+
+        * Interfaces/WebKit.idl: Sorted #includes.
+
+2009-11-13  Adam Roben  <aroben at apple.com>
+
         Finish replacing worldIDs with world objects
 
         The only remaining use of worldIDs was in a method only used by DRT
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index bbdbb2c..f7829bf 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -55,8 +55,6 @@ cpp_quote(" */")
 import "oaidl.idl";
 import "ocidl.idl";
 
-#include "WebScrollbarTypes.idl"
-#include "IWebScriptObject.idl"
 #include "DOMCSS.idl"
 #include "DOMCore.idl"
 #include "DOMEvents.idl"
@@ -100,6 +98,7 @@ import "ocidl.idl";
 #include "IWebInspectorPrivate.idl"
 #include "IWebJavaScriptCollector.idl"
 #include "IWebKitStatistics.idl"
+#include "IWebMutableURLRequest.idl"
 #include "IWebMutableURLRequestPrivate.idl"
 #include "IWebNavigationData.idl"
 #include "IWebNotification.idl"
@@ -113,6 +112,7 @@ import "ocidl.idl";
 #include "IWebResource.idl"
 #include "IWebResourceLoadDelegate.idl"
 #include "IWebResourceLoadDelegatePrivate.idl"
+#include "IWebScriptObject.idl"
 #include "IWebScriptWorld.idl"
 #include "IWebScrollBarDelegatePrivate.idl"
 #include "IWebScrollBarPrivate.idl"
@@ -123,7 +123,6 @@ import "ocidl.idl";
 #include "IWebUIDelegatePrivate.idl"
 #include "IWebURLAuthenticationChallenge.idl"
 #include "IWebURLRequest.idl"
-#include "IWebMutableURLRequest.idl"
 #include "IWebURLResponse.idl"
 #include "IWebURLResponsePrivate.idl"
 #include "IWebUndoManager.idl"
@@ -131,6 +130,7 @@ import "ocidl.idl";
 #include "IWebView.idl"
 #include "IWebViewPrivate.idl"
 #include "IWebWorkersPrivate.idl"
+#include "WebScrollbarTypes.idl"
 
 #define __TYPELIB_VERSION__ __BUILD_NUMBER_MAJOR__##.##__BUILD_NUMBER_MINOR__
 

-- 
WebKit Debian packaging