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 4688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4699 initContentSecurityPolicy(); | 4699 initContentSecurityPolicy(); |
4700 return; | 4700 return; |
4701 } | 4701 } |
4702 | 4702 |
4703 // In the common case, create the security context from the currently | 4703 // In the common case, create the security context from the currently |
4704 // loading URL with a fresh content security policy. | 4704 // loading URL with a fresh content security policy. |
4705 m_cookieURL = m_url; | 4705 m_cookieURL = m_url; |
4706 enforceSandboxFlags(initializer.sandboxFlags()); | 4706 enforceSandboxFlags(initializer.sandboxFlags()); |
4707 if (initializer.shouldEnforceStrictMixedContentChecking()) | 4707 if (initializer.shouldEnforceStrictMixedContentChecking()) |
4708 enforceStrictMixedContentChecking(); | 4708 enforceStrictMixedContentChecking(); |
| 4709 setInsecureContentPolicy(initializer.insecureContentPolicy()); |
4709 setSecurityOrigin(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique(
) : SecurityOrigin::create(m_url)); | 4710 setSecurityOrigin(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique(
) : SecurityOrigin::create(m_url)); |
4710 | 4711 |
4711 if (importsController()) { | 4712 if (importsController()) { |
4712 // If this document is an HTML import, grab a reference to it's master d
ocument's Content | 4713 // If this document is an HTML import, grab a reference to it's master d
ocument's Content |
4713 // Security Policy. We don't call 'initContentSecurityPolicy' in this ca
se, as we can't | 4714 // Security Policy. We don't call 'initContentSecurityPolicy' in this ca
se, as we can't |
4714 // rebind the master document's policy object: its ExecutionContext need
s to remain tied | 4715 // rebind the master document's policy object: its ExecutionContext need
s to remain tied |
4715 // to the master document. | 4716 // to the master document. |
4716 setContentSecurityPolicy(importsController()->master()->contentSecurityP
olicy()); | 4717 setContentSecurityPolicy(importsController()->master()->contentSecurityP
olicy()); |
4717 } else { | 4718 } else { |
4718 initContentSecurityPolicy(); | 4719 initContentSecurityPolicy(); |
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5772 #ifndef NDEBUG | 5773 #ifndef NDEBUG |
5773 using namespace blink; | 5774 using namespace blink; |
5774 void showLiveDocumentInstances() | 5775 void showLiveDocumentInstances() |
5775 { | 5776 { |
5776 WeakDocumentSet& set = liveDocumentSet(); | 5777 WeakDocumentSet& set = liveDocumentSet(); |
5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 5778 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
5778 for (Document* document : set) | 5779 for (Document* document : set) |
5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str
ing().utf8().data()); | 5780 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str
ing().utf8().data()); |
5780 } | 5781 } |
5781 #endif | 5782 #endif |
OLD | NEW |