15 files changed, 26 insertions, 303 deletions
diff --git a/WebKit/win/Interfaces/IWebEmbeddedView.idl b/WebKit/win/Interfaces/IWebEmbeddedView.idl
index bcca2fd..fb47f60 100644
--- a/WebKit/win/Interfaces/IWebEmbeddedView.idl
+++ b/WebKit/win/Interfaces/IWebEmbeddedView.idl
@@ -39,8 +39,8 @@ interface IWebEmbeddedView : IUnknown
 {
     HRESULT createViewWindow([in] OLE_HANDLE parentWindow, [in] LPSIZE pluginSize, [out, retval] OLE_HANDLE* window);
 
-    HRESULT didReceiveResponse([in] IWebURLResponse* response);
-    HRESULT didReceiveData([in] IStream* data);
-    HRESULT didFinishLoading();
+    HRESULT didReceiveResponse([in] IWebURLResponse* response);
+    HRESULT didReceiveData([in] IStream* data);
+    HRESULT didFinishLoading();
     HRESULT didFail([in] IWebError* error);
 }
diff --git a/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl b/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
index b46ca6d..66ac241 100644
--- a/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
+++ b/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -58,7 +58,7 @@ interface IWebView;
 [
     object,
     oleautomation,
-    uuid(4CD809C2-73A5-44ee-B0D7-D1863DFE9F57),
+    uuid(3354665B-84BA-4fdf-B35E-BF5CF9D96026),
     pointer_default(unique)
 ]
 interface IWebFrameLoadDelegate : IUnknown
@@ -209,15 +209,6 @@ interface IWebFrameLoadDelegate : IUnknown
         - (void)webView:(WebView *)webView windowScriptObjectAvailable:(WebScriptObject *)windowScriptObject;
     */
     [local] HRESULT windowScriptObjectAvailable([in] IWebView* webView, [in] JSContextRef context, [in] JSObjectRef windowScriptObject);
-}
 
-[
-    object,
-    oleautomation,
-    uuid(3354665B-84BA-4fdf-B35E-BF5CF9D96026),
-    pointer_default(unique)
-]
-interface IWebFrameLoadDelegate2 : IWebFrameLoadDelegate
-{
     [local] HRESULT didClearWindowObject([in] IWebView* webView, [in] JSContextRef context, [in] JSObjectRef windowScriptObject, [in] IWebFrame* frame);
 }
diff --git a/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl b/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl
index 5ae91dd..499716c 100644
--- a/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,7 +36,7 @@ interface IWebView;
 [
     object,
     oleautomation,
-    uuid(32DC2531-948D-400e-A82F-FE6668B61A0B),
+    uuid(5566CB49-6E87-4075-80CE-9BAC374C52DE),
     pointer_default(unique)
 ]
 interface IWebFrameLoadDelegatePrivate : IUnknown
@@ -50,15 +50,6 @@ interface IWebFrameLoadDelegatePrivate : IUnknown
     // Addresses 4192534.  Private API for now.
     //- (void)webView:(WebView *)sender didHandleOnloadEventsForFrame:(WebFrame *)frame;
     HRESULT didHandleOnloadEventsForFrame([in] IWebView* sender, [in] IWebFrame* frame);
-}
 
-[
-    object,
-    oleautomation,
-    uuid(5566CB49-6E87-4075-80CE-9BAC374C52DE),
-    pointer_default(unique)
-]
-interface IWebFrameLoadDelegatePrivate2 : IWebFrameLoadDelegatePrivate
-{
     HRESULT didFirstVisuallyNonEmptyLayoutInFrame([in] IWebView* sender, [in] IWebFrame* frame);
 }
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index f00bec5..96b42ab 100755
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -42,7 +42,9 @@ typedef enum {
     WebFrameLoadTypeReloadAllowingStaleData,
     WebFrameLoadTypeSame,               // user loads same URL again (but not reload button)
     WebFrameLoadTypeRedirectWithLockedBackForwardList,
-    WebFrameLoadTypeReplace
+    WebFrameLoadTypeReplace,
+    WebFrameLoadTypeReloadFromOrigin,
+    WebFrameLoadTypeBackWMLDeckNotAccessible
 } WebFrameLoadType;
 
 [
diff --git a/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl b/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl
index 4922504..7139962 100644
--- a/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl
+++ b/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl
@@ -61,7 +61,7 @@ interface IWebHistoryItemPrivate : IUnknown
     HRESULT setLastVisitWasHTTPNonGet([in] BOOL wasHTTPNonGet);
 
     HRESULT redirectURLs([out, retval] IEnumVARIANT** result);
-    HRESULT visitedWithTitle([in] BSTR title);
+    HRESULT visitedWithTitle([in] BSTR title, [in] BOOL increaseVisitCount);
 
     HRESULT getDailyVisitCounts([out] int* number, [out, retval] int** counts);
     HRESULT getWeeklyVisitCounts([out] int* number, [out, retval] int** counts);
diff --git a/WebKit/win/Interfaces/IWebHistoryPrivate.idl b/WebKit/win/Interfaces/IWebHistoryPrivate.idl
index 6e4754e..6ad08c9 100644
--- a/WebKit/win/Interfaces/IWebHistoryPrivate.idl
+++ b/WebKit/win/Interfaces/IWebHistoryPrivate.idl
@@ -35,4 +35,5 @@ interface IWebHistoryItem;
 interface IWebHistoryPrivate : IUnknown
 {
     HRESULT allItems([in, out] int* count, [out, retval] IWebHistoryItem** items);
+    HRESULT data([out, retval] IStream**);
 }
diff --git a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
index b9e05ec..562a75b 100644
--- a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
+++ b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
@@ -75,4 +75,7 @@ interface IWebPreferencesPrivate : IUnknown
 
     HRESULT allowUniversalAccessFromFileURLs([out, retval] BOOL *allowAccess);
     HRESULT setAllowUniversalAccessFromFileURLs([in] BOOL allowAccess);
+
+    HRESULT isXSSAuditorEnabled([out, retval] BOOL *enabled);
+    HRESULT setXSSAuditorEnabled([in] BOOL enabled);
 }
diff --git a/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl b/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl
index df23091..664e38d 100644
--- a/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl
@@ -42,7 +42,7 @@ interface IWebURLRequest;
 [
     object,
     oleautomation,
-    uuid(1AE2968D-D756-47e8-8493-EA1040FAA725),
+    uuid(099DC3C1-34B5-4169-ABBF-0C63CBC25605),
     pointer_default(unique)
 ]
 interface IWebResourceLoadDelegatePrivate : IUnknown
@@ -57,26 +57,8 @@ interface IWebResourceLoadDelegatePrivate : IUnknown
         - (id)webView:(WebView *)sender didLoadResourceFromMemoryCache:(NSURLRequest *)request response:(NSURLResponse *)response length:(NSInteger)length fromDataSource:(WebDataSource *)dataSource
     */
     HRESULT didLoadResourceFromMemoryCache([in] IWebView* webView, [in] IWebURLRequest* request, [in] IWebURLResponse* response, [in] UINT length, [in] IWebDataSource* dataSource);
-}
 
-[
-    object,
-    oleautomation,
-    uuid(E7B724A4-F0E5-4e11-9AC5-5F60AC09301E),
-    pointer_default(unique)
-]
-interface IWebResourceLoadDelegatePrivate2 : IWebResourceLoadDelegatePrivate
-{
     HRESULT shouldUseCredentialStorage([in] IWebView* webView, [in] unsigned long identifier, [in] IWebDataSource* dataSource, [out, retval] BOOL* shouldUse);
-}
 
-[
-    object,
-    oleautomation,
-    uuid(099DC3C1-34B5-4169-ABBF-0C63CBC25605),
-    pointer_default(unique)
-]
-interface IWebResourceLoadDelegatePrivate3 : IWebResourceLoadDelegatePrivate2
-{
     HRESULT shouldCacheResponse([in] IWebView* webView, [in] unsigned long identifier, [in] IWebURLResponse* response, [in] const char* data, [in] unsigned long long length, [in] IWebDataSource* dataSource, [out, retval] BOOL* shouldCache);
 }
diff --git a/WebKit/win/Interfaces/IWebScriptCallFrame.idl b/WebKit/win/Interfaces/IWebScriptCallFrame.idl
deleted file mode 100644
index d3a7f85..0000000
--- a/WebKit/win/Interfaces/IWebScriptCallFrame.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DO_NO_IMPORTS
-import "oaidl.idl";
-import "ocidl.idl";
-#endif
-
-cpp_quote("// this is done to get midl to treat the WebScriptCallFrame type as a pointer type")
-cpp_quote("#if 0")
-typedef void* WebScriptCallFrame;
-cpp_quote("#else")
-cpp_quote("class WebScriptCallFrame;")
-cpp_quote("#endif")
-
-[
-    object,
-    oleautomation,
-    uuid(029D0676-162A-4140-8917-9574E09F66EB),
-    pointer_default(unique)
-]
-interface IWebScriptCallFrame : IUnknown
-{
-    HRESULT caller([out, retval] IWebScriptCallFrame**);
-    HRESULT functionName([out, retval] BSTR*);
-    HRESULT stringByEvaluatingJavaScriptFromString([in] BSTR script, [out, retval] BSTR*);
-    HRESULT variableNames([out, retval] IEnumVARIANT**);
-    HRESULT valueForVariable([in] BSTR key, [out, retval] BSTR* value);
-}
diff --git a/WebKit/win/Interfaces/IWebScriptDebugListener.idl b/WebKit/win/Interfaces/IWebScriptDebugListener.idl
deleted file mode 100644
index ab6244d..0000000
--- a/WebKit/win/Interfaces/IWebScriptDebugListener.idl
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DO_NO_IMPORTS
-import "oaidl.idl";
-import "ocidl.idl";
-import "IWebScriptCallFrame.idl";
-import "IWebView.idl";
-#endif
-
-interface IWebDataSource;
-interface IWebFrame;
-interface IWebScriptCallFrame;
-interface IWebView;
-
-[
-    object,
-    oleautomation,
-    uuid(09612B56-BE17-4867-A441-1C5C4E0F5302),
-    pointer_default(unique)
-]
-interface IWebScriptDebugListener : IUnknown
-{
-    HRESULT didLoadMainResourceForDataSource([in] IWebView* view, [in] IWebDataSource* dataSource);
-    HRESULT didParseSource([in] IWebView* view, [in] BSTR sourceCode, [in] UINT baseLineNumber, [in] BSTR url, [in] int sourceID, [in] IWebFrame* forWebFrame);
-    HRESULT failedToParseSource([in] IWebView* view, [in] BSTR sourceCode, [in] UINT baseLineNumber, [in] BSTR url, [in] BSTR error, [in] IWebFrame* forWebFrame);
-    HRESULT didEnterCallFrame([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
-    HRESULT willExecuteStatement([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
-    HRESULT willLeaveCallFrame([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
-    HRESULT exceptionWasRaised([in] IWebView* view, [in] IWebScriptCallFrame* frame, [in] int sourceID, [in] int lineNumber, [in] IWebFrame* forWebFrame);
-    HRESULT serverDidDie();
-}
diff --git a/WebKit/win/Interfaces/IWebScriptDebugServer.idl b/WebKit/win/Interfaces/IWebScriptDebugServer.idl
deleted file mode 100644
index 975ff68..0000000
--- a/WebKit/win/Interfaces/IWebScriptDebugServer.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DO_NO_IMPORTS
-import "oaidl.idl";
-import "ocidl.idl";
-import "IWebScriptDebugListener.idl";
-#endif
-
-interface IWebScriptDebugListener;
-
-[
-    object,
-    oleautomation,
-    uuid(E24111D6-3668-4c8b-B921-D644524945F8),
-    pointer_default(unique)
-]
-interface IWebScriptDebugServer : IUnknown
-{
-    HRESULT sharedWebScriptDebugServer([out, retval] IWebScriptDebugServer**);
-    HRESULT addListener([in] IWebScriptDebugListener*);
-    HRESULT removeListener([in] IWebScriptDebugListener*);
-    HRESULT step();
-    HRESULT pause();
-    HRESULT resume();
-    HRESULT isPaused([out, retval] BOOL* isPaused);
-}
diff --git a/WebKit/win/Interfaces/IWebUIDelegate.idl b/WebKit/win/Interfaces/IWebUIDelegate.idl
index 44869b7..5886c7c 100644
--- a/WebKit/win/Interfaces/IWebUIDelegate.idl
+++ b/WebKit/win/Interfaces/IWebUIDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -182,7 +182,7 @@ interface IWebOpenPanelResultListener : IUnknown
 [
     object,
     oleautomation,
-    uuid(2452A889-A74A-4fbc-9617-326A0A953630),
+    uuid(042B7EE3-A5A4-4a8f-8C33-775CD9E89C7C),
     pointer_default(unique)
 ]
 interface IWebUIDelegate : IUnknown
@@ -557,7 +557,7 @@ interface IWebUIDelegate : IUnknown
         the contents of the dragging pasteboard.
         - (void)webView:(WebView *)webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:(NSPoint)point withPasteboard:(NSPasteboard *)pasteboard;
     */
-    HRESULT willPerformDragSourceAction([in] IWebView* webView, [in] WebDragSourceAction action, [in] LPPOINT point, [in] IDataObject* pasteboard);
+    HRESULT willPerformDragSourceAction([in] IWebView* webView, [in] WebDragSourceAction action, [in] LPPOINT point, [in] IDataObject* pasteboard, [out, retval] IDataObject** newPasteboard);
 
     /*!
         @method webView:contextMenuItemSelected:ForElement:
@@ -680,21 +680,8 @@ interface IWebUIDelegate : IUnknown
         @abstract Returns whether there's anything on the redo stack to be redone
     */
     HRESULT canRedo([out, retval] BOOL* result);
-}
 
 /*!
-    @category WebUIDelegate2
-    @discussion A class that supplements the IWebUIDelegate interface
-*/
-[
-    object,
-    oleautomation,
-    uuid(C6FF73E1-304D-4129-A60C-66326C2578DB),
-    pointer_default(unique)
-]
-interface IWebUIDelegate2 : IWebUIDelegate
-{
-/*!
     @method webView:printFrame:
     @abstract Informs that a WebFrame needs to be printed
     @param webView The WebView sending the delegate method
@@ -758,40 +745,13 @@ interface IWebUIDelegate2 : IWebUIDelegate
     HRESULT drawFooterInRect([in] IWebView* webView, [in] RECT* rect, [in] OLE_HANDLE drawingContext, [in] UINT pageIndex, [in] UINT pageCount);
 
     HRESULT webViewPrintingMarginRect([in] IWebView* webView, [out, retval] RECT* rect);
-}
 
-/*!
-    @category WebUIDelegate3
-    @discussion A class that supplements the IWebUIDelegate interface
-*/
-[
-    object,
-    oleautomation,
-    uuid(DD544D90-C233-4562-8EFD-A8D3A0DEBC19),
-    pointer_default(unique)
-]
-interface IWebUIDelegate3 : IWebUIDelegate2
-{
     HRESULT canRunModal([in] IWebView* webView, [out, retval] BOOL* canRunBoolean);
     HRESULT createModalDialog([in] IWebView* sender, [in] IWebURLRequest* request, [out, retval] IWebView** newWebView);
     HRESULT runModal([in] IWebView* webView);
     HRESULT isMenuBarVisible([in] IWebView* webView, [out, retval] BOOL* visible);
     HRESULT setMenuBarVisible([in] IWebView* webView, [in] BOOL visible);
     HRESULT runDatabaseSizeLimitPrompt([in] IWebView* webView, [in] BSTR displayName, [in] IWebFrame* initiatedByFrame, [out, retval] BOOL* allowed);
-}
-
-/*!
-    @category WebUIDelegate4
-    @discussion A class that supplements the IWebUIDelegate interface
-*/
-[
-    object,
-    oleautomation,
-    uuid(042B7EE3-A5A4-4a8f-8C33-775CD9E89C7C),
-    pointer_default(unique)
-]
-interface IWebUIDelegate4 : IWebUIDelegate3
-{
     HRESULT paintCustomScrollbar([in] IWebView* webView, [in] HDC hDC, [in] RECT rect, [in] WebScrollBarControlSize size, [in] WebScrollbarControlState state, 
                                  [in] WebScrollbarControlPart pressedPart, [in] BOOL vertical, [in] float value, [in] float proportion, [in] WebScrollbarControlPartMask parts);
     HRESULT paintCustomScrollCorner([in] IWebView* webView, [in] HDC hDC, [in] RECT rect);
diff --git a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
index c6d3bbd..da8269b 100755
--- a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@ interface IWebView;
 [
     object,
     oleautomation,
-    uuid(176711F1-822F-446b-BE9A-64BB38C562F5),
+    uuid(df3b4283-6868-4a1f-97f6-baf0b33f239c),
     pointer_default(unique)
 ]
 interface IWebUIDelegatePrivate : IUnknown
@@ -57,49 +57,11 @@ interface IWebUIDelegatePrivate : IUnknown
     HRESULT webViewLostFocus([in] IWebView* sender, [in] OLE_HANDLE loseFocusToHWnd);
     HRESULT doDragDrop([in] IWebView* sender, [in] IDataObject* dataObject, [in] IDropSource* dropSource, [in] DWORD okEffect, [out, retval] DWORD* performedEffect);
     HRESULT webViewGetDlgCode([in] IWebView* sender, [in] UINT keyCode, [out, retval] LONG_PTR* code);
-}
-
-[
-    object,
-    oleautomation,
-    uuid(7518FCCE-EC47-43b9-8C49-51E91C05C944),
-    pointer_default(unique)
-]
-interface IWebUIDelegatePrivate2 : IWebUIDelegatePrivate
-{
     HRESULT webViewPainted([in] IWebView* sender);
-}
-
-[
-    object,
-    oleautomation,
-    uuid(4E7AECB6-C017-4e98-8FD5-4131C4BAB923),
-    pointer_default(unique)
-]
-interface IWebUIDelegatePrivate3 : IWebUIDelegatePrivate2
-{
     HRESULT exceededDatabaseQuota([in] IWebView* sender, [in] IWebFrame* frame, [in] IWebSecurityOrigin* origin, [in] BSTR databaseIdentifier);
-}
-
-[
-    object,
-    oleautomation,
-    uuid(88566775-C003-4EDF-8900-2872AC7EA44F),
-    pointer_default(unique)
-]
-interface IWebUIDelegatePrivate4 : IWebUIDelegatePrivate3
-{
     HRESULT embeddedViewWithArguments([in] IWebView* sender, [in] IWebFrame* frame, [in] IPropertyBag* arguments, [out, retval] IWebEmbeddedView** view);
     HRESULT webViewSendResizeMessage([in] UINT uMsg, [in] WPARAM wParam, [in] LPARAM lParam);
-}
-
-[
-    object,
-    oleautomation,
-    uuid(df3b4283-6868-4a1f-97f6-baf0b33f239c),
-    pointer_default(unique)
-]
-interface IWebUIDelegatePrivate5 : IWebUIDelegatePrivate4
-{
     HRESULT webViewClosing([in] IWebView* sender);
+    HRESULT webViewSetCursor([in] IWebView* sender, [in] OLE_HANDLE cursor);
+    HRESULT webViewDidInvalidate([in] IWebView* sender);
 }
diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
index 4362f89..e4680a1 100644
--- a/WebKit/win/Interfaces/IWebViewPrivate.idl
+++ b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -159,4 +159,6 @@ interface IWebViewPrivate : IUnknown
     HRESULT setMemoryCacheDelegateCallsEnabled([in] BOOL enabled);
 
     HRESULT setJavaScriptURLsAreAllowed([in] BOOL areAllowed);
+
+    HRESULT setCanStartPlugins([in] BOOL canStartPlugins);
 }
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 338ab71..3a6fd8d 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -106,9 +106,6 @@ import "ocidl.idl";
 #include "IWebResource.idl"
 #include "IWebResourceLoadDelegate.idl"
 #include "IWebResourceLoadDelegatePrivate.idl"
-#include "IWebScriptCallFrame.idl"
-#include "IWebScriptDebugListener.idl"
-#include "IWebScriptDebugServer.idl"
 #include "IWebScrollBarDelegatePrivate.idl"
 #include "IWebScrollBarPrivate.idl"
 #include "IWebSecurityOrigin.idl"
@@ -331,11 +328,6 @@ library WebKit
         [default] interface IWebScrollBarPrivate;
     }
 
-    [uuid(715636C4-59E7-4b85-BBC5-B555888787D7)]
-    coclass WebScriptDebugServer {
-        [default] interface IWebScriptDebugServer;
-    }
-
     [uuid(AB201196-8DD2-4d45-AEBD-029B6A37AA27)]
     coclass WebURLResponse {
         [default] interface IWebURLResponse;