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

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

Issue 2490283002: Use parseHTMLInteger in HTMLLIElement (Closed)
Patch Set: Rename and move test Created 4 years, 1 month 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 | « third_party/WebKit/LayoutTests/fast/lists/li-minimum-long-value-expected.html ('k') | no next file » | 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 "core/html/HTMLLIElement.h" 23 #include "core/html/HTMLLIElement.h"
24 24
25 #include "core/CSSPropertyNames.h" 25 #include "core/CSSPropertyNames.h"
26 #include "core/CSSValueKeywords.h" 26 #include "core/CSSValueKeywords.h"
27 #include "core/HTMLNames.h" 27 #include "core/HTMLNames.h"
28 #include "core/dom/LayoutTreeBuilderTraversal.h" 28 #include "core/dom/LayoutTreeBuilderTraversal.h"
29 #include "core/html/parser/HTMLParserIdioms.h"
29 #include "core/layout/LayoutListItem.h" 30 #include "core/layout/LayoutListItem.h"
30 #include "core/layout/api/LayoutLIItem.h" 31 #include "core/layout/api/LayoutLIItem.h"
31 32
32 namespace blink { 33 namespace blink {
33 34
34 using namespace HTMLNames; 35 using namespace HTMLNames;
35 36
36 inline HTMLLIElement::HTMLLIElement(Document& document) 37 inline HTMLLIElement::HTMLLIElement(Document& document)
37 : HTMLElement(liTag, document) {} 38 : HTMLElement(liTag, document) {}
38 39
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 liLayoutItem.setNotInList(true); 118 liLayoutItem.setNotInList(true);
118 119
119 parseValue(fastGetAttribute(valueAttr)); 120 parseValue(fastGetAttribute(valueAttr));
120 } 121 }
121 } 122 }
122 123
123 inline void HTMLLIElement::parseValue(const AtomicString& value) { 124 inline void HTMLLIElement::parseValue(const AtomicString& value) {
124 DCHECK(layoutObject()); 125 DCHECK(layoutObject());
125 DCHECK(layoutObject()->isListItem()); 126 DCHECK(layoutObject()->isListItem());
126 127
127 bool valueOK; 128 int requestedValue = 0;
128 int requestedValue = value.toInt(&valueOK); 129 if (parseHTMLInteger(value, requestedValue))
129 if (valueOK)
130 toLayoutListItem(layoutObject())->setExplicitValue(requestedValue); 130 toLayoutListItem(layoutObject())->setExplicitValue(requestedValue);
131 else 131 else
132 toLayoutListItem(layoutObject())->clearExplicitValue(); 132 toLayoutListItem(layoutObject())->clearExplicitValue();
133 } 133 }
134 134
135 } // namespace blink 135 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/lists/li-minimum-long-value-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698