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/WebFrame.h | |
| 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/WebFrame.h')
| -rw-r--r-- | WebKit/win/WebFrame.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h index 7af72d4..8edc81a 100644 --- a/WebKit/win/WebFrame.h +++ b/WebKit/win/WebFrame.h @@ -224,6 +224,8 @@ public: virtual HRESULT STDMETHODCALLTYPE setExcludeFromTextSearch( /* [in] */ BOOL flag); + virtual HRESULT STDMETHODCALLTYPE reloadFromOrigin(); + virtual HRESULT STDMETHODCALLTYPE paintDocumentRectToContext( /* [in] */ RECT rect, /* [in] */ OLE_HANDLE deviceContext); @@ -238,6 +240,10 @@ public: virtual HRESULT STDMETHODCALLTYPE isDisplayingStandaloneImage(BOOL*); + virtual HRESULT STDMETHODCALLTYPE allowsFollowingLink( + /* [in] */ BSTR url, + /* [retval][out] */ BOOL* result); + // IWebDocumentText virtual HRESULT STDMETHODCALLTYPE supportsTextEncoding( /* [retval][out] */ BOOL* result); |