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

Side by Side Diff: Source/core/layout/LayoutCounter.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/html/HTMLSelectElement.cpp ('k') | Source/core/layout/LayoutListBox.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) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 2 * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
3 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 3 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/layout/LayoutCounter.h" 23 #include "core/layout/LayoutCounter.h"
24 24
25 #include "core/HTMLNames.h" 25 #include "core/HTMLNames.h"
26 #include "core/dom/Element.h" 26 #include "core/dom/Element.h"
27 #include "core/dom/ElementTraversal.h" 27 #include "core/dom/ElementTraversal.h"
28 #include "core/html/HTMLOListElement.h" 28 #include "core/html/HTMLOListElement.h"
29 #include "core/layout/CounterNode.h" 29 #include "core/layout/CounterNode.h"
30 #include "core/layout/LayoutListItem.h"
31 #include "core/layout/LayoutListMarker.h"
30 #include "core/layout/style/LayoutStyle.h" 32 #include "core/layout/style/LayoutStyle.h"
31 #include "core/rendering/RenderListItem.h"
32 #include "core/rendering/RenderListMarker.h"
33 #include "core/rendering/RenderView.h" 33 #include "core/rendering/RenderView.h"
34 #include "wtf/StdLibExtras.h" 34 #include "wtf/StdLibExtras.h"
35 35
36 #ifndef NDEBUG 36 #ifndef NDEBUG
37 #include <stdio.h> 37 #include <stdio.h>
38 #endif 38 #endif
39 39
40 namespace blink { 40 namespace blink {
41 41
42 using namespace HTMLNames; 42 using namespace HTMLNames;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 const CounterDirectives directives = style.getCounterDirectives(identifier); 130 const CounterDirectives directives = style.getCounterDirectives(identifier);
131 if (directives.isDefined()) { 131 if (directives.isDefined()) {
132 value = directives.combinedValue(); 132 value = directives.combinedValue();
133 isReset = directives.isReset(); 133 isReset = directives.isReset();
134 return true; 134 return true;
135 } 135 }
136 136
137 if (identifier == "list-item") { 137 if (identifier == "list-item") {
138 if (object.isListItem()) { 138 if (object.isListItem()) {
139 if (toRenderListItem(object).hasExplicitValue()) { 139 if (toLayoutListItem(object).hasExplicitValue()) {
140 value = toRenderListItem(object).explicitValue(); 140 value = toLayoutListItem(object).explicitValue();
141 isReset = true; 141 isReset = true;
142 return true; 142 return true;
143 } 143 }
144 value = 1; 144 value = 1;
145 isReset = false; 145 isReset = false;
146 return true; 146 return true;
147 } 147 }
148 if (Node* e = object.node()) { 148 if (Node* e = object.node()) {
149 if (isHTMLOListElement(*e)) { 149 if (isHTMLOListElement(*e)) {
150 value = toHTMLOListElement(e)->start(); 150 value = toHTMLOListElement(e)->start();
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 fprintf(stderr, " "); 608 fprintf(stderr, " ");
609 fprintf(stderr, "%p N:%p P:%p PS:%p NS:%p C:%p\n", 609 fprintf(stderr, "%p N:%p P:%p PS:%p NS:%p C:%p\n",
610 current, current->node(), current->parent(), current->previousSiblin g(), 610 current, current->node(), current->parent(), current->previousSiblin g(),
611 current->nextSibling(), current->hasCounterNodeMap() ? 611 current->nextSibling(), current->hasCounterNodeMap() ?
612 counterName ? blink::counterMaps().get(current)->get(identifier) : ( blink::CounterNode*)1 : (blink::CounterNode*)0); 612 counterName ? blink::counterMaps().get(current)->get(identifier) : ( blink::CounterNode*)1 : (blink::CounterNode*)0);
613 } 613 }
614 fflush(stderr); 614 fflush(stderr);
615 } 615 }
616 616
617 #endif // NDEBUG 617 #endif // NDEBUG
OLDNEW
« no previous file with comments | « Source/core/html/HTMLSelectElement.cpp ('k') | Source/core/layout/LayoutListBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698