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

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

Issue 2651253003: Revert of Fix shouldPaint issue when a composited floating iframe becomes non-self-painting (Closed)
Patch Set: Created 3 years, 10 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
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 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 int m_lineBreakToAvoidWidow; 711 int m_lineBreakToAvoidWidow;
712 bool m_didBreakAtLineToAvoidWidow : 1; 712 bool m_didBreakAtLineToAvoidWidow : 1;
713 bool m_discardMarginBefore : 1; 713 bool m_discardMarginBefore : 1;
714 bool m_discardMarginAfter : 1; 714 bool m_discardMarginAfter : 1;
715 }; 715 };
716 716
717 const FloatingObjects* floatingObjects() const { 717 const FloatingObjects* floatingObjects() const {
718 return m_floatingObjects.get(); 718 return m_floatingObjects.get();
719 } 719 }
720 720
721 static void updateAncestorShouldPaintFloatingObject( 721 static void setAncestorShouldPaintFloatingObject(const LayoutBox& floatBox);
722 const LayoutBox& floatBox);
723 722
724 protected: 723 protected:
725 LayoutUnit maxPositiveMarginBefore() const { 724 LayoutUnit maxPositiveMarginBefore() const {
726 return m_rareData 725 return m_rareData
727 ? m_rareData->m_margins.positiveMarginBefore() 726 ? m_rareData->m_margins.positiveMarginBefore()
728 : LayoutBlockFlowRareData::positiveMarginBeforeDefault(this); 727 : LayoutBlockFlowRareData::positiveMarginBeforeDefault(this);
729 } 728 }
730 LayoutUnit maxNegativeMarginBefore() const { 729 LayoutUnit maxNegativeMarginBefore() const {
731 return m_rareData 730 return m_rareData
732 ? m_rareData->m_margins.negativeMarginBefore() 731 ? m_rareData->m_margins.negativeMarginBefore()
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 void positionDialog(); 947 void positionDialog();
949 948
950 // END METHODS DEFINED IN LayoutBlockFlowLine 949 // END METHODS DEFINED IN LayoutBlockFlowLine
951 }; 950 };
952 951
953 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 952 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
954 953
955 } // namespace blink 954 } // namespace blink
956 955
957 #endif // LayoutBlockFlow_h 956 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/FloatingObjects.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698