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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/HTMLFrameSetElement.h ('k') | Source/core/html/HTMLIFrameElement.h » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 HTMLElement::parseAttribute(name, value); 147 HTMLElement::parseAttribute(name, value);
148 } 148 }
149 149
150 bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style) 150 bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style)
151 { 151 {
152 // For compatibility, frames render even when display: none is set. 152 // For compatibility, frames render even when display: none is set.
153 // However, we delay creating a renderer until stylesheets have loaded. 153 // However, we delay creating a renderer until stylesheets have loaded.
154 return style.isStyleAvailable(); 154 return style.isStyleAvailable();
155 } 155 }
156 156
157 RenderObject* HTMLFrameSetElement::createRenderer(const RenderStyle& style) 157 LayoutObject* HTMLFrameSetElement::createRenderer(const RenderStyle& style)
158 { 158 {
159 if (style.hasContent()) 159 if (style.hasContent())
160 return RenderObject::createObject(this, style); 160 return LayoutObject::createObject(this, style);
161
162 return new RenderFrameSet(this); 161 return new RenderFrameSet(this);
163 } 162 }
164 163
165 void HTMLFrameSetElement::attach(const AttachContext& context) 164 void HTMLFrameSetElement::attach(const AttachContext& context)
166 { 165 {
167 // Inherit default settings from parent frameset 166 // Inherit default settings from parent frameset
168 // FIXME: This is not dynamic. 167 // FIXME: This is not dynamic.
169 if (HTMLFrameSetElement* frameset = Traversal<HTMLFrameSetElement>::firstAnc estor(*this)) { 168 if (HTMLFrameSetElement* frameset = Traversal<HTMLFrameSetElement>::firstAnc estor(*this)) {
170 if (!m_frameborderSet) 169 if (!m_frameborderSet)
171 m_frameborder = frameset->hasFrameBorder(); 170 m_frameborder = frameset->hasFrameBorder();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 Element* frameElement = children()->namedItem(name); 214 Element* frameElement = children()->namedItem(name);
216 if (!isHTMLFrameElement(frameElement)) 215 if (!isHTMLFrameElement(frameElement))
217 return nullptr; 216 return nullptr;
218 Document* document = toHTMLFrameElement(frameElement)->contentDocument(); 217 Document* document = toHTMLFrameElement(frameElement)->contentDocument();
219 if (!document || !document->frame()) 218 if (!document || !document->frame())
220 return nullptr; 219 return nullptr;
221 return document->domWindow(); 220 return document->domWindow();
222 } 221 }
223 222
224 } // namespace blink 223 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameSetElement.h ('k') | Source/core/html/HTMLIFrameElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698