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

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

Issue 698743002: [WIP] Adding support for <iframe>s to slimming paint. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 { 125 {
126 if (isRemoteFrame()) 126 if (isRemoteFrame())
127 return false; 127 return false;
128 128
129 if (!tree().parent()) 129 if (!tree().parent())
130 return true; 130 return true;
131 131
132 return tree().parent()->isRemoteFrame(); 132 return tree().parent()->isRemoteFrame();
133 } 133 }
134 134
135 LocalFrame* Frame::localRoot() const
136 {
137 Frame* frame = const_cast<Frame*>(this);
138 while (frame && !frame->isLocalRoot())
139 frame = frame->tree().parent();
140 return toLocalFrame(frame);
141 }
142
135 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const 143 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const
136 { 144 {
137 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0; 145 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0;
138 } 146 }
139 147
140 static ChromeClient& emptyChromeClient() 148 static ChromeClient& emptyChromeClient()
141 { 149 {
142 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, ()); 150 DEFINE_STATIC_LOCAL(EmptyChromeClient, client, ());
143 return client; 151 return client;
144 } 152 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 210
203 if (m_owner) { 211 if (m_owner) {
204 if (m_owner->isLocal()) 212 if (m_owner->isLocal())
205 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); 213 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
206 } else { 214 } else {
207 page()->setMainFrame(this); 215 page()->setMainFrame(this);
208 } 216 }
209 } 217 }
210 218
211 } // namespace blink 219 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698