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

Side by Side Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 1115353002: Update renderer to layoutObject in core/html. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLFrameSetElement.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) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Docum ent& document) 105 HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Docum ent& document)
106 : HTMLElement(tagName, document) 106 : HTMLElement(tagName, document)
107 , m_contentFrame(nullptr) 107 , m_contentFrame(nullptr)
108 , m_widget(nullptr) 108 , m_widget(nullptr)
109 , m_sandboxFlags(SandboxNone) 109 , m_sandboxFlags(SandboxNone)
110 { 110 {
111 } 111 }
112 112
113 LayoutPart* HTMLFrameOwnerElement::layoutPart() const 113 LayoutPart* HTMLFrameOwnerElement::layoutPart() const
114 { 114 {
115 // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers 115 // HTMLObjectElement and HTMLEmbedElement may return arbitrary layoutObjects
116 // when using fallback content. 116 // when using fallback content.
117 if (!layoutObject() || !layoutObject()->isLayoutPart()) 117 if (!layoutObject() || !layoutObject()->isLayoutPart())
118 return nullptr; 118 return nullptr;
119 return toLayoutPart(layoutObject()); 119 return toLayoutPart(layoutObject());
120 } 120 }
121 121
122 void HTMLFrameOwnerElement::setContentFrame(Frame& frame) 122 void HTMLFrameOwnerElement::setContentFrame(Frame& frame)
123 { 123 {
124 // Make sure we will not end up with two frames referencing the same owner e lement. 124 // Make sure we will not end up with two frames referencing the same owner e lement.
125 ASSERT(!m_contentFrame || m_contentFrame->owner() != this); 125 ASSERT(!m_contentFrame || m_contentFrame->owner() != this);
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 DEFINE_TRACE(HTMLFrameOwnerElement) 263 DEFINE_TRACE(HTMLFrameOwnerElement)
264 { 264 {
265 visitor->trace(m_contentFrame); 265 visitor->trace(m_contentFrame);
266 visitor->trace(m_widget); 266 visitor->trace(m_widget);
267 HTMLElement::trace(visitor); 267 HTMLElement::trace(visitor);
268 FrameOwner::trace(visitor); 268 FrameOwner::trace(visitor);
269 } 269 }
270 270
271 271
272 } // namespace blink 272 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLFrameSetElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698