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

Side by Side Diff: third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp

Issue 2440803002: Filter out data urls in the preload scanner (Closed)
Patch Set: also block ref urls Created 4 years, 2 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) 2008, 2010 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/ 3 * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
4 * Copyright (C) 2010 Google Inc. All Rights Reserved. 4 * Copyright (C) 2010 Google Inc. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 void CSSPreloadScanner::emitRule(const SegmentedString& source) { 231 void CSSPreloadScanner::emitRule(const SegmentedString& source) {
232 if (equalIgnoringCase(m_rule, "import")) { 232 if (equalIgnoringCase(m_rule, "import")) {
233 String url = parseCSSStringOrURL(m_ruleValue.toString()); 233 String url = parseCSSStringOrURL(m_ruleValue.toString());
234 if (!url.isEmpty()) { 234 if (!url.isEmpty()) {
235 TextPosition position = 235 TextPosition position =
236 TextPosition(source.currentLine(), source.currentColumn()); 236 TextPosition(source.currentLine(), source.currentColumn());
237 std::unique_ptr<PreloadRequest> request = 237 std::unique_ptr<PreloadRequest> request =
238 PreloadRequest::create(FetchInitiatorTypeNames::css, position, url, 238 PreloadRequest::create(FetchInitiatorTypeNames::css, position, url,
239 *m_predictedBaseElementURL, 239 *m_predictedBaseElementURL,
240 Resource::CSSStyleSheet, m_referrerPolicy); 240 Resource::CSSStyleSheet, m_referrerPolicy);
241 // FIXME: Should this be including the charset in the preload request? 241 if (request) {
242 m_requests->append(std::move(request)); 242 // FIXME: Should this be including the charset in the preload request?
243 m_requests->append(std::move(request));
244 }
243 } 245 }
244 m_state = Initial; 246 m_state = Initial;
245 } else if (equalIgnoringCase(m_rule, "charset")) 247 } else if (equalIgnoringCase(m_rule, "charset"))
246 m_state = Initial; 248 m_state = Initial;
247 else 249 else
248 m_state = DoneParsingImportRules; 250 m_state = DoneParsingImportRules;
249 m_rule.clear(); 251 m_rule.clear();
250 m_ruleValue.clear(); 252 m_ruleValue.clear();
251 } 253 }
252 254
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 currentPreloadCount); 322 currentPreloadCount);
321 } 323 }
322 } 324 }
323 325
324 DEFINE_TRACE(CSSPreloaderResourceClient) { 326 DEFINE_TRACE(CSSPreloaderResourceClient) {
325 visitor->trace(m_preloader); 327 visitor->trace(m_preloader);
326 ResourceOwner<CSSStyleSheetResource>::trace(visitor); 328 ResourceOwner<CSSStyleSheetResource>::trace(visitor);
327 } 329 }
328 330
329 } // namespace blink 331 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698