OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r
ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r
ights reserved. |
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. |
(...skipping 4662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4673 return; | 4673 return; |
4674 } | 4674 } |
4675 | 4675 |
4676 // In the common case, create the security context from the currently | 4676 // In the common case, create the security context from the currently |
4677 // loading URL with a fresh content security policy. | 4677 // loading URL with a fresh content security policy. |
4678 m_cookieURL = m_url; | 4678 m_cookieURL = m_url; |
4679 enforceSandboxFlags(initializer.sandboxFlags()); | 4679 enforceSandboxFlags(initializer.sandboxFlags()); |
4680 if (initializer.shouldEnforceStrictMixedContentChecking()) | 4680 if (initializer.shouldEnforceStrictMixedContentChecking()) |
4681 enforceStrictMixedContentChecking(); | 4681 enforceStrictMixedContentChecking(); |
4682 setInsecureRequestsPolicy(initializer.insecureRequestsPolicy()); | 4682 setInsecureRequestsPolicy(initializer.insecureRequestsPolicy()); |
| 4683 if (initializer.insecureNavigationsToUpgrade()) { |
| 4684 for (auto toUpgrade : *initializer.insecureNavigationsToUpgrade()) |
| 4685 addInsecureNavigationUpgrade(toUpgrade); |
| 4686 } |
4683 setSecurityOrigin(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique(
) : SecurityOrigin::create(m_url)); | 4687 setSecurityOrigin(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique(
) : SecurityOrigin::create(m_url)); |
4684 | 4688 |
4685 if (importsController()) { | 4689 if (importsController()) { |
4686 // If this document is an HTML import, grab a reference to it's master d
ocument's Content | 4690 // If this document is an HTML import, grab a reference to it's master d
ocument's Content |
4687 // Security Policy. We don't call 'initContentSecurityPolicy' in this ca
se, as we can't | 4691 // Security Policy. We don't call 'initContentSecurityPolicy' in this ca
se, as we can't |
4688 // rebind the master document's policy object: its ExecutionContext need
s to remain tied | 4692 // rebind the master document's policy object: its ExecutionContext need
s to remain tied |
4689 // to the master document. | 4693 // to the master document. |
4690 setContentSecurityPolicy(importsController()->master()->contentSecurityP
olicy()); | 4694 setContentSecurityPolicy(importsController()->master()->contentSecurityP
olicy()); |
4691 } else { | 4695 } else { |
4692 initContentSecurityPolicy(); | 4696 initContentSecurityPolicy(); |
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5737 #ifndef NDEBUG | 5741 #ifndef NDEBUG |
5738 using namespace blink; | 5742 using namespace blink; |
5739 void showLiveDocumentInstances() | 5743 void showLiveDocumentInstances() |
5740 { | 5744 { |
5741 WeakDocumentSet& set = liveDocumentSet(); | 5745 WeakDocumentSet& set = liveDocumentSet(); |
5742 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 5746 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
5743 for (Document* document : set) | 5747 for (Document* document : set) |
5744 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str
ing().utf8().data()); | 5748 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str
ing().utf8().data()); |
5745 } | 5749 } |
5746 #endif | 5750 #endif |
OLD | NEW |