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

Side by Side Diff: third_party/WebKit/Source/core/dom/SecurityContext.cpp

Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block
Patch Set: Ugh. Created 4 years, 6 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) 2011 Google Inc. All Rights Reserved. 2 * Copyright (C) 2011 Google 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 17 matching lines...) Expand all
28 28
29 #include "core/frame/csp/ContentSecurityPolicy.h" 29 #include "core/frame/csp/ContentSecurityPolicy.h"
30 #include "platform/RuntimeEnabledFeatures.h" 30 #include "platform/RuntimeEnabledFeatures.h"
31 #include "platform/weborigin/SecurityOrigin.h" 31 #include "platform/weborigin/SecurityOrigin.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 SecurityContext::SecurityContext() 35 SecurityContext::SecurityContext()
36 : m_sandboxFlags(SandboxNone) 36 : m_sandboxFlags(SandboxNone)
37 , m_addressSpace(WebAddressSpacePublic) 37 , m_addressSpace(WebAddressSpacePublic)
38 , m_insecureRequestsPolicy(InsecureRequestsDoNotUpgrade) 38 , m_insecureRequestPolicy(kLeaveInsecureRequestsAlone)
39 , m_enforceStrictMixedContentChecking(false)
40 { 39 {
41 } 40 }
42 41
43 SecurityContext::~SecurityContext() 42 SecurityContext::~SecurityContext()
44 { 43 {
45 } 44 }
46 45
47 DEFINE_TRACE(SecurityContext) 46 DEFINE_TRACE(SecurityContext)
48 { 47 {
49 visitor->trace(m_contentSecurityPolicy); 48 visitor->trace(m_contentSecurityPolicy);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 100
102 DCHECK(!suborigin.name().isEmpty()); 101 DCHECK(!suborigin.name().isEmpty());
103 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); 102 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled());
104 DCHECK(m_securityOrigin.get()); 103 DCHECK(m_securityOrigin.get());
105 DCHECK(!m_securityOrigin->hasSuborigin() || m_securityOrigin->suborigin()->n ame() == suborigin.name()); 104 DCHECK(!m_securityOrigin->hasSuborigin() || m_securityOrigin->suborigin()->n ame() == suborigin.name());
106 m_securityOrigin->addSuborigin(suborigin); 105 m_securityOrigin->addSuborigin(suborigin);
107 didUpdateSecurityOrigin(); 106 didUpdateSecurityOrigin();
108 } 107 }
109 108
110 } // namespace blink 109 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698