Commit 2779971c authored by hiroshige's avatar hiroshige Committed by Commit bot

Merge mutableResourceRequest() calls in XSLStyleSheetResource

BUG=632580

Review-Url: https://codereview.chromium.org/2744593005
Cr-Commit-Position: refs/heads/master@{#456214}
parent 77a7705f
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
namespace blink { namespace blink {
static void applyXSLRequestProperties(ResourceRequest& request) { static void applyXSLRequestProperties(FetchRequest& request) {
request.setRequestContext(WebURLRequest::RequestContextXSLT); request.setRequestContext(WebURLRequest::RequestContextXSLT);
// TODO(japhet): Accept: headers can be set manually on XHRs from script, in // TODO(japhet): Accept: headers can be set manually on XHRs from script, in
// the browser process, and... here. The browser process can't tell the // the browser process, and... here. The browser process can't tell the
...@@ -45,13 +45,13 @@ static void applyXSLRequestProperties(ResourceRequest& request) { ...@@ -45,13 +45,13 @@ static void applyXSLRequestProperties(ResourceRequest& request) {
DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT, DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT,
("text/xml, application/xml, application/xhtml+xml, " ("text/xml, application/xml, application/xhtml+xml, "
"text/xsl, application/rss+xml, application/atom+xml")); "text/xsl, application/rss+xml, application/atom+xml"));
request.setHTTPAccept(acceptXSLT); request.mutableResourceRequest().setHTTPAccept(acceptXSLT);
} }
XSLStyleSheetResource* XSLStyleSheetResource::fetchSynchronously( XSLStyleSheetResource* XSLStyleSheetResource::fetchSynchronously(
FetchRequest& request, FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
applyXSLRequestProperties(request.mutableResourceRequest()); applyXSLRequestProperties(request);
request.makeSynchronous(); request.makeSynchronous();
XSLStyleSheetResource* resource = toXSLStyleSheetResource( XSLStyleSheetResource* resource = toXSLStyleSheetResource(
fetcher->requestResource(request, XSLStyleSheetResourceFactory())); fetcher->requestResource(request, XSLStyleSheetResourceFactory()));
...@@ -63,7 +63,7 @@ XSLStyleSheetResource* XSLStyleSheetResource::fetchSynchronously( ...@@ -63,7 +63,7 @@ XSLStyleSheetResource* XSLStyleSheetResource::fetchSynchronously(
XSLStyleSheetResource* XSLStyleSheetResource::fetch(FetchRequest& request, XSLStyleSheetResource* XSLStyleSheetResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK(RuntimeEnabledFeatures::xsltEnabled()); DCHECK(RuntimeEnabledFeatures::xsltEnabled());
applyXSLRequestProperties(request.mutableResourceRequest()); applyXSLRequestProperties(request);
return toXSLStyleSheetResource( return toXSLStyleSheetResource(
fetcher->requestResource(request, XSLStyleSheetResourceFactory())); fetcher->requestResource(request, XSLStyleSheetResourceFactory()));
} }
......
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