From a1353855e56d0154af127b9cb6df95287a4d5be5 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Thu, 6 Aug 2009 05:34:22 +0000 Subject: Fix a bunch of layout tests related to dumpResourceLoadCallbacks. There are several changes included: 1- Fixed up some of the signatures of virtual methods on TestWebViewDelegate so that they actually get called. 2- Fudged the output of some of the events so that they match the WebKit Mac results. This means outputing NSError instead of WebError, etc. 3- Modified WebURLLoaderImpl to send a more meaningful redirect request. This allows some tests to observe that we are for example going to be issuing a POST request in response to a 307 redirect of a POST request. 4- Modified WebViewDelegate::WillSendRequest to take a redirect_response parameter so that the TestWebViewDelegate can log information about that. 5- Deleted a number of custom baselines that are now unnecessary! :-) 6- Removed some code from WebFrameLoaderClientImpl::dispatchWillSendRequest that was causing our setting for firstPartyForCookies to differ from Safari. This CL depends on WebKit r46820. R=dglazkov,abarth BUG=none TEST=none Review URL: http://codereview.chromium.org/164033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22590 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/api/public/WebURLRequest.h | 2 +- webkit/api/public/WebURLResponse.h | 2 +- webkit/api/src/WebURLRequest.cpp | 5 +++++ webkit/api/src/WebURLResponse.cpp | 5 +++++ webkit/api/src/WrappedResourceRequest.h | 3 +-- webkit/api/src/WrappedResourceResponse.h | 3 +-- 6 files changed, 14 insertions(+), 6 deletions(-) (limited to 'webkit/api') diff --git a/webkit/api/public/WebURLRequest.h b/webkit/api/public/WebURLRequest.h index 6499b85..1f3b506 100644 --- a/webkit/api/public/WebURLRequest.h +++ b/webkit/api/public/WebURLRequest.h @@ -79,7 +79,7 @@ namespace WebKit { WEBKIT_API void reset(); WEBKIT_API void assign(const WebURLRequest&); - bool isNull() const { return m_private == 0; } + WEBKIT_API bool isNull() const; WEBKIT_API WebURL url() const; WEBKIT_API void setURL(const WebURL&); diff --git a/webkit/api/public/WebURLResponse.h b/webkit/api/public/WebURLResponse.h index 2fb51b2..cb17d65 100644 --- a/webkit/api/public/WebURLResponse.h +++ b/webkit/api/public/WebURLResponse.h @@ -62,7 +62,7 @@ namespace WebKit { WEBKIT_API void reset(); WEBKIT_API void assign(const WebURLResponse&); - bool isNull() const { return m_private == 0; } + WEBKIT_API bool isNull() const; WEBKIT_API WebURL url() const; WEBKIT_API void setURL(const WebURL&); diff --git a/webkit/api/src/WebURLRequest.cpp b/webkit/api/src/WebURLRequest.cpp index d6eb114..14f5b8d 100644 --- a/webkit/api/src/WebURLRequest.cpp +++ b/webkit/api/src/WebURLRequest.cpp @@ -78,6 +78,11 @@ void WebURLRequest::assign(const WebURLRequest& r) assign(r.m_private ? new WebURLRequestPrivateImpl(r.m_private) : 0); } +bool WebURLRequest::isNull() const +{ + return !m_private || m_private->m_resourceRequest->isNull(); +} + WebURL WebURLRequest::url() const { return m_private->m_resourceRequest->url(); diff --git a/webkit/api/src/WebURLResponse.cpp b/webkit/api/src/WebURLResponse.cpp index 2fe6d64..14e95b9 100644 --- a/webkit/api/src/WebURLResponse.cpp +++ b/webkit/api/src/WebURLResponse.cpp @@ -78,6 +78,11 @@ void WebURLResponse::assign(const WebURLResponse& r) assign(r.m_private ? new WebURLResponsePrivateImpl(r.m_private) : 0); } +bool WebURLResponse::isNull() const +{ + return !m_private || m_private->m_resourceResponse->isNull(); +} + WebURL WebURLResponse::url() const { return m_private->m_resourceResponse->url(); diff --git a/webkit/api/src/WrappedResourceRequest.h b/webkit/api/src/WrappedResourceRequest.h index f232375..07e14ee 100644 --- a/webkit/api/src/WrappedResourceRequest.h +++ b/webkit/api/src/WrappedResourceRequest.h @@ -65,8 +65,7 @@ namespace WebKit { void bind(const WebCore::ResourceRequest& resourceRequest) { - m_handle.m_resourceRequest = const_cast(&resourceRequest); - assign(&m_handle); + bind(*const_cast(&resourceRequest)); } private: diff --git a/webkit/api/src/WrappedResourceResponse.h b/webkit/api/src/WrappedResourceResponse.h index 8c44315..67d7018 100644 --- a/webkit/api/src/WrappedResourceResponse.h +++ b/webkit/api/src/WrappedResourceResponse.h @@ -65,8 +65,7 @@ namespace WebKit { void bind(const WebCore::ResourceResponse& resourceResponse) { - m_handle.m_resourceResponse = const_cast(&resourceResponse); - assign(&m_handle); + bind(*const_cast(&resourceResponse)); } private: -- cgit v1.1