Commit 4ed5f905 authored by mnaganov@chromium.org's avatar mnaganov@chromium.org
Browse files

2011-02-16 Sheriff Bot <webkit.review.bot@gmail.com>

	Unreviewed, rolling out r78678.
	http://trac.webkit.org/changeset/78678
	https://bugs.webkit.org/show_bug.cgi?id=54554

	Breaks NaCl tests in Chromium (Requested by mnaganov on
	#webkit).

	* src/WebURLRequest.cpp:
	(WebKit::WebURLRequestPrivateImpl::WebURLRequestPrivateImpl):
	(WebKit::WebURLRequest::downloadToFile):
	(WebKit::WebURLRequest::setDownloadToFile):
	* src/WebURLRequestPrivate.h:
	(WebKit::WebURLRequestPrivate::WebURLRequestPrivate):
	* src/WebURLResponse.cpp:
	(WebKit::WebURLResponsePrivateImpl::WebURLResponsePrivateImpl):
	(WebKit::WebURLResponse::downloadFilePath):
	(WebKit::WebURLResponse::setDownloadFilePath):
	* src/WebURLResponsePrivate.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78705 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3271ebe2
2011-02-16 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r78678.
http://trac.webkit.org/changeset/78678
https://bugs.webkit.org/show_bug.cgi?id=54554
Breaks NaCl tests in Chromium (Requested by mnaganov on
#webkit).
* src/WebURLRequest.cpp:
(WebKit::WebURLRequestPrivateImpl::WebURLRequestPrivateImpl):
(WebKit::WebURLRequest::downloadToFile):
(WebKit::WebURLRequest::setDownloadToFile):
* src/WebURLRequestPrivate.h:
(WebKit::WebURLRequestPrivate::WebURLRequestPrivate):
* src/WebURLResponse.cpp:
(WebKit::WebURLResponsePrivateImpl::WebURLResponsePrivateImpl):
(WebKit::WebURLResponse::downloadFilePath):
(WebKit::WebURLResponse::setDownloadFilePath):
* src/WebURLResponsePrivate.h:
2011-02-15 Bill Budge <bbudge@chromium.org>
 
Reviewed by David Levin.
......@@ -56,6 +56,7 @@ public:
{
m_resourceRequest = &m_resourceRequestAllocation;
m_allowStoredCredentials = p->m_allowStoredCredentials;
m_downloadToFile = p->m_downloadToFile;
}
virtual void dispose() { delete this; }
......@@ -268,12 +269,12 @@ void WebURLRequest::setAppCacheHostID(int appCacheHostID)
bool WebURLRequest::downloadToFile() const
{
return m_private->m_resourceRequest->downloadToFile();
return m_private->m_downloadToFile;
}
void WebURLRequest::setDownloadToFile(bool downloadToFile)
{
m_private->m_resourceRequest->setDownloadToFile(downloadToFile);
m_private->m_downloadToFile = downloadToFile;
}
ResourceRequest& WebURLRequest::toMutableResourceRequest()
......
......@@ -39,13 +39,17 @@ class WebURLRequestPrivate {
public:
WebURLRequestPrivate()
: m_resourceRequest(0)
, m_allowStoredCredentials(true) { }
, m_allowStoredCredentials(true)
, m_downloadToFile(false) { }
// Called by WebURLRequest when it no longer needs this object.
virtual void dispose() = 0;
WebCore::ResourceRequest* m_resourceRequest;
bool m_allowStoredCredentials;
// FIXME: Move this to ResourceRequest once we have an internal consumer.
bool m_downloadToFile;
};
} // namespace WebKit
......
......@@ -60,6 +60,7 @@ public:
: m_resourceResponseAllocation(*p->m_resourceResponse)
{
m_resourceResponse = &m_resourceResponseAllocation;
m_downloadFilePath = p->m_downloadFilePath;
}
virtual void dispose() { delete this; }
......@@ -375,12 +376,12 @@ void WebURLResponse::setIsMultipartPayload(bool value)
WebString WebURLResponse::downloadFilePath() const
{
return m_private->m_resourceResponse->downloadFilePath();
return m_private->m_downloadFilePath;
}
void WebURLResponse::setDownloadFilePath(const WebString& downloadFilePath)
{
m_private->m_resourceResponse->setDownloadFilePath(downloadFilePath.data());
m_private->m_downloadFilePath = downloadFilePath;
}
WebString WebURLResponse::socketAddress() const
......
......@@ -45,6 +45,9 @@ public:
virtual void dispose() = 0;
WebCore::ResourceResponse* m_resourceResponse;
// FIXME: Move this to ResourceResponse once we have an internal consumer.
WebString m_downloadFilePath;
};
} // namespace WebKit
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment