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

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

Issue 2505853004: Let lowestFloatLogicalBottom() take EClear instead of FloatingObject::Type (Closed)
Patch Set: Created 4 years, 1 month 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 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 return containsFloats() ? m_floatingObjects->set().last().get() : nullptr; 369 return containsFloats() ? m_floatingObjects->set().last().get() : nullptr;
370 } 370 }
371 371
372 void setShouldDoFullPaintInvalidationForFirstLine(); 372 void setShouldDoFullPaintInvalidationForFirstLine();
373 373
374 void simplifiedNormalFlowInlineLayout(); 374 void simplifiedNormalFlowInlineLayout();
375 bool recalcInlineChildrenOverflowAfterStyleChange(); 375 bool recalcInlineChildrenOverflowAfterStyleChange();
376 376
377 PositionWithAffinity positionForPoint(const LayoutPoint&) override; 377 PositionWithAffinity positionForPoint(const LayoutPoint&) override;
378 378
379 LayoutUnit lowestFloatLogicalBottom( 379 LayoutUnit lowestFloatLogicalBottom(
szager1 2016/11/16 22:35:35 You should be able to eliminate this method by pro
mstensho (USE GERRIT) 2016/11/16 22:45:37 Indeed! Looks like I didn't bother to check if the
380 FloatingObject::Type = FloatingObject::FloatLeftRight) const; 380 FloatingObject::Type = FloatingObject::FloatLeftRight) const;
381 381
382 LayoutUnit lowestFloatLogicalBottom(EClear) const;
383
382 bool hasOverhangingFloats() const { 384 bool hasOverhangingFloats() const {
383 return parent() && containsFloats() && 385 return parent() && containsFloats() &&
384 lowestFloatLogicalBottom() > logicalHeight(); 386 lowestFloatLogicalBottom() > logicalHeight();
385 } 387 }
386 bool isOverhangingFloat(const FloatingObject& floatObject) const { 388 bool isOverhangingFloat(const FloatingObject& floatObject) const {
387 return logicalBottomForFloat(floatObject) > logicalHeight(); 389 return logicalBottomForFloat(floatObject) > logicalHeight();
388 } 390 }
389 391
390 LayoutUnit logicalHeightWithVisibleOverflow() const final; 392 LayoutUnit logicalHeightWithVisibleOverflow() const final;
391 393
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 void positionDialog(); 932 void positionDialog();
931 933
932 // END METHODS DEFINED IN LayoutBlockFlowLine 934 // END METHODS DEFINED IN LayoutBlockFlowLine
933 }; 935 };
934 936
935 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 937 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
936 938
937 } // namespace blink 939 } // namespace blink
938 940
939 #endif // LayoutBlockFlow_h 941 #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