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

Side by Side Diff: Source/core/layout/LayoutListItem.cpp

Issue 1071863002: Prefer ComposedTreeTraversal to NodeRenderingTraversal. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
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) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 * 21 *
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/layout/LayoutListItem.h" 25 #include "core/layout/LayoutListItem.h"
26 26
27 #include "core/HTMLNames.h" 27 #include "core/HTMLNames.h"
28 #include "core/dom/NodeRenderingTraversal.h" 28 #include "core/dom/shadow/ComposedTreeTraversal.h"
29 #include "core/html/HTMLOListElement.h" 29 #include "core/html/HTMLOListElement.h"
30 #include "core/layout/LayoutListMarker.h" 30 #include "core/layout/LayoutListMarker.h"
31 #include "core/layout/LayoutView.h" 31 #include "core/layout/LayoutView.h"
32 #include "core/layout/TextAutosizer.h" 32 #include "core/layout/TextAutosizer.h"
33 #include "wtf/StdLibExtras.h" 33 #include "wtf/StdLibExtras.h"
34 #include "wtf/text/StringBuilder.h" 34 #include "wtf/text/StringBuilder.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 using namespace HTMLNames; 38 using namespace HTMLNames;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 91 }
92 92
93 // Returns the enclosing list with respect to the DOM order. 93 // Returns the enclosing list with respect to the DOM order.
94 static Node* enclosingList(const LayoutListItem* listItem) 94 static Node* enclosingList(const LayoutListItem* listItem)
95 { 95 {
96 Node* listItemNode = listItem->node(); 96 Node* listItemNode = listItem->node();
97 if (!listItemNode) 97 if (!listItemNode)
98 return nullptr; 98 return nullptr;
99 Node* firstNode = nullptr; 99 Node* firstNode = nullptr;
100 // We use parentNode because the enclosing list could be a ShadowRoot that's not Element. 100 // We use parentNode because the enclosing list could be a ShadowRoot that's not Element.
101 for (Node* parent = NodeRenderingTraversal::parent(*listItemNode); parent; p arent = NodeRenderingTraversal::parent(*parent)) { 101 for (Node* parent = ComposedTreeTraversal::parent(*listItemNode); parent; pa rent = ComposedTreeTraversal::parent(*parent)) {
102 if (isList(*parent)) 102 if (isList(*parent))
103 return parent; 103 return parent;
104 if (!firstNode) 104 if (!firstNode)
105 firstNode = parent; 105 firstNode = parent;
106 } 106 }
107 107
108 // If there's no actual <ul> or <ol> list element, then the first found 108 // If there's no actual <ul> or <ol> list element, then the first found
109 // node acts as our list for purposes of determining what other list items 109 // node acts as our list for purposes of determining what other list items
110 // should be numbered as part of the same list. 110 // should be numbered as part of the same list.
111 return firstNode; 111 return firstNode;
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 // assume that all the following ones have too. 528 // assume that all the following ones have too.
529 // This gives us the opportunity to stop here and avoid 529 // This gives us the opportunity to stop here and avoid
530 // marking the same nodes again. 530 // marking the same nodes again.
531 break; 531 break;
532 } 532 }
533 item->updateValue(); 533 item->updateValue();
534 } 534 }
535 } 535 }
536 536
537 } // namespace blink 537 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698