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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/events/MouseRelatedEvent.cpp ('k') | Source/core/frame/FrameView.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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 currentFrame = ancestorFrame; 255 currentFrame = ancestorFrame;
256 ancestorFrame = ancestorFrame->tree().parent(); 256 ancestorFrame = ancestorFrame->tree().parent();
257 } 257 }
258 return nullptr; 258 return nullptr;
259 } 259 }
260 260
261 LayoutPart* Frame::ownerLayoutObject() const 261 LayoutPart* Frame::ownerLayoutObject() const
262 { 262 {
263 if (!deprecatedLocalOwner()) 263 if (!deprecatedLocalOwner())
264 return nullptr; 264 return nullptr;
265 LayoutObject* object = deprecatedLocalOwner()->renderer(); 265 LayoutObject* object = deprecatedLocalOwner()->layoutObject();
266 if (!object) 266 if (!object)
267 return nullptr; 267 return nullptr;
268 // FIXME: If <object> is ever fixed to disassociate itself from frames 268 // FIXME: If <object> is ever fixed to disassociate itself from frames
269 // that it has started but canceled, then this can turn into an ASSERT 269 // that it has started but canceled, then this can turn into an ASSERT
270 // since ownerElement() would be 0 when the load is canceled. 270 // since ownerElement() would be 0 when the load is canceled.
271 // https://bugs.webkit.org/show_bug.cgi?id=18585 271 // https://bugs.webkit.org/show_bug.cgi?id=18585
272 if (!object->isLayoutPart()) 272 if (!object->isLayoutPart())
273 return nullptr; 273 return nullptr;
274 return toLayoutPart(object); 274 return toLayoutPart(object);
275 } 275 }
(...skipping 20 matching lines...) Expand all
296 296
297 if (m_owner) { 297 if (m_owner) {
298 if (m_owner->isLocal()) 298 if (m_owner->isLocal())
299 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); 299 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
300 } else { 300 } else {
301 page()->setMainFrame(this); 301 page()->setMainFrame(this);
302 } 302 }
303 } 303 }
304 304
305 } // namespace blink 305 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/MouseRelatedEvent.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698