diff options
author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-22 04:55:14 +0000 |
---|---|---|
committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-22 04:55:14 +0000 |
commit | ff3d1e05ef440f4ba219179d3536a172b42476e8 (patch) | |
tree | 5b79c55058a0a1e47c4c51a2efb7e142072bfdb1 /webkit/glue | |
parent | eb6c3395cbcf61eb784765f3975ee7aa3b3d81da (diff) | |
download | chromium_src-ff3d1e05ef440f4ba219179d3536a172b42476e8.zip chromium_src-ff3d1e05ef440f4ba219179d3536a172b42476e8.tar.gz chromium_src-ff3d1e05ef440f4ba219179d3536a172b42476e8.tar.bz2 |
cChrome side of WebKit merge 39369:39410.
* Move files from platform/graphics into platform/animation and
platform/graphics/transforms and update include path
* Add stubs for two new methods in FrameLoaderClient
* Re-baseline one new layout test for Windows and add two to tests_fixable.
Review URL: http://codereview.chromium.org/14917
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 15 | ||||
-rw-r--r-- | webkit/glue/webframeloaderclient_impl.h | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 0fbb4af..d10749d 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -208,6 +208,15 @@ void WebFrameLoaderClient::dispatchWillSendRequest( } } +bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, + unsigned long identifier) { + // FIXME + // Intended to call a method on the resource load delegate. + // Returns true for backward compatibility. + return true; +} + + void WebFrameLoaderClient::dispatchDidReceiveAuthenticationChallenge( DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) { // FIXME @@ -750,6 +759,12 @@ void WebFrameLoaderClient::dispatchDidFirstLayout() { // All resources have not necessarily finished loading. } +void WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout() { + // FIXME: called when webkit finished layout of a page that was visually + // non-empty. + // All resources have not necessarily finished loading. +} + Frame* WebFrameLoaderClient::dispatchCreatePage() { struct WebCore::WindowFeatures features; Page* new_page = webframe_->frame()->page()->chrome()->createWindow( diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h index ad41622..7fd59dc 100644 --- a/webkit/glue/webframeloaderclient_impl.h +++ b/webkit/glue/webframeloaderclient_impl.h @@ -59,6 +59,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&); virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse); + virtual bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier); virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&); virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&); virtual void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&); @@ -82,6 +83,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { virtual void dispatchDidFinishDocumentLoad(); virtual void dispatchDidFinishLoad(); virtual void dispatchDidFirstLayout(); + virtual void dispatchDidFirstVisuallyNonEmptyLayout(); virtual WebCore::Frame* dispatchCreatePage(); virtual void dispatchShow(); |