third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp - Issue 2354843002: Changed EFloat to an enum class

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp

Issue 2354843002: Changed EFloat to an enum class (Closed)

Patch Set: Rebase Created 4 years, 2 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:

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.	3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.

4 * Copyright (C) 2010 Google Inc. All rights reserved.	4 * Copyright (C) 2010 Google Inc. All rights reserved.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 1369 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1380 // minwidth is concerned.	1380 // minwidth is concerned.

1381 LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogic alWidth;	1381 LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogic alWidth;

1382 computeChildPreferredLogicalWidths(*child, childMinPreferredLogi calWidth, childMaxPreferredLogicalWidth);	1382 computeChildPreferredLogicalWidths(*child, childMinPreferredLogi calWidth, childMaxPreferredLogicalWidth);

1383 childMin += childMinPreferredLogicalWidth;	1383 childMin += childMinPreferredLogicalWidth;

1384 childMax += childMaxPreferredLogicalWidth;	1384 childMax += childMaxPreferredLogicalWidth;

1385	1385

1386 bool clearPreviousFloat;	1386 bool clearPreviousFloat;

1387 if (child->isFloating()) {	1387 if (child->isFloating()) {

1388 const ComputedStyle& childStyle = child->styleRef();	1388 const ComputedStyle& childStyle = child->styleRef();

1389 clearPreviousFloat = (prevFloat	1389 clearPreviousFloat = (prevFloat

1390 && ((prevFloat->styleRef().floating() == LeftFloat && (c hildStyle.clear() & ClearLeft))	1390 && ((prevFloat->styleRef().floating() == EFloat::LeftFlo at && (childStyle.clear() & ClearLeft))

1391 \|\| (prevFloat->styleRef().floating() == RightFloat & & (childStyle.clear() & ClearRight))));	1391 \|\| (prevFloat->styleRef().floating() == EFloat::Righ tFloat && (childStyle.clear() & ClearRight))));

1392 prevFloat = child;	1392 prevFloat = child;

1393 } else {	1393 } else {

1394 clearPreviousFloat = false;	1394 clearPreviousFloat = false;

1395 }	1395 }

1396	1396

1397 bool canBreakReplacedElement = !child->isImage() \|\| allowImagesT oBreak;	1397 bool canBreakReplacedElement = !child->isImage() \|\| allowImagesT oBreak;

1398 if ((canBreakReplacedElement && (autoWrap \|\| oldAutoWrap) && (!i sPrevChildInlineFlow \|\| shouldBreakLineAfterText)) \|\| clearPreviousFloat) {	1398 if ((canBreakReplacedElement && (autoWrap \|\| oldAutoWrap) && (!i sPrevChildInlineFlow \|\| shouldBreakLineAfterText)) \|\| clearPreviousFloat) {

1399 minLogicalWidth = std::max(minLogicalWidth, inlineMin);	1399 minLogicalWidth = std::max(minLogicalWidth, inlineMin);

1400 inlineMin = LayoutUnit();	1400 inlineMin = LayoutUnit();

1401 }	1401 }

(...skipping 715 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2117 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const	2117 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const

2118 {	2118 {

2119 // LayoutBlockFlow is in charge of paint invalidation of the first line.	2119 // LayoutBlockFlow is in charge of paint invalidation of the first line.

2120 if (firstLineBox())	2120 if (firstLineBox())

2121 return false;	2121 return false;

2122	2122

2123 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize();	2123 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize();

2124 }	2124 }

2125	2125

2126 } // namespace blink	2126 } // namespace blink

OLD	NEW