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

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

Issue 1157863014: Self-collapsing blocks shouldn't get layout bit sit when handling margins (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated 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
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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 MarginValues m_margins; 418 MarginValues m_margins;
419 LayoutUnit m_paginationStrut; 419 LayoutUnit m_paginationStrut;
420 420
421 LayoutMultiColumnFlowThread* m_multiColumnFlowThread; 421 LayoutMultiColumnFlowThread* m_multiColumnFlowThread;
422 422
423 int m_lineBreakToAvoidWidow; 423 int m_lineBreakToAvoidWidow;
424 bool m_didBreakAtLineToAvoidWidow : 1; 424 bool m_didBreakAtLineToAvoidWidow : 1;
425 bool m_discardMarginBefore : 1; 425 bool m_discardMarginBefore : 1;
426 bool m_discardMarginAfter : 1; 426 bool m_discardMarginAfter : 1;
427 }; 427 };
428 LayoutUnit marginOffsetForSelfCollapsingBlock();
429 428
430 FloatingObjects* floatingObjects() { return m_floatingObjects.get(); } 429 FloatingObjects* floatingObjects() { return m_floatingObjects.get(); }
431 430
432 431
433 protected: 432 protected:
434 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData- >m_margins.positiveMarginBefore() : LayoutBlockFlowRareData::positiveMarginBefor eDefault(this); } 433 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData- >m_margins.positiveMarginBefore() : LayoutBlockFlowRareData::positiveMarginBefor eDefault(this); }
435 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData- >m_margins.negativeMarginBefore() : LayoutBlockFlowRareData::negativeMarginBefor eDefault(this); } 434 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData- >m_margins.negativeMarginBefore() : LayoutBlockFlowRareData::negativeMarginBefor eDefault(this); }
436 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData-> m_margins.positiveMarginAfter() : LayoutBlockFlowRareData::positiveMarginAfterDe fault(this); } 435 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData-> m_margins.positiveMarginAfter() : LayoutBlockFlowRareData::positiveMarginAfterDe fault(this); }
437 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData-> m_margins.negativeMarginAfter() : LayoutBlockFlowRareData::negativeMarginAfterDe fault(this); } 436 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData-> m_margins.negativeMarginAfter() : LayoutBlockFlowRareData::negativeMarginAfterDe fault(this); }
438 437
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 536
538 // END METHODS DEFINED IN LayoutBlockFlowLine 537 // END METHODS DEFINED IN LayoutBlockFlowLine
539 538
540 }; 539 };
541 540
542 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 541 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
543 542
544 } // namespace blink 543 } // namespace blink
545 544
546 #endif // LayoutBlockFlow_h 545 #endif // LayoutBlockFlow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698