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

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 1233453006: Merge 197139 "Fix the logic that limits the number of frames in ..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2403/
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/NodeRareData.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.cpp » ('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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 return nextCharacterRange.release(); 686 return nextCharacterRange.release();
687 } 687 }
688 688
689 return nullptr; 689 return nullptr;
690 } 690 }
691 691
692 bool LocalFrame::isURLAllowed(const KURL& url) const 692 bool LocalFrame::isURLAllowed(const KURL& url) const
693 { 693 {
694 // We allow one level of self-reference because some sites depend on that, 694 // We allow one level of self-reference because some sites depend on that,
695 // but we don't allow more than one. 695 // but we don't allow more than one.
696 if (host()->subframeCount() >= FrameHost::maxNumberOfFrames)
697 return false;
698 bool foundSelfReference = false; 696 bool foundSelfReference = false;
699 for (const Frame* frame = this; frame; frame = frame->tree().parent()) { 697 for (const Frame* frame = this; frame; frame = frame->tree().parent()) {
700 if (!frame->isLocalFrame()) 698 if (!frame->isLocalFrame())
701 continue; 699 continue;
702 if (equalIgnoringFragmentIdentifier(toLocalFrame(frame)->document()->url (), url)) { 700 if (equalIgnoringFragmentIdentifier(toLocalFrame(frame)->document()->url (), url)) {
703 if (foundSelfReference) 701 if (foundSelfReference)
704 return false; 702 return false;
705 foundSelfReference = true; 703 foundSelfReference = true;
706 } 704 }
707 } 705 }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 , m_textZoomFactor(parentTextZoomFactor(this)) 815 , m_textZoomFactor(parentTextZoomFactor(this))
818 , m_inViewSourceMode(false) 816 , m_inViewSourceMode(false)
819 { 817 {
820 if (isLocalRoot()) 818 if (isLocalRoot())
821 m_instrumentingAgents = InstrumentingAgents::create(); 819 m_instrumentingAgents = InstrumentingAgents::create();
822 else 820 else
823 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 821 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
824 } 822 }
825 823
826 } // namespace blink 824 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/NodeRareData.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698