diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebKit/win/Interfaces | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebKit/win/Interfaces')
| -rw-r--r-- | WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate2.idl | 1 | ||||
| -rw-r--r-- | WebKit/win/Interfaces/IWebPreferencesPrivate.idl | 3 | ||||
| -rwxr-xr-x | WebKit/win/Interfaces/IWebUIDelegatePrivate.idl | 1 | ||||
| -rw-r--r-- | WebKit/win/Interfaces/IWebViewPrivate.idl | 2 | ||||
| -rw-r--r-- | WebKit/win/Interfaces/WebKit.idl | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate2.idl b/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate2.idl index 7e07c55..b1eb87a 100644 --- a/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate2.idl +++ b/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate2.idl @@ -52,4 +52,5 @@ interface IWebFrameLoadDelegatePrivate2 : IWebFrameLoadDelegatePrivate HRESULT didPushStateWithinPageForFrame([in] IWebView* webView, [in] IWebFrame* frame); HRESULT didReplaceStateWithinPageForFrame([in] IWebView* webView, [in] IWebFrame* frame); HRESULT didPopStateWithinPageForFrame([in] IWebView* webView, [in] IWebFrame* frame); + HRESULT didChangeIcons([in] IWebView* webView, [in] IWebFrame* frame); } diff --git a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl index 76ee3fa..2cb4037 100644 --- a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl +++ b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl @@ -109,4 +109,7 @@ interface IWebPreferencesPrivate : IUnknown HRESULT setShowRepaintCounter([in] BOOL); HRESULT showRepaintCounter([out, retval] BOOL*); + + HRESULT javaScriptCanAccessClipboard([out, retval] BOOL *enabled); + HRESULT setJavaScriptCanAccessClipboard([in] BOOL enabled); } diff --git a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl index d9702de..215c427 100755 --- a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl +++ b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl @@ -33,7 +33,6 @@ import "IWebView.idl"; cpp_quote("#define WebEmbeddedViewAttributesKey TEXT(\"WebEmbeddedViewAttributesKey\")") cpp_quote("#define WebEmbeddedViewBaseURLKey TEXT(\"WebEmbeddedViewBaseURLKey\")") -cpp_quote("#define WebEmbeddedViewSourceURLKey TEXT(\"WebEmbeddedViewSourceURLKey\")") cpp_quote("#define WebEmbeddedViewContainingElementKey TEXT(\"WebEmbeddedViewContainingElementKey\")") cpp_quote("#define WebEmbeddedViewMIMETypeKey TEXT(\"WebEmbeddedViewMIMETypeKey\")") diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl index 17378ce..77ef4ac 100644 --- a/WebKit/win/Interfaces/IWebViewPrivate.idl +++ b/WebKit/win/Interfaces/IWebViewPrivate.idl @@ -231,4 +231,6 @@ interface IWebViewPrivate : IUnknown HRESULT setDomainRelaxationForbiddenForURLScheme([in] BOOL forbidden, [in] BSTR scheme); HRESULT registerURLSchemeAsSecure([in] BSTR scheme); + + HRESULT nextDisplayIsSynchronous(); } diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl index d25cdfe..98f5da8 100644 --- a/WebKit/win/Interfaces/WebKit.idl +++ b/WebKit/win/Interfaces/WebKit.idl @@ -300,3 +300,4 @@ library WebKit [default] interface IWebUserContentURLPattern; } } + |