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

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

Issue 931423003: Rename rendering/RenderList* to layout/LayoutList* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove spurious LayoutLayerModelObject reference 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/frame/FrameView.cpp ('k') | Source/core/html/HTMLOListElement.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 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/html/HTMLLIElement.h" 24 #include "core/html/HTMLLIElement.h"
25 25
26 #include "core/CSSPropertyNames.h" 26 #include "core/CSSPropertyNames.h"
27 #include "core/CSSValueKeywords.h" 27 #include "core/CSSValueKeywords.h"
28 #include "core/HTMLNames.h" 28 #include "core/HTMLNames.h"
29 #include "core/dom/NodeRenderingTraversal.h" 29 #include "core/dom/NodeRenderingTraversal.h"
30 #include "core/rendering/RenderListItem.h" 30 #include "core/layout/LayoutListItem.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 using namespace HTMLNames; 34 using namespace HTMLNames;
35 35
36 inline HTMLLIElement::HTMLLIElement(Document& document) 36 inline HTMLLIElement::HTMLLIElement(Document& document)
37 : HTMLElement(liTag, document) 37 : HTMLElement(liTag, document)
38 { 38 {
39 } 39 }
40 40
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 parseValue(value); 73 parseValue(value);
74 } else 74 } else
75 HTMLElement::parseAttribute(name, value); 75 HTMLElement::parseAttribute(name, value);
76 } 76 }
77 77
78 void HTMLLIElement::attach(const AttachContext& context) 78 void HTMLLIElement::attach(const AttachContext& context)
79 { 79 {
80 HTMLElement::attach(context); 80 HTMLElement::attach(context);
81 81
82 if (renderer() && renderer()->isListItem()) { 82 if (renderer() && renderer()->isListItem()) {
83 RenderListItem* listItemRenderer = toRenderListItem(renderer()); 83 LayoutListItem* listItemLayoutObject = toLayoutListItem(renderer());
84 84
85 ASSERT(!document().childNeedsDistributionRecalc()); 85 ASSERT(!document().childNeedsDistributionRecalc());
86 86
87 // Find the enclosing list node. 87 // Find the enclosing list node.
88 Element* listNode = 0; 88 Element* listNode = 0;
89 Element* current = this; 89 Element* current = this;
90 while (!listNode) { 90 while (!listNode) {
91 current = NodeRenderingTraversal::parentElement(*current); 91 current = NodeRenderingTraversal::parentElement(*current);
92 if (!current) 92 if (!current)
93 break; 93 break;
94 if (isHTMLUListElement(*current) || isHTMLOListElement(*current)) 94 if (isHTMLUListElement(*current) || isHTMLOListElement(*current))
95 listNode = current; 95 listNode = current;
96 } 96 }
97 97
98 // If we are not in a list, tell the renderer so it can position us insi de. 98 // If we are not in a list, tell the renderer so it can position us insi de.
99 // We don't want to change our style to say "inside" since that would af fect nested nodes. 99 // We don't want to change our style to say "inside" since that would af fect nested nodes.
100 if (!listNode) 100 if (!listNode)
101 listItemRenderer->setNotInList(true); 101 listItemLayoutObject->setNotInList(true);
102 102
103 parseValue(fastGetAttribute(valueAttr)); 103 parseValue(fastGetAttribute(valueAttr));
104 } 104 }
105 } 105 }
106 106
107 inline void HTMLLIElement::parseValue(const AtomicString& value) 107 inline void HTMLLIElement::parseValue(const AtomicString& value)
108 { 108 {
109 ASSERT(renderer() && renderer()->isListItem()); 109 ASSERT(renderer() && renderer()->isListItem());
110 110
111 bool valueOK; 111 bool valueOK;
112 int requestedValue = value.toInt(&valueOK); 112 int requestedValue = value.toInt(&valueOK);
113 if (valueOK) 113 if (valueOK)
114 toRenderListItem(renderer())->setExplicitValue(requestedValue); 114 toLayoutListItem(renderer())->setExplicitValue(requestedValue);
115 else 115 else
116 toRenderListItem(renderer())->clearExplicitValue(); 116 toLayoutListItem(renderer())->clearExplicitValue();
117 } 117 }
118 118
119 } 119 }
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/html/HTMLOListElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698