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

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

Issue 2318283002: DCHECK that the document url is valid in HTMLPreloadScanner (Closed)
Patch Set: fix unit test Created 4 years, 3 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 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 TokenPreloadScanner::TokenPreloadScanner(const KURL& documentURL, std::unique_pt r<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaVa luesCachedData& mediaValuesCachedData) 496 TokenPreloadScanner::TokenPreloadScanner(const KURL& documentURL, std::unique_pt r<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaVa luesCachedData& mediaValuesCachedData)
497 : m_documentURL(documentURL) 497 : m_documentURL(documentURL)
498 , m_inStyle(false) 498 , m_inStyle(false)
499 , m_inPicture(false) 499 , m_inPicture(false)
500 , m_inScript(false) 500 , m_inScript(false)
501 , m_templateCount(0) 501 , m_templateCount(0)
502 , m_documentParameters(std::move(documentParameters)) 502 , m_documentParameters(std::move(documentParameters))
503 , m_mediaValues(MediaValuesCached::create(mediaValuesCachedData)) 503 , m_mediaValues(MediaValuesCached::create(mediaValuesCachedData))
504 , m_didRewind(false) 504 , m_didRewind(false)
505 { 505 {
506 ASSERT(m_documentParameters.get()); 506 DCHECK(m_documentParameters.get());
507 ASSERT(m_mediaValues.get()); 507 DCHECK(m_mediaValues.get());
508 DCHECK(documentURL.isValid());
508 m_cssScanner.setReferrerPolicy(m_documentParameters->referrerPolicy); 509 m_cssScanner.setReferrerPolicy(m_documentParameters->referrerPolicy);
509 } 510 }
510 511
511 TokenPreloadScanner::~TokenPreloadScanner() 512 TokenPreloadScanner::~TokenPreloadScanner()
512 { 513 {
513 } 514 }
514 515
515 TokenPreloadScannerCheckpoint TokenPreloadScanner::createCheckpoint() 516 TokenPreloadScannerCheckpoint TokenPreloadScanner::createCheckpoint()
516 { 517 {
517 TokenPreloadScannerCheckpoint checkpoint = m_checkpoints.size(); 518 TokenPreloadScannerCheckpoint checkpoint = m_checkpoints.size();
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 ASSERT(document); 812 ASSERT(document);
812 doHtmlPreloadScanning = !document->settings() || document->settings()->doHtm lPreloadScanning(); 813 doHtmlPreloadScanning = !document->settings() || document->settings()->doHtm lPreloadScanning();
813 doDocumentWritePreloadScanning = doHtmlPreloadScanning && document->frame() && document->frame()->isMainFrame(); 814 doDocumentWritePreloadScanning = doHtmlPreloadScanning && document->frame() && document->frame()->isMainFrame();
814 defaultViewportMinWidth = document->viewportDefaultMinWidth(); 815 defaultViewportMinWidth = document->viewportDefaultMinWidth();
815 viewportMetaZeroValuesQuirk = document->settings() && document->settings()-> viewportMetaZeroValuesQuirk(); 816 viewportMetaZeroValuesQuirk = document->settings() && document->settings()-> viewportMetaZeroValuesQuirk();
816 viewportMetaEnabled = document->settings() && document->settings()->viewport MetaEnabled(); 817 viewportMetaEnabled = document->settings() && document->settings()->viewport MetaEnabled();
817 referrerPolicy = document->getReferrerPolicy(); 818 referrerPolicy = document->getReferrerPolicy();
818 } 819 }
819 820
820 } // namespace blink 821 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698