diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h')
| -rw-r--r-- | WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h b/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h index 1a134fc..526e1b4 100644 --- a/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h +++ b/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h @@ -35,7 +35,7 @@ class AccessibilityController; class GCController; -class FrameLoadDelegate : public IWebFrameLoadDelegate2, public IWebFrameLoadDelegatePrivate { +class FrameLoadDelegate : public IWebFrameLoadDelegate, public IWebFrameLoadDelegatePrivate { public: FrameLoadDelegate(); virtual ~FrameLoadDelegate(); @@ -54,7 +54,7 @@ public: virtual HRESULT STDMETHODCALLTYPE didReceiveServerRedirectForProvisionalLoadForFrame( /* [in] */ IWebView *webView, - /* [in] */ IWebFrame *frame) { return E_NOTIMPL; } + /* [in] */ IWebFrame *frame); virtual HRESULT STDMETHODCALLTYPE didFailProvisionalLoadWithError( /* [in] */ IWebView *webView, @@ -93,11 +93,11 @@ public: /* [in] */ BSTR url, /* [in] */ double delaySeconds, /* [in] */ DATE fireDate, - /* [in] */ IWebFrame *frame) { return E_NOTIMPL; } + /* [in] */ IWebFrame *frame); virtual HRESULT STDMETHODCALLTYPE didCancelClientRedirectForFrame( /* [in] */ IWebView *webView, - /* [in] */ IWebFrame *frame) { return E_NOTIMPL; } + /* [in] */ IWebFrame *frame); virtual HRESULT STDMETHODCALLTYPE willCloseFrame( /* [in] */ IWebView *webView, @@ -108,6 +108,12 @@ public: /* [in] */ JSContextRef context, /* [in] */ JSObjectRef windowObject) { return E_NOTIMPL; } + virtual /* [local] */ HRESULT STDMETHODCALLTYPE didClearWindowObject( + /* [in] */ IWebView* webView, + /* [in] */ JSContextRef context, + /* [in] */ JSObjectRef windowObject, + /* [in] */ IWebFrame* frame); + // IWebFrameLoadDelegatePrivate virtual HRESULT STDMETHODCALLTYPE didFinishDocumentLoadForFrame( /* [in] */ IWebView *sender, @@ -121,12 +127,9 @@ public: /* [in] */ IWebView *sender, /* [in] */ IWebFrame *frame); - // IWebFrameLoadDelegate2 - virtual /* [local] */ HRESULT STDMETHODCALLTYPE didClearWindowObject( - /* [in] */ IWebView* webView, - /* [in] */ JSContextRef context, - /* [in] */ JSObjectRef windowObject, - /* [in] */ IWebFrame* frame); + virtual HRESULT STDMETHODCALLTYPE didFirstVisuallyNonEmptyLayoutInFrame( + /* [in] */ IWebView *sender, + /* [in] */ IWebFrame *frame); protected: void locationChangeDone(IWebError*, IWebFrame*); |