diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebKit/win/Interfaces/WebKit.idl | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebKit/win/Interfaces/WebKit.idl')
| -rw-r--r-- | WebKit/win/Interfaces/WebKit.idl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl index 3a6fd8d..c9b33cc 100644 --- a/WebKit/win/Interfaces/WebKit.idl +++ b/WebKit/win/Interfaces/WebKit.idl @@ -73,6 +73,7 @@ import "ocidl.idl"; #include "IWebCoreStatistics.idl" #include "IWebDataSource.idl" #include "IWebDatabaseManager.idl" +#include "IWebDesktopNotificationsDelegate.idl" #include "IWebDocument.idl" #include "IWebDownload.idl" #include "IWebEditingDelegate.idl" @@ -83,6 +84,7 @@ import "ocidl.idl"; #include "IWebFrame.idl" #include "IWebFrameLoadDelegate.idl" #include "IWebFrameLoadDelegatePrivate.idl" +#include "IWebFrameLoadDelegatePrivate2.idl" #include "IWebFramePrivate.idl" #include "IWebFrameView.idl" #include "IWebHTMLRepresentation.idl" @@ -94,13 +96,16 @@ import "ocidl.idl"; #include "IWebIconDatabase.idl" #include "IWebIconFetcher.idl" #include "IWebInspector.idl" +#include "IWebInspectorPrivate.idl" #include "IWebJavaScriptCollector.idl" #include "IWebKitStatistics.idl" #include "IWebMutableURLRequestPrivate.idl" #include "IWebNotification.idl" #include "IWebNotificationCenter.idl" #include "IWebNotificationObserver.idl" +#include "IWebPluginHalterDelegate.idl" #include "IWebPolicyDelegate.idl" +#include "IWebPolicyDelegatePrivate.idl" #include "IWebPreferences.idl" #include "IWebPreferencesPrivate.idl" #include "IWebResource.idl" @@ -111,6 +116,7 @@ import "ocidl.idl"; #include "IWebSecurityOrigin.idl" #include "IWebTextRenderer.idl" #include "IWebUIDelegate.idl" +#include "IWebUIDelegate2.idl" #include "IWebUIDelegatePrivate.idl" #include "IWebURLAuthenticationChallenge.idl" #include "IWebURLRequest.idl" @@ -121,6 +127,7 @@ import "ocidl.idl"; #include "IWebUndoTarget.idl" #include "IWebView.idl" #include "IWebViewPrivate.idl" +#include "IWebWorkersPrivate.idl" #include "IGEN_DOMObject.idl" #include "IGEN_DOMCharacterData.idl" @@ -357,6 +364,10 @@ library WebKit coclass WebCookieManager{ [default] interface IWebCookieManager; } -} + [uuid(0967AAFF-2FFE-4fcc-81F3-3FF2A9C6DCE2)] + coclass WebWorkersPrivate{ + [default] interface IWebWorkersPrivate; + } +} |