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

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

Issue 929223003: Move and rename RenderFrame and RenderFrameSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
« no previous file with comments | « Source/core/core.gypi ('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) 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 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2009 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
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/html/HTMLFrameElement.h" 25 #include "core/html/HTMLFrameElement.h"
26 26
27 #include "core/HTMLNames.h" 27 #include "core/HTMLNames.h"
28 #include "core/dom/ElementTraversal.h" 28 #include "core/dom/ElementTraversal.h"
29 #include "core/html/HTMLFrameSetElement.h" 29 #include "core/html/HTMLFrameSetElement.h"
30 #include "core/rendering/RenderFrame.h" 30 #include "core/layout/LayoutFrame.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 using namespace HTMLNames; 34 using namespace HTMLNames;
35 35
36 inline HTMLFrameElement::HTMLFrameElement(Document& document) 36 inline HTMLFrameElement::HTMLFrameElement(Document& document)
37 : HTMLFrameElementBase(frameTag, document) 37 : HTMLFrameElementBase(frameTag, document)
38 , m_frameBorder(true) 38 , m_frameBorder(true)
39 , m_frameBorderSet(false) 39 , m_frameBorderSet(false)
40 { 40 {
41 } 41 }
42 42
43 DEFINE_NODE_FACTORY(HTMLFrameElement) 43 DEFINE_NODE_FACTORY(HTMLFrameElement)
44 44
45 bool HTMLFrameElement::rendererIsNeeded(const LayoutStyle&) 45 bool HTMLFrameElement::rendererIsNeeded(const LayoutStyle&)
46 { 46 {
47 // For compatibility, frames render even when display: none is set. 47 // For compatibility, frames render even when display: none is set.
48 return isURLAllowed(); 48 return isURLAllowed();
49 } 49 }
50 50
51 LayoutObject* HTMLFrameElement::createRenderer(const LayoutStyle&) 51 LayoutObject* HTMLFrameElement::createRenderer(const LayoutStyle&)
52 { 52 {
53 return new RenderFrame(this); 53 return new LayoutFrame(this);
54 } 54 }
55 55
56 bool HTMLFrameElement::noResize() const 56 bool HTMLFrameElement::noResize() const
57 { 57 {
58 return hasAttribute(noresizeAttr); 58 return hasAttribute(noresizeAttr);
59 } 59 }
60 60
61 void HTMLFrameElement::attach(const AttachContext& context) 61 void HTMLFrameElement::attach(const AttachContext& context)
62 { 62 {
63 HTMLFrameElementBase::attach(context); 63 HTMLFrameElementBase::attach(context);
(...skipping 11 matching lines...) Expand all
75 m_frameBorderSet = !value.isNull(); 75 m_frameBorderSet = !value.isNull();
76 // FIXME: If we are already attached, this has no effect. 76 // FIXME: If we are already attached, this has no effect.
77 } else if (name == noresizeAttr) { 77 } else if (name == noresizeAttr) {
78 if (renderer()) 78 if (renderer())
79 renderer()->updateFromElement(); 79 renderer()->updateFromElement();
80 } else 80 } else
81 HTMLFrameElementBase::parseAttribute(name, value); 81 HTMLFrameElementBase::parseAttribute(name, value);
82 } 82 }
83 83
84 } // namespace blink 84 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/html/HTMLFrameSetElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698