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

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

Issue 2340113003: [layoutng] Make sure to update m_isSelfCollapsing after ng layout (Closed)
Patch Set: Created 4 years, 3 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 void simplifiedNormalFlowInlineLayout(); 294 void simplifiedNormalFlowInlineLayout();
295 bool recalcInlineChildrenOverflowAfterStyleChange(); 295 bool recalcInlineChildrenOverflowAfterStyleChange();
296 296
297 PositionWithAffinity positionForPoint(const LayoutPoint&) override; 297 PositionWithAffinity positionForPoint(const LayoutPoint&) override;
298 298
299 LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::F loatLeftRight) const; 299 LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::F loatLeftRight) const;
300 300
301 bool hasOverhangingFloats() const { return parent() && containsFloats() && l owestFloatLogicalBottom() > logicalHeight(); } 301 bool hasOverhangingFloats() const { return parent() && containsFloats() && l owestFloatLogicalBottom() > logicalHeight(); }
302 bool isOverhangingFloat(const FloatingObject& floatObject) const { return lo gicalBottomForFloat(floatObject) > logicalHeight(); } 302 bool isOverhangingFloat(const FloatingObject& floatObject) const { return lo gicalBottomForFloat(floatObject) > logicalHeight(); }
303 303
304 // This function is only public so we can call it from NGBox while we're
305 // still working on LayoutNG.
306 void updateIsSelfCollapsing() { m_isSelfCollapsing = checkIfIsSelfCollapsing Block(); }
307
304 #ifndef NDEBUG 308 #ifndef NDEBUG
305 void showLineTreeAndMark(const InlineBox* = nullptr, const char* = nullptr, const InlineBox* = nullptr, const char* = nullptr, const LayoutObject* = nullptr ) const; 309 void showLineTreeAndMark(const InlineBox* = nullptr, const char* = nullptr, const InlineBox* = nullptr, const char* = nullptr, const LayoutObject* = nullptr ) const;
306 #endif 310 #endif
307 311
308 protected: 312 protected:
309 void rebuildFloatsFromIntruding(); 313 void rebuildFloatsFromIntruding();
310 void layoutInlineChildren(bool relayoutChildren, LayoutUnit afterEdge); 314 void layoutInlineChildren(bool relayoutChildren, LayoutUnit afterEdge);
311 void addLowestFloatFromChildren(LayoutBlockFlow*); 315 void addLowestFloatFromChildren(LayoutBlockFlow*);
312 316
313 void createFloatingObjects(); 317 void createFloatingObjects();
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 663
660 // END METHODS DEFINED IN LayoutBlockFlowLine 664 // END METHODS DEFINED IN LayoutBlockFlowLine
661 665
662 }; 666 };
663 667
664 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 668 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
665 669
666 } // namespace blink 670 } // namespace blink
667 671
668 #endif // LayoutBlockFlow_h 672 #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