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

Side by Side Diff: Source/core/layout/LayoutObject.h

Issue 1183563002: Remove unused argument to LayoutObject::markContainerChainForLayout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « no previous file | Source/core/layout/LayoutObject.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 610 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 paintInvalidationContainer and paintInvalidationContainerSkipped are n ot null, on return *paintInvalidationContainerSkipped 622 // If paintInvalidationContainer and paintInvalidationContainerSkipped are n ot null, on return *paintInvalidationContainerSkipped
623 // is true if the layoutObject returned is an ancestor of paintInvalidationC ontainer. 623 // is true if the layoutObject returned is an ancestor of paintInvalidationC ontainer.
624 LayoutObject* container(const LayoutBoxModelObject* paintInvalidationContain er = nullptr, bool* paintInvalidationContainerSkipped = nullptr) const; 624 LayoutObject* container(const LayoutBoxModelObject* paintInvalidationContain er = nullptr, bool* paintInvalidationContainerSkipped = nullptr) const;
625 LayoutBlock* containerForFixedPosition(const LayoutBoxModelObject* paintInva lidationContainer = nullptr, bool* paintInvalidationContainerSkipped = nullptr) const; 625 LayoutBlock* containerForFixedPosition(const LayoutBoxModelObject* paintInva lidationContainer = nullptr, bool* paintInvalidationContainerSkipped = nullptr) const;
626 626
627 virtual LayoutObject* hoverAncestor() const { return parent(); } 627 virtual LayoutObject* hoverAncestor() const { return parent(); }
628 628
629 Element* offsetParent() const; 629 Element* offsetParent() const;
630 630
631 void markContainerChainForLayout(bool scheduleRelayout = true, LayoutObject* newRoot = nullptr, SubtreeLayoutScope* = nullptr); 631 void markContainerChainForLayout(bool scheduleRelayout = true, SubtreeLayout Scope* = nullptr);
632 void setNeedsLayout(LayoutInvalidationReasonForTracing, MarkingBehavior = Ma rkContainerChain, SubtreeLayoutScope* = nullptr); 632 void setNeedsLayout(LayoutInvalidationReasonForTracing, MarkingBehavior = Ma rkContainerChain, SubtreeLayoutScope* = nullptr);
633 void setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReasonForTraci ng, MarkingBehavior = MarkContainerChain, SubtreeLayoutScope* = nullptr); 633 void setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReasonForTraci ng, MarkingBehavior = MarkContainerChain, SubtreeLayoutScope* = nullptr);
634 void clearNeedsLayout(); 634 void clearNeedsLayout();
635 void setChildNeedsLayout(MarkingBehavior = MarkContainerChain, SubtreeLayout Scope* = nullptr); 635 void setChildNeedsLayout(MarkingBehavior = MarkContainerChain, SubtreeLayout Scope* = nullptr);
636 void setNeedsPositionedMovementLayout(); 636 void setNeedsPositionedMovementLayout();
637 void setPreferredLogicalWidthsDirty(MarkingBehavior = MarkContainerChain); 637 void setPreferredLogicalWidthsDirty(MarkingBehavior = MarkContainerChain);
638 void clearPreferredLogicalWidthsDirty(); 638 void clearPreferredLogicalWidthsDirty();
639 639
640 void setNeedsLayoutAndPrefWidthsRecalc(LayoutInvalidationReasonForTracing re ason) 640 void setNeedsLayoutAndPrefWidthsRecalc(LayoutInvalidationReasonForTracing re ason)
641 { 641 {
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
1503 bool alreadyNeededLayout = m_bitfields.selfNeedsLayout(); 1503 bool alreadyNeededLayout = m_bitfields.selfNeedsLayout();
1504 setSelfNeedsLayout(true); 1504 setSelfNeedsLayout(true);
1505 if (!alreadyNeededLayout) { 1505 if (!alreadyNeededLayout) {
1506 TRACE_EVENT_INSTANT1( 1506 TRACE_EVENT_INSTANT1(
1507 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"), 1507 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"),
1508 "LayoutInvalidationTracking", 1508 "LayoutInvalidationTracking",
1509 TRACE_EVENT_SCOPE_THREAD, 1509 TRACE_EVENT_SCOPE_THREAD,
1510 "data", 1510 "data",
1511 InspectorLayoutInvalidationTrackingEvent::data(this, reason)); 1511 InspectorLayoutInvalidationTrackingEvent::data(this, reason));
1512 if (markParents == MarkContainerChain && (!layouter || layouter->root() != this)) 1512 if (markParents == MarkContainerChain && (!layouter || layouter->root() != this))
1513 markContainerChainForLayout(true, 0, layouter); 1513 markContainerChainForLayout(true, layouter);
1514 } 1514 }
1515 } 1515 }
1516 1516
1517 inline void LayoutObject::setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidat ionReasonForTracing reason, MarkingBehavior markParents, SubtreeLayoutScope* lay outer) 1517 inline void LayoutObject::setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidat ionReasonForTracing reason, MarkingBehavior markParents, SubtreeLayoutScope* lay outer)
1518 { 1518 {
1519 setNeedsLayout(reason, markParents, layouter); 1519 setNeedsLayout(reason, markParents, layouter);
1520 setShouldDoFullPaintInvalidation(); 1520 setShouldDoFullPaintInvalidation();
1521 } 1521 }
1522 1522
1523 inline void LayoutObject::clearNeedsLayout() 1523 inline void LayoutObject::clearNeedsLayout()
(...skipping 12 matching lines...) Expand all
1536 #endif 1536 #endif
1537 } 1537 }
1538 1538
1539 inline void LayoutObject::setChildNeedsLayout(MarkingBehavior markParents, Subtr eeLayoutScope* layouter) 1539 inline void LayoutObject::setChildNeedsLayout(MarkingBehavior markParents, Subtr eeLayoutScope* layouter)
1540 { 1540 {
1541 ASSERT(!isSetNeedsLayoutForbidden()); 1541 ASSERT(!isSetNeedsLayoutForbidden());
1542 bool alreadyNeededLayout = normalChildNeedsLayout(); 1542 bool alreadyNeededLayout = normalChildNeedsLayout();
1543 setNormalChildNeedsLayout(true); 1543 setNormalChildNeedsLayout(true);
1544 // FIXME: Replace MarkOnlyThis with the SubtreeLayoutScope code path and rem ove the MarkingBehavior argument entirely. 1544 // FIXME: Replace MarkOnlyThis with the SubtreeLayoutScope code path and rem ove the MarkingBehavior argument entirely.
1545 if (!alreadyNeededLayout && markParents == MarkContainerChain && (!layouter || layouter->root() != this)) 1545 if (!alreadyNeededLayout && markParents == MarkContainerChain && (!layouter || layouter->root() != this))
1546 markContainerChainForLayout(true, 0, layouter); 1546 markContainerChainForLayout(true, layouter);
1547 } 1547 }
1548 1548
1549 inline void LayoutObject::setNeedsPositionedMovementLayout() 1549 inline void LayoutObject::setNeedsPositionedMovementLayout()
1550 { 1550 {
1551 bool alreadyNeededLayout = needsPositionedMovementLayout(); 1551 bool alreadyNeededLayout = needsPositionedMovementLayout();
1552 setNeedsPositionedMovementLayout(true); 1552 setNeedsPositionedMovementLayout(true);
1553 ASSERT(!isSetNeedsLayoutForbidden()); 1553 ASSERT(!isSetNeedsLayoutForbidden());
1554 if (!alreadyNeededLayout) 1554 if (!alreadyNeededLayout)
1555 markContainerChainForLayout(); 1555 markContainerChainForLayout();
1556 } 1556 }
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 void showTree(const blink::LayoutObject*); 1663 void showTree(const blink::LayoutObject*);
1664 void showLineTree(const blink::LayoutObject*); 1664 void showLineTree(const blink::LayoutObject*);
1665 void showLayoutTree(const blink::LayoutObject* object1); 1665 void showLayoutTree(const blink::LayoutObject* object1);
1666 // We don't make object2 an optional parameter so that showLayoutTree 1666 // We don't make object2 an optional parameter so that showLayoutTree
1667 // can be called from gdb easily. 1667 // can be called from gdb easily.
1668 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2); 1668 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2);
1669 1669
1670 #endif 1670 #endif
1671 1671
1672 #endif // LayoutObject_h 1672 #endif // LayoutObject_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698