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

Side by Side Diff: Source/core/rendering/RenderObject.h

Issue 280633002: Rename RenderObject::setNeedsLayout to setNeedsLayoutAndFullRepaint (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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/rendering/RenderMenuList.cpp ('k') | Source/core/rendering/RenderObject.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 bool childrenInline() const { return m_bitfields.childrenInline(); } 411 bool childrenInline() const { return m_bitfields.childrenInline(); }
412 void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); } 412 void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); }
413 bool hasColumns() const { return m_bitfields.hasColumns(); } 413 bool hasColumns() const { return m_bitfields.hasColumns(); }
414 void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); } 414 void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); }
415 415
416 bool ancestorLineBoxDirty() const { return m_bitfields.ancestorLineBoxDirty( ); } 416 bool ancestorLineBoxDirty() const { return m_bitfields.ancestorLineBoxDirty( ); }
417 void setAncestorLineBoxDirty(bool value = true) 417 void setAncestorLineBoxDirty(bool value = true)
418 { 418 {
419 m_bitfields.setAncestorLineBoxDirty(value); 419 m_bitfields.setAncestorLineBoxDirty(value);
420 if (value) 420 if (value)
421 setNeedsLayout(); 421 setNeedsLayoutAndFullRepaint();
422 } 422 }
423 423
424 enum FlowThreadState { 424 enum FlowThreadState {
425 NotInsideFlowThread = 0, 425 NotInsideFlowThread = 0,
426 InsideOutOfFlowThread = 1, 426 InsideOutOfFlowThread = 1,
427 InsideInFlowThread = 2, 427 InsideInFlowThread = 2,
428 }; 428 };
429 429
430 void setFlowThreadStateIncludingDescendants(FlowThreadState); 430 void setFlowThreadStateIncludingDescendants(FlowThreadState);
431 431
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 // Returns the object containing this one. Can be different from parent for positioned elements. 621 // Returns the object containing this one. Can be different from parent for positioned elements.
622 // If repaintContainer and repaintContainerSkipped are not null, on return * repaintContainerSkipped 622 // If repaintContainer and repaintContainerSkipped are not null, on return * repaintContainerSkipped
623 // is true if the renderer returned is an ancestor of repaintContainer. 623 // is true if the renderer returned is an ancestor of repaintContainer.
624 RenderObject* container(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const; 624 RenderObject* container(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const;
625 625
626 virtual RenderObject* hoverAncestor() const { return parent(); } 626 virtual RenderObject* hoverAncestor() const { return parent(); }
627 627
628 Element* offsetParent() const; 628 Element* offsetParent() const;
629 629
630 void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderObjec t* newRoot = 0, SubtreeLayoutScope* = 0); 630 void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderObjec t* newRoot = 0, SubtreeLayoutScope* = 0);
631 void setNeedsLayout(MarkingBehavior = MarkContainingBlockChain, SubtreeLayou tScope* = 0); 631 void setNeedsLayoutAndFullRepaint(MarkingBehavior = MarkContainingBlockChain , SubtreeLayoutScope* = 0);
632 void clearNeedsLayout(); 632 void clearNeedsLayout();
633 void setChildNeedsLayout(MarkingBehavior = MarkContainingBlockChain, Subtree LayoutScope* = 0); 633 void setChildNeedsLayout(MarkingBehavior = MarkContainingBlockChain, Subtree LayoutScope* = 0);
634 void setNeedsPositionedMovementLayout(); 634 void setNeedsPositionedMovementLayout();
635 void setPreferredLogicalWidthsDirty(MarkingBehavior = MarkContainingBlockCha in); 635 void setPreferredLogicalWidthsDirty(MarkingBehavior = MarkContainingBlockCha in);
636 void clearPreferredLogicalWidthsDirty(); 636 void clearPreferredLogicalWidthsDirty();
637 void invalidateContainerPreferredLogicalWidths(); 637 void invalidateContainerPreferredLogicalWidths();
638 638
639 void setNeedsLayoutAndPrefWidthsRecalc() 639 void setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint()
640 { 640 {
641 setNeedsLayout(); 641 setNeedsLayoutAndFullRepaint();
642 setPreferredLogicalWidthsDirty(); 642 setPreferredLogicalWidthsDirty();
643 } 643 }
644 644
645 void setPositionState(EPosition position) 645 void setPositionState(EPosition position)
646 { 646 {
647 ASSERT((position != AbsolutePosition && position != FixedPosition) || is Box()); 647 ASSERT((position != AbsolutePosition && position != FixedPosition) || is Box());
648 m_bitfields.setPositionedState(position); 648 m_bitfields.setPositionedState(position);
649 } 649 }
650 void clearPositionedState() { m_bitfields.clearPositionedState(); } 650 void clearPositionedState() { m_bitfields.clearPositionedState(); }
651 651
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 if (isText() && !isBR()) 1318 if (isText() && !isBR())
1319 return false; 1319 return false;
1320 return true; 1320 return true;
1321 } 1321 }
1322 1322
1323 inline bool RenderObject::isBeforeOrAfterContent() const 1323 inline bool RenderObject::isBeforeOrAfterContent() const
1324 { 1324 {
1325 return isBeforeContent() || isAfterContent(); 1325 return isBeforeContent() || isAfterContent();
1326 } 1326 }
1327 1327
1328 inline void RenderObject::setNeedsLayout(MarkingBehavior markParents, SubtreeLay outScope* layouter) 1328 inline void RenderObject::setNeedsLayoutAndFullRepaint(MarkingBehavior markParen ts, SubtreeLayoutScope* layouter)
1329 { 1329 {
1330 ASSERT(!isSetNeedsLayoutForbidden()); 1330 ASSERT(!isSetNeedsLayoutForbidden());
1331 bool alreadyNeededLayout = m_bitfields.selfNeedsLayout(); 1331 bool alreadyNeededLayout = m_bitfields.selfNeedsLayout();
1332 setSelfNeedsLayout(true); 1332 setSelfNeedsLayout(true);
1333 if (!alreadyNeededLayout) { 1333 if (!alreadyNeededLayout) {
1334 if (markParents == MarkContainingBlockChain && (!layouter || layouter->r oot() != this)) 1334 if (markParents == MarkContainingBlockChain && (!layouter || layouter->r oot() != this))
1335 markContainingBlocksForLayout(true, 0, layouter); 1335 markContainingBlocksForLayout(true, 0, layouter);
1336 } 1336 }
1337 } 1337 }
1338 1338
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 void showTree(const WebCore::RenderObject*); 1473 void showTree(const WebCore::RenderObject*);
1474 void showLineTree(const WebCore::RenderObject*); 1474 void showLineTree(const WebCore::RenderObject*);
1475 void showRenderTree(const WebCore::RenderObject* object1); 1475 void showRenderTree(const WebCore::RenderObject* object1);
1476 // We don't make object2 an optional parameter so that showRenderTree 1476 // We don't make object2 an optional parameter so that showRenderTree
1477 // can be called from gdb easily. 1477 // can be called from gdb easily.
1478 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1478 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1479 1479
1480 #endif 1480 #endif
1481 1481
1482 #endif // RenderObject_h 1482 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMenuList.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698