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

Side by Side Diff: Source/core/html/HTMLLIElement.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/HTMLInputElement.cpp ('k') | Source/core/html/HTMLLinkElement.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 *
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 Element* listNode = 0; 88 Element* listNode = 0;
89 Element* current = this; 89 Element* current = this;
90 while (!listNode) { 90 while (!listNode) {
91 current = LayoutTreeBuilderTraversal::parentElement(*current); 91 current = LayoutTreeBuilderTraversal::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 layoutObject so it can position us inside.
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 listItemLayoutObject->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(layoutObject() && layoutObject()->isListItem()); 109 ASSERT(layoutObject() && layoutObject()->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 toLayoutListItem(layoutObject())->setExplicitValue(requestedValue); 114 toLayoutListItem(layoutObject())->setExplicitValue(requestedValue);
115 else 115 else
116 toLayoutListItem(layoutObject())->clearExplicitValue(); 116 toLayoutListItem(layoutObject())->clearExplicitValue();
117 } 117 }
118 118
119 } 119 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLInputElement.cpp ('k') | Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698