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

Side by Side Diff: Source/core/rendering/RenderListItem.cpp

Issue 145003009: Autosize list markers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@tot
Patch Set: Update TestExpectations. Created 6 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/rendering/FastTextAutosizer.cpp ('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) 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/rendering/RenderListItem.h" 25 #include "core/rendering/RenderListItem.h"
26 26
27 #include "HTMLNames.h" 27 #include "HTMLNames.h"
28 #include "core/dom/ElementTraversal.h" 28 #include "core/dom/ElementTraversal.h"
29 #include "core/html/HTMLOListElement.h" 29 #include "core/html/HTMLOListElement.h"
30 #include "core/rendering/FastTextAutosizer.h"
30 #include "core/rendering/LayoutRectRecorder.h" 31 #include "core/rendering/LayoutRectRecorder.h"
31 #include "core/rendering/RenderListMarker.h" 32 #include "core/rendering/RenderListMarker.h"
32 #include "core/rendering/RenderView.h" 33 #include "core/rendering/RenderView.h"
33 #include "wtf/StdLibExtras.h" 34 #include "wtf/StdLibExtras.h"
34 #include "wtf/text/StringBuilder.h" 35 #include "wtf/text/StringBuilder.h"
35 36
36 using namespace std; 37 using namespace std;
37 38
38 namespace WebCore { 39 namespace WebCore {
39 40
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 if (m_marker->isInside()) 310 if (m_marker->isInside())
310 containingBlock()->updateLogicalWidth(); 311 containingBlock()->updateLogicalWidth();
311 } 312 }
312 } 313 }
313 } 314 }
314 315
315 void RenderListItem::layout() 316 void RenderListItem::layout()
316 { 317 {
317 ASSERT(needsLayout()); 318 ASSERT(needsLayout());
318 319
320 // The marker must be autosized before calling updateMarkerLocation.
321 // It cannot be done in the parent's beginLayout because it is not yet in th e render tree.
322 FastTextAutosizer* textAutosizer = document().fastTextAutosizer();
323 if (textAutosizer)
324 textAutosizer->inflateListItem(this, m_marker);
325
319 LayoutRectRecorder recorder(*this); 326 LayoutRectRecorder recorder(*this);
320 updateMarkerLocation(); 327 updateMarkerLocation();
321 RenderBlockFlow::layout(); 328 RenderBlockFlow::layout();
322 } 329 }
323 330
324 void RenderListItem::addOverflowFromChildren() 331 void RenderListItem::addOverflowFromChildren()
325 { 332 {
326 RenderBlockFlow::addOverflowFromChildren(); 333 RenderBlockFlow::addOverflowFromChildren();
327 positionListMarker(); 334 positionListMarker();
328 } 335 }
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 // assume that all the following ones have too. 524 // assume that all the following ones have too.
518 // This gives us the opportunity to stop here and avoid 525 // This gives us the opportunity to stop here and avoid
519 // marking the same nodes again. 526 // marking the same nodes again.
520 break; 527 break;
521 } 528 }
522 item->updateValue(); 529 item->updateValue();
523 } 530 }
524 } 531 }
525 532
526 } // namespace WebCore 533 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698