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

Side by Side Diff: third_party/WebKit/Source/core/frame/Frame.cpp

Issue 2907663004: FrameTree::Find only searches relative to local frames. (Closed)
Patch Set: Rebasing... Created 3 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) 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 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, (EmptyChromeClient::Create())); 127 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, (EmptyChromeClient::Create()));
128 return client; 128 return client;
129 } 129 }
130 130
131 ChromeClient& Frame::GetChromeClient() const { 131 ChromeClient& Frame::GetChromeClient() const {
132 if (Page* page = this->GetPage()) 132 if (Page* page = this->GetPage())
133 return page->GetChromeClient(); 133 return page->GetChromeClient();
134 return GetEmptyChromeClient(); 134 return GetEmptyChromeClient();
135 } 135 }
136 136
137 Frame* Frame::FindFrameForNavigation(const AtomicString& name,
138 LocalFrame& active_frame) {
139 Frame* frame = Tree().Find(name);
140 if (!frame || !active_frame.CanNavigate(*frame))
141 return nullptr;
142 return frame;
143 }
144
145 Frame* Frame::FindUnsafeParentScrollPropagationBoundary() { 137 Frame* Frame::FindUnsafeParentScrollPropagationBoundary() {
146 Frame* current_frame = this; 138 Frame* current_frame = this;
147 Frame* ancestor_frame = Tree().Parent(); 139 Frame* ancestor_frame = Tree().Parent();
148 140
149 while (ancestor_frame) { 141 while (ancestor_frame) {
150 if (!ancestor_frame->GetSecurityContext()->GetSecurityOrigin()->CanAccess( 142 if (!ancestor_frame->GetSecurityContext()->GetSecurityOrigin()->CanAccess(
151 GetSecurityContext()->GetSecurityOrigin())) 143 GetSecurityContext()->GetSecurityOrigin()))
152 return current_frame; 144 return current_frame;
153 current_frame = ancestor_frame; 145 current_frame = ancestor_frame;
154 ancestor_frame = ancestor_frame->Tree().Parent(); 146 ancestor_frame = ancestor_frame->Tree().Parent();
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 is_loading_(false) { 214 is_loading_(false) {
223 InstanceCounters::IncrementCounter(InstanceCounters::kFrameCounter); 215 InstanceCounters::IncrementCounter(InstanceCounters::kFrameCounter);
224 216
225 if (owner_) 217 if (owner_)
226 owner_->SetContentFrame(*this); 218 owner_->SetContentFrame(*this);
227 else 219 else
228 page_->SetMainFrame(this); 220 page_->SetMainFrame(this);
229 } 221 }
230 222
231 } // namespace blink 223 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698