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

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

Issue 2082493002: Remove WebFrame::canHaveSecureChild (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: patch for landing 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) 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 3337 matching lines...) Expand 10 before | Expand all | Expand 10 after
3348 // 3348 //
3349 // In all cases, a frame must be potentially trustworthy in addition to 3349 // In all cases, a frame must be potentially trustworthy in addition to
3350 // having an exception listed in order for the exception to be granted. 3350 // having an exception listed in order for the exception to be granted.
3351 if (!getSecurityOrigin()->isPotentiallyTrustworthy()) 3351 if (!getSecurityOrigin()->isPotentiallyTrustworthy())
3352 return false; 3352 return false;
3353 3353
3354 if (SchemeRegistry::schemeShouldBypassSecureContextCheck(getSecurityOrigin() ->protocol())) 3354 if (SchemeRegistry::schemeShouldBypassSecureContextCheck(getSecurityOrigin() ->protocol()))
3355 return true; 3355 return true;
3356 3356
3357 if (privilegeContextCheck == StandardSecureContextCheck) { 3357 if (privilegeContextCheck == StandardSecureContextCheck) {
3358 Frame* parent = m_frame ? m_frame->tree().parent() : nullptr; 3358 if (!m_frame)
3359 if (parent && !parent->canHaveSecureChild()) 3359 return true;
3360 return false; 3360 Frame* parent = m_frame->tree().parent();
3361 while (parent) {
3362 if (!parent->securityContext()->getSecurityOrigin()->isPotentiallyTr ustworthy())
3363 return false;
3364 parent = parent->tree().parent();
3365 }
3361 } 3366 }
3362 return true; 3367 return true;
3363 } 3368 }
3364 3369
3365 StyleSheetList& Document::styleSheets() 3370 StyleSheetList& Document::styleSheets()
3366 { 3371 {
3367 if (!m_styleSheetList) 3372 if (!m_styleSheetList)
3368 m_styleSheetList = StyleSheetList::create(this); 3373 m_styleSheetList = StyleSheetList::create(this);
3369 return *m_styleSheetList; 3374 return *m_styleSheetList;
3370 } 3375 }
(...skipping 2647 matching lines...) Expand 10 before | Expand all | Expand 10 after
6018 } 6023 }
6019 6024
6020 void showLiveDocumentInstances() 6025 void showLiveDocumentInstances()
6021 { 6026 {
6022 WeakDocumentSet& set = liveDocumentSet(); 6027 WeakDocumentSet& set = liveDocumentSet();
6023 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6028 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6024 for (Document* document : set) 6029 for (Document* document : set)
6025 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6030 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
6026 } 6031 }
6027 #endif 6032 #endif
OLDNEW
« no previous file with comments | « content/child/service_worker/service_worker_network_provider.cc ('k') | third_party/WebKit/Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698