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

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

Issue 2327643003: Replace ASSERT*() with DCHECK*() in core/fetch/ and core/loader/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/loader/HttpEquiv.h" 5 #include "core/loader/HttpEquiv.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/dom/ScriptableDocumentParser.h" 8 #include "core/dom/ScriptableDocumentParser.h"
9 #include "core/dom/StyleEngine.h" 9 #include "core/dom/StyleEngine.h"
10 #include "core/fetch/ClientHintsPreferences.h" 10 #include "core/fetch/ClientHintsPreferences.h"
11 #include "core/frame/UseCounter.h" 11 #include "core/frame/UseCounter.h"
12 #include "core/frame/csp/ContentSecurityPolicy.h" 12 #include "core/frame/csp/ContentSecurityPolicy.h"
13 #include "core/inspector/ConsoleMessage.h" 13 #include "core/inspector/ConsoleMessage.h"
14 #include "core/loader/DocumentLoader.h" 14 #include "core/loader/DocumentLoader.h"
15 #include "core/origin_trials/OriginTrialContext.h" 15 #include "core/origin_trials/OriginTrialContext.h"
16 #include "platform/HTTPNames.h" 16 #include "platform/HTTPNames.h"
17 #include "platform/network/HTTPParsers.h" 17 #include "platform/network/HTTPParsers.h"
18 #include "platform/weborigin/KURL.h" 18 #include "platform/weborigin/KURL.h"
19 19
20 namespace blink { 20 namespace blink {
21 21
22 void HttpEquiv::process(Document& document, const AtomicString& equiv, const Ato micString& content, bool inDocumentHeadElement) 22 void HttpEquiv::process(Document& document, const AtomicString& equiv, const Ato micString& content, bool inDocumentHeadElement)
23 { 23 {
24 ASSERT(!equiv.isNull() && !content.isNull()); 24 DCHECK(!equiv.isNull());
25 DCHECK(!content.isNull());
25 26
26 if (equalIgnoringCase(equiv, "default-style")) { 27 if (equalIgnoringCase(equiv, "default-style")) {
27 processHttpEquivDefaultStyle(document, content); 28 processHttpEquivDefaultStyle(document, content);
28 } else if (equalIgnoringCase(equiv, "refresh")) { 29 } else if (equalIgnoringCase(equiv, "refresh")) {
29 processHttpEquivRefresh(document, content); 30 processHttpEquivRefresh(document, content);
30 } else if (equalIgnoringCase(equiv, "set-cookie")) { 31 } else if (equalIgnoringCase(equiv, "set-cookie")) {
31 processHttpEquivSetCookie(document, content); 32 processHttpEquivSetCookie(document, content);
32 } else if (equalIgnoringCase(equiv, "content-language")) { 33 } else if (equalIgnoringCase(equiv, "content-language")) {
33 document.setContentLanguage(content); 34 document.setContentLanguage(content);
34 } else if (equalIgnoringCase(equiv, "x-dns-prefetch-control")) { 35 } else if (equalIgnoringCase(equiv, "x-dns-prefetch-control")) {
(...skipping 17 matching lines...) Expand all
52 53
53 void HttpEquiv::processHttpEquivContentSecurityPolicy(Document& document, const AtomicString& equiv, const AtomicString& content) 54 void HttpEquiv::processHttpEquivContentSecurityPolicy(Document& document, const AtomicString& equiv, const AtomicString& content)
54 { 55 {
55 if (document.importLoader()) 56 if (document.importLoader())
56 return; 57 return;
57 if (equalIgnoringCase(equiv, "content-security-policy")) 58 if (equalIgnoringCase(equiv, "content-security-policy"))
58 document.contentSecurityPolicy()->didReceiveHeader(content, ContentSecur ityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceMeta); 59 document.contentSecurityPolicy()->didReceiveHeader(content, ContentSecur ityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceMeta);
59 else if (equalIgnoringCase(equiv, "content-security-policy-report-only")) 60 else if (equalIgnoringCase(equiv, "content-security-policy-report-only"))
60 document.contentSecurityPolicy()->didReceiveHeader(content, ContentSecur ityPolicyHeaderTypeReport, ContentSecurityPolicyHeaderSourceMeta); 61 document.contentSecurityPolicy()->didReceiveHeader(content, ContentSecur ityPolicyHeaderTypeReport, ContentSecurityPolicyHeaderSourceMeta);
61 else 62 else
62 ASSERT_NOT_REACHED(); 63 NOTREACHED();
63 } 64 }
64 65
65 void HttpEquiv::processHttpEquivAcceptCH(Document& document, const AtomicString& content) 66 void HttpEquiv::processHttpEquivAcceptCH(Document& document, const AtomicString& content)
66 { 67 {
67 if (!document.frame()) 68 if (!document.frame())
68 return; 69 return;
69 70
70 UseCounter::count(document, UseCounter::ClientHintsMetaAcceptCH); 71 UseCounter::count(document, UseCounter::ClientHintsMetaAcceptCH);
71 document.clientHintsPreferences().updateFromAcceptClientHintsHeader(content, document.fetcher()); 72 document.clientHintsPreferences().updateFromAcceptClientHintsHeader(content, document.fetcher());
72 } 73 }
(...skipping 20 matching lines...) Expand all
93 94
94 UseCounter::count(document, UseCounter::MetaSetCookie); 95 UseCounter::count(document, UseCounter::MetaSetCookie);
95 if (!document.contentSecurityPolicy()->allowInlineScript(KURL(), "", Ordinal Number(), "", ContentSecurityPolicy::SuppressReport)) 96 if (!document.contentSecurityPolicy()->allowInlineScript(KURL(), "", Ordinal Number(), "", ContentSecurityPolicy::SuppressReport))
96 UseCounter::count(document, UseCounter::MetaSetCookieWhenCSPBlocksInline Script); 97 UseCounter::count(document, UseCounter::MetaSetCookieWhenCSPBlocksInline Script);
97 98
98 // Exception (for sandboxed documents) ignored. 99 // Exception (for sandboxed documents) ignored.
99 document.setCookie(content, IGNORE_EXCEPTION); 100 document.setCookie(content, IGNORE_EXCEPTION);
100 } 101 }
101 102
102 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/HistoryItem.cpp ('k') | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698