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

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

Issue 1839473002: Centralize the setting of Accept headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove accept header checking from LinkLoaderTest.Preload Created 4 years, 8 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
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 RefPtrWillBeRawPtr<XSLStyleSheetResource> resource = toXSLStyleSheetResource (fetcher->requestResource(request, XSLStyleSheetResourceFactory())); 45 RefPtrWillBeRawPtr<XSLStyleSheetResource> resource = toXSLStyleSheetResource (fetcher->requestResource(request, XSLStyleSheetResourceFactory()));
46 if (resource && resource->m_data) 46 if (resource && resource->m_data)
47 resource->m_sheet = resource->decodedText(); 47 resource->m_sheet = resource->decodedText();
48 return resource; 48 return resource;
49 } 49 }
50 50
51 PassRefPtrWillBeRawPtr<XSLStyleSheetResource> XSLStyleSheetResource::fetch(Fetch Request& request, ResourceFetcher* fetcher) 51 PassRefPtrWillBeRawPtr<XSLStyleSheetResource> XSLStyleSheetResource::fetch(Fetch Request& request, ResourceFetcher* fetcher)
52 { 52 {
53 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); 53 ASSERT(RuntimeEnabledFeatures::xsltEnabled());
54 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textXSLT); 54 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textXSLT);
55 // TODO(japhet): Accept: headers can be set manually on XHRs from script,
56 // in the browser process, and... here. The browser process can't tell the
57 // difference between an XSL stylesheet and a CSS stylesheet, so it assumes
58 // stylesheets are all CSS unless they already have an Accept: header set.
59 // Should we teach the browser process the difference?
60 DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT, ("text/xml, application/ xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml" , AtomicString::ConstructFromLiteral));
61 request.mutableResourceRequest().setHTTPAccept(acceptXSLT);
55 return toXSLStyleSheetResource(fetcher->requestResource(request, XSLStyleShe etResourceFactory())); 62 return toXSLStyleSheetResource(fetcher->requestResource(request, XSLStyleShe etResourceFactory()));
56 } 63 }
57 64
58 XSLStyleSheetResource::XSLStyleSheetResource(const ResourceRequest& resourceRequ est, const ResourceLoaderOptions& options, const String& charset) 65 XSLStyleSheetResource::XSLStyleSheetResource(const ResourceRequest& resourceRequ est, const ResourceLoaderOptions& options, const String& charset)
59 : StyleSheetResource(resourceRequest, XSLStyleSheet, options, "text/xsl", ch arset) 66 : StyleSheetResource(resourceRequest, XSLStyleSheet, options, "text/xsl", ch arset)
60 { 67 {
61 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); 68 ASSERT(RuntimeEnabledFeatures::xsltEnabled());
62 DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT, ("text/xml, application/ xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml" , AtomicString::ConstructFromLiteral));
63
64 // It's XML we want.
65 // FIXME: This should accept more general xml formats */*+xml, image/svg+xml for example.
66 setAccept(acceptXSLT);
67 } 69 }
68 70
69 void XSLStyleSheetResource::didAddClient(ResourceClient* c) 71 void XSLStyleSheetResource::didAddClient(ResourceClient* c)
70 { 72 {
71 ASSERT(StyleSheetResourceClient::isExpectedType(c)); 73 ASSERT(StyleSheetResourceClient::isExpectedType(c));
72 Resource::didAddClient(c); 74 Resource::didAddClient(c);
73 if (!isLoading()) 75 if (!isLoading())
74 static_cast<StyleSheetResourceClient*>(c)->setXSLStyleSheet(m_resourceRe quest.url(), m_response.url(), m_sheet); 76 static_cast<StyleSheetResourceClient*>(c)->setXSLStyleSheet(m_resourceRe quest.url(), m_response.url(), m_sheet);
75 } 77 }
76 78
77 void XSLStyleSheetResource::checkNotify() 79 void XSLStyleSheetResource::checkNotify()
78 { 80 {
79 if (m_data.get()) 81 if (m_data.get())
80 m_sheet = decodedText(); 82 m_sheet = decodedText();
81 83
82 ResourceClientWalker<StyleSheetResourceClient> w(m_clients); 84 ResourceClientWalker<StyleSheetResourceClient> w(m_clients);
83 while (StyleSheetResourceClient* c = w.next()) 85 while (StyleSheetResourceClient* c = w.next())
84 c->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet); 86 c->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
85 } 87 }
86 88
87 } // namespace blink 89 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698