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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.h

Issue 1937023002: LayoutBlock::m_descendantsWithFloatsMarkedForLayout doesn't need to be mutable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | 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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
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.
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 LayoutObjectChildList m_children; 493 LayoutObjectChildList m_children;
494 LineBoxList m_lineBoxes; // All of the root line boxes created for this bloc k flow. For example, <div>Hello<br>world.</div> will have two total lines for t he <div>. 494 LineBoxList m_lineBoxes; // All of the root line boxes created for this bloc k flow. For example, <div>Hello<br>world.</div> will have two total lines for t he <div>.
495 495
496 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in LayoutBlockRareData since they are set too frequently. 496 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in LayoutBlockRareData since they are set too frequently.
497 unsigned m_hasMarginAfterQuirk : 1; 497 unsigned m_hasMarginAfterQuirk : 1;
498 unsigned m_beingDestroyed : 1; 498 unsigned m_beingDestroyed : 1;
499 unsigned m_hasMarkupTruncation : 1; 499 unsigned m_hasMarkupTruncation : 1;
500 unsigned m_widthAvailableToChildrenChanged : 1; 500 unsigned m_widthAvailableToChildrenChanged : 1;
501 unsigned m_heightAvailableToChildrenChanged : 1; 501 unsigned m_heightAvailableToChildrenChanged : 1;
502 unsigned m_isSelfCollapsing : 1; // True if margin-before and margin-after a re adjoining. 502 unsigned m_isSelfCollapsing : 1; // True if margin-before and margin-after a re adjoining.
503 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1; 503 unsigned m_descendantsWithFloatsMarkedForLayout : 1;
504 504
505 unsigned m_hasPositionedObjects : 1; 505 unsigned m_hasPositionedObjects : 1;
506 unsigned m_hasPercentHeightDescendants : 1; 506 unsigned m_hasPercentHeightDescendants : 1;
507 507
508 // LayoutRubyBase objects need to be able to split and merge, moving their c hildren around 508 // LayoutRubyBase objects need to be able to split and merge, moving their c hildren around
509 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). 509 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
510 friend class LayoutRubyBase; 510 friend class LayoutRubyBase;
511 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of LayoutBlock 511 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of LayoutBlock
512 friend class LineBreaker; 512 friend class LineBreaker;
513 513
514 // FIXME: This is temporary as we move code that accesses block flow 514 // FIXME: This is temporary as we move code that accesses block flow
515 // member variables out of LayoutBlock and into LayoutBlockFlow. 515 // member variables out of LayoutBlock and into LayoutBlockFlow.
516 friend class LayoutBlockFlow; 516 friend class LayoutBlockFlow;
517 }; 517 };
518 518
519 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 519 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
520 520
521 } // namespace blink 521 } // namespace blink
522 522
523 #endif // LayoutBlock_h 523 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698