diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /WebKit/win/Interfaces | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'WebKit/win/Interfaces')
| -rw-r--r-- | WebKit/win/Interfaces/IWebUserContentURLPattern.idl | 1 | ||||
| -rw-r--r-- | WebKit/win/Interfaces/IWebView.idl | 3 | ||||
| -rw-r--r-- | WebKit/win/Interfaces/WebKit.idl | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/win/Interfaces/IWebUserContentURLPattern.idl b/WebKit/win/Interfaces/IWebUserContentURLPattern.idl index b261084..0d4b133 100644 --- a/WebKit/win/Interfaces/IWebUserContentURLPattern.idl +++ b/WebKit/win/Interfaces/IWebUserContentURLPattern.idl @@ -40,4 +40,5 @@ interface IWebUserContentURLPattern : IUnknown HRESULT scheme([out, retval] BSTR*); HRESULT host([out, retval] BSTR*); HRESULT matchesSubdomains([out, retval] BOOL* matches); + HRESULT matchesURL([in] BSTR url, [out, retval] BOOL* matches); } diff --git a/WebKit/win/Interfaces/IWebView.idl b/WebKit/win/Interfaces/IWebView.idl index bec4df5..e3ec98a 100644 --- a/WebKit/win/Interfaces/IWebView.idl +++ b/WebKit/win/Interfaces/IWebView.idl @@ -1216,3 +1216,6 @@ interface IWebViewEditingActions : IUnknown */ HRESULT stopSpeaking([in] IUnknown* sender); } + + + diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl index 8938501..ce2f213 100644 --- a/WebKit/win/Interfaces/WebKit.idl +++ b/WebKit/win/Interfaces/WebKit.idl @@ -300,3 +300,4 @@ library WebKit [default] interface IWebUserContentURLPattern; } } + |