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

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

Issue 2653123002: Changed EClear to an enum class and renamed its members (Closed)
Patch Set: Rebase 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) 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. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All right reserved. 4 * All right reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * Copyright (C) 2013 Adobe Systems Incorporated. 6 * Copyright (C) 2013 Adobe Systems Incorporated.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 // cleanly. Otherwise the <br> has no effect on whether the line is 399 // cleanly. Otherwise the <br> has no effect on whether the line is
400 // empty or not. 400 // empty or not.
401 if (m_startingNewParagraph) 401 if (m_startingNewParagraph)
402 m_lineInfo.setEmpty(false); 402 m_lineInfo.setEmpty(false);
403 m_trailingObjects.clear(); 403 m_trailingObjects.clear();
404 m_lineInfo.setPreviousLineBrokeCleanly(true); 404 m_lineInfo.setPreviousLineBrokeCleanly(true);
405 405
406 // A <br> with clearance always needs a linebox in case the lines below it 406 // A <br> with clearance always needs a linebox in case the lines below it
407 // get dirtied later and need to check for floats to clear - so if we're 407 // get dirtied later and need to check for floats to clear - so if we're
408 // ignoring spaces, stop ignoring them and add a run for this object. 408 // ignoring spaces, stop ignoring them and add a run for this object.
409 if (m_ignoringSpaces && m_currentStyle->clear() != ClearNone) 409 if (m_ignoringSpaces && m_currentStyle->clear() != EClear::kNone)
410 ensureLineBoxInsideIgnoredSpaces(&m_lineMidpointState, br); 410 ensureLineBoxInsideIgnoredSpaces(&m_lineMidpointState, br);
411 411
412 if (!m_lineInfo.isEmpty()) 412 if (!m_lineInfo.isEmpty())
413 clear = m_currentStyle->clear(); 413 clear = m_currentStyle->clear();
414 } 414 }
415 m_atEnd = true; 415 m_atEnd = true;
416 } 416 }
417 417
418 inline LayoutUnit borderPaddingMarginStart(LineLayoutInline child) { 418 inline LayoutUnit borderPaddingMarginStart(LineLayoutInline child) {
419 return child.marginStart() + child.paddingStart() + child.borderStart(); 419 return child.marginStart() + child.paddingStart() + child.borderStart();
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 1542
1543 if (style.getTextIndentType() == TextIndentHanging) 1543 if (style.getTextIndentType() == TextIndentHanging)
1544 indentText = indentText == IndentText ? DoNotIndentText : IndentText; 1544 indentText = indentText == IndentText ? DoNotIndentText : IndentText;
1545 1545
1546 return indentText; 1546 return indentText;
1547 } 1547 }
1548 1548
1549 } // namespace blink 1549 } // namespace blink
1550 1550
1551 #endif // BreakingContextInlineHeaders_h 1551 #endif // BreakingContextInlineHeaders_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698