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

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

Issue 1749153002: CORS-RFC1918: Teach ResourceRequest about "external" requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Jochen's feedback. Created 4 years, 9 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/SecurityContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4910 matching lines...) Expand 10 before | Expand all | Expand 10 after
4921 initSecurityContext(DocumentInit(m_url, m_frame, contextDocument(), m_import sController)); 4921 initSecurityContext(DocumentInit(m_url, m_frame, contextDocument(), m_import sController));
4922 } 4922 }
4923 4923
4924 void Document::initSecurityContext(const DocumentInit& initializer) 4924 void Document::initSecurityContext(const DocumentInit& initializer)
4925 { 4925 {
4926 if (haveInitializedSecurityOrigin()) { 4926 if (haveInitializedSecurityOrigin()) {
4927 ASSERT(securityOrigin()); 4927 ASSERT(securityOrigin());
4928 return; 4928 return;
4929 } 4929 }
4930 4930
4931 if (initializer.isHostedInReservedIPRange()) 4931 setHostedInReservedIPRange(initializer.isHostedInReservedIPRange());
4932 setHostedInReservedIPRange();
4933 4932
4934 if (!initializer.hasSecurityContext()) { 4933 if (!initializer.hasSecurityContext()) {
4935 // No source for a security context. 4934 // No source for a security context.
4936 // This can occur via document.implementation.createDocument(). 4935 // This can occur via document.implementation.createDocument().
4937 m_cookieURL = KURL(ParsedURLString, emptyString()); 4936 m_cookieURL = KURL(ParsedURLString, emptyString());
4938 setSecurityOrigin(SecurityOrigin::createUnique()); 4937 setSecurityOrigin(SecurityOrigin::createUnique());
4939 initContentSecurityPolicy(); 4938 initContentSecurityPolicy();
4940 return; 4939 return;
4941 } 4940 }
4942 4941
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
5996 #ifndef NDEBUG 5995 #ifndef NDEBUG
5997 using namespace blink; 5996 using namespace blink;
5998 void showLiveDocumentInstances() 5997 void showLiveDocumentInstances()
5999 { 5998 {
6000 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5999 Document::WeakDocumentSet& set = Document::liveDocumentSet();
6001 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6000 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6002 for (Document* document : set) 6001 for (Document* document : set)
6003 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 6002 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
6004 } 6003 }
6005 #endif 6004 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/SecurityContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698