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

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

Issue 2191953002: Fix asserts when updating shouldPaint for floating objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | third_party/WebKit/Source/core/layout/LayoutBlockFlow.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) 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-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 unsigned m_breakBefore : 4; 530 unsigned m_breakBefore : 4;
531 unsigned m_breakAfter : 4; 531 unsigned m_breakAfter : 4;
532 int m_lineBreakToAvoidWidow; 532 int m_lineBreakToAvoidWidow;
533 bool m_didBreakAtLineToAvoidWidow : 1; 533 bool m_didBreakAtLineToAvoidWidow : 1;
534 bool m_discardMarginBefore : 1; 534 bool m_discardMarginBefore : 1;
535 bool m_discardMarginAfter : 1; 535 bool m_discardMarginAfter : 1;
536 }; 536 };
537 537
538 const FloatingObjects* floatingObjects() const { return m_floatingObjects.ge t(); } 538 const FloatingObjects* floatingObjects() const { return m_floatingObjects.ge t(); }
539 539
540 static void setAncestorShouldPaintFloatingObject(const LayoutBox& floatBox, bool shouldPaint); 540 static void setAncestorShouldPaintFloatingObject(const LayoutBox& floatBox);
541 541
542 protected: 542 protected:
543 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData- >m_margins.positiveMarginBefore() : LayoutBlockFlowRareData::positiveMarginBefor eDefault(this); } 543 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData- >m_margins.positiveMarginBefore() : LayoutBlockFlowRareData::positiveMarginBefor eDefault(this); }
544 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData- >m_margins.negativeMarginBefore() : LayoutBlockFlowRareData::negativeMarginBefor eDefault(this); } 544 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData- >m_margins.negativeMarginBefore() : LayoutBlockFlowRareData::negativeMarginBefor eDefault(this); }
545 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData-> m_margins.positiveMarginAfter() : LayoutBlockFlowRareData::positiveMarginAfterDe fault(this); } 545 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData-> m_margins.positiveMarginAfter() : LayoutBlockFlowRareData::positiveMarginAfterDe fault(this); }
546 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData-> m_margins.negativeMarginAfter() : LayoutBlockFlowRareData::negativeMarginAfterDe fault(this); } 546 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData-> m_margins.negativeMarginAfter() : LayoutBlockFlowRareData::negativeMarginAfterDe fault(this); }
547 547
548 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg); 548 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg);
549 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg); 549 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg);
550 550
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 659
660 // END METHODS DEFINED IN LayoutBlockFlowLine 660 // END METHODS DEFINED IN LayoutBlockFlowLine
661 661
662 }; 662 };
663 663
664 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 664 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
665 665
666 } // namespace blink 666 } // namespace blink
667 667
668 #endif // LayoutBlockFlow_h 668 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698