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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp

Issue 2162913002: Set request context when restoring cached CSSFontFaceSrcValue resource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add layout test Created 4 years, 5 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 | « third_party/WebKit/LayoutTests/http/tests/css/resources/font-face-via-https.css ('k') | 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) 2007, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 { 109 {
110 ASSERT(m_fetched); 110 ASSERT(m_fetched);
111 ASSERT(document && document->fetcher()); 111 ASSERT(document && document->fetcher());
112 112
113 const String resourceURL = document->completeURL(m_absoluteResource); 113 const String resourceURL = document->completeURL(m_absoluteResource);
114 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL))) 114 if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))
115 return; 115 return;
116 116
117 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css); 117 FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames:: css);
118 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy); 118 request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
119 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textFont);
119 MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->resource ()->lastResourceRequest(), 120 MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->resource ()->lastResourceRequest(),
120 m_fetched->resource()->lastResourceRequest().url(), MixedContentChecker: :SendReport); 121 m_fetched->resource()->lastResourceRequest().url(), MixedContentChecker: :SendReport);
121 document->fetcher()->requestLoadStarted(m_fetched->resource()->identifier(), m_fetched->resource(), request, ResourceFetcher::ResourceLoadingFromCache); 122 document->fetcher()->requestLoadStarted(m_fetched->resource()->identifier(), m_fetched->resource(), request, ResourceFetcher::ResourceLoadingFromCache);
122 } 123 }
123 124
124 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const 125 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
125 { 126 {
126 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_speci fiedResource == other.m_specifiedResource && m_absoluteResource == other.m_absol uteResource; 127 return m_isLocal == other.m_isLocal && m_format == other.m_format && m_speci fiedResource == other.m_specifiedResource && m_absoluteResource == other.m_absol uteResource;
127 } 128 }
128 129
129 } // namespace blink 130 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/css/resources/font-face-via-https.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698