Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.cpp

Issue 2744593005: Merge mutableResourceRequest() calls in XSLStyleSheetResource (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 17 matching lines...) Expand all
28 28
29 #include "core/loader/resource/StyleSheetResourceClient.h" 29 #include "core/loader/resource/StyleSheetResourceClient.h"
30 #include "platform/RuntimeEnabledFeatures.h" 30 #include "platform/RuntimeEnabledFeatures.h"
31 #include "platform/SharedBuffer.h" 31 #include "platform/SharedBuffer.h"
32 #include "platform/loader/fetch/FetchRequest.h" 32 #include "platform/loader/fetch/FetchRequest.h"
33 #include "platform/loader/fetch/ResourceClientWalker.h" 33 #include "platform/loader/fetch/ResourceClientWalker.h"
34 #include "platform/loader/fetch/ResourceFetcher.h" 34 #include "platform/loader/fetch/ResourceFetcher.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 static void applyXSLRequestProperties(ResourceRequest& request) { 38 static void applyXSLRequestProperties(FetchRequest& request) {
39 request.setRequestContext(WebURLRequest::RequestContextXSLT); 39 request.setRequestContext(WebURLRequest::RequestContextXSLT);
40 // TODO(japhet): Accept: headers can be set manually on XHRs from script, in 40 // TODO(japhet): Accept: headers can be set manually on XHRs from script, in
41 // the browser process, and... here. The browser process can't tell the 41 // the browser process, and... here. The browser process can't tell the
42 // difference between an XSL stylesheet and a CSS stylesheet, so it assumes 42 // difference between an XSL stylesheet and a CSS stylesheet, so it assumes
43 // stylesheets are all CSS unless they already have an Accept: header set. 43 // stylesheets are all CSS unless they already have an Accept: header set.
44 // Should we teach the browser process the difference? 44 // Should we teach the browser process the difference?
45 DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT, 45 DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT,
46 ("text/xml, application/xml, application/xhtml+xml, " 46 ("text/xml, application/xml, application/xhtml+xml, "
47 "text/xsl, application/rss+xml, application/atom+xml")); 47 "text/xsl, application/rss+xml, application/atom+xml"));
48 request.setHTTPAccept(acceptXSLT); 48 request.mutableResourceRequest().setHTTPAccept(acceptXSLT);
49 } 49 }
50 50
51 XSLStyleSheetResource* XSLStyleSheetResource::fetchSynchronously( 51 XSLStyleSheetResource* XSLStyleSheetResource::fetchSynchronously(
52 FetchRequest& request, 52 FetchRequest& request,
53 ResourceFetcher* fetcher) { 53 ResourceFetcher* fetcher) {
54 applyXSLRequestProperties(request.mutableResourceRequest()); 54 applyXSLRequestProperties(request);
55 request.makeSynchronous(); 55 request.makeSynchronous();
56 XSLStyleSheetResource* resource = toXSLStyleSheetResource( 56 XSLStyleSheetResource* resource = toXSLStyleSheetResource(
57 fetcher->requestResource(request, XSLStyleSheetResourceFactory())); 57 fetcher->requestResource(request, XSLStyleSheetResourceFactory()));
58 if (resource && resource->data()) 58 if (resource && resource->data())
59 resource->m_sheet = resource->decodedText(); 59 resource->m_sheet = resource->decodedText();
60 return resource; 60 return resource;
61 } 61 }
62 62
63 XSLStyleSheetResource* XSLStyleSheetResource::fetch(FetchRequest& request, 63 XSLStyleSheetResource* XSLStyleSheetResource::fetch(FetchRequest& request,
64 ResourceFetcher* fetcher) { 64 ResourceFetcher* fetcher) {
65 DCHECK(RuntimeEnabledFeatures::xsltEnabled()); 65 DCHECK(RuntimeEnabledFeatures::xsltEnabled());
66 applyXSLRequestProperties(request.mutableResourceRequest()); 66 applyXSLRequestProperties(request);
67 return toXSLStyleSheetResource( 67 return toXSLStyleSheetResource(
68 fetcher->requestResource(request, XSLStyleSheetResourceFactory())); 68 fetcher->requestResource(request, XSLStyleSheetResourceFactory()));
69 } 69 }
70 70
71 XSLStyleSheetResource::XSLStyleSheetResource( 71 XSLStyleSheetResource::XSLStyleSheetResource(
72 const ResourceRequest& resourceRequest, 72 const ResourceRequest& resourceRequest,
73 const ResourceLoaderOptions& options, 73 const ResourceLoaderOptions& options,
74 const String& charset) 74 const String& charset)
75 : StyleSheetResource(resourceRequest, 75 : StyleSheetResource(resourceRequest,
76 XSLStyleSheet, 76 XSLStyleSheet,
(...skipping 15 matching lines...) Expand all
92 m_sheet = decodedText(); 92 m_sheet = decodedText();
93 93
94 ResourceClientWalker<StyleSheetResourceClient> w(clients()); 94 ResourceClientWalker<StyleSheetResourceClient> w(clients());
95 while (StyleSheetResourceClient* c = w.next()) { 95 while (StyleSheetResourceClient* c = w.next()) {
96 markClientFinished(c); 96 markClientFinished(c);
97 c->setXSLStyleSheet(resourceRequest().url(), response().url(), m_sheet); 97 c->setXSLStyleSheet(resourceRequest().url(), response().url(), m_sheet);
98 } 98 }
99 } 99 }
100 100
101 } // namespace blink 101 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698