Source/core/layout/line/LineInfo.h - Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code.

Side by Side Diff: Source/core/layout/line/LineInfo.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add one more file. Created 5 years, 6 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 | « Source/core/layout/line/LineBoxList.cpp ('k') | Source/core/layout/line/LineLayoutState.h » ('j') | no next file with comments »

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 * Copyright (C) 2013 Adobe Systems Incorporated.	5 * Copyright (C) 2013 Adobe Systems Incorporated.

6 *	6 *

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

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

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

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

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 bool isLastLine() const { return m_isLastLine; }	44 bool isLastLine() const { return m_isLastLine; }

45 bool isEmpty() const { return m_isEmpty; }	45 bool isEmpty() const { return m_isEmpty; }

46 bool previousLineBrokeCleanly() const { return m_previousLineBrokeCleanly; }	46 bool previousLineBrokeCleanly() const { return m_previousLineBrokeCleanly; }

47 LayoutUnit floatPaginationStrut() const { return m_floatPaginationStrut; }	47 LayoutUnit floatPaginationStrut() const { return m_floatPaginationStrut; }

48 unsigned runsFromLeadingWhitespace() const { return m_runsFromLeadingWhitesp ace; }	48 unsigned runsFromLeadingWhitespace() const { return m_runsFromLeadingWhitesp ace; }

49 void resetRunsFromLeadingWhitespace() { m_runsFromLeadingWhitespace = 0; }	49 void resetRunsFromLeadingWhitespace() { m_runsFromLeadingWhitespace = 0; }

50 void incrementRunsFromLeadingWhitespace() { m_runsFromLeadingWhitespace++; }	50 void incrementRunsFromLeadingWhitespace() { m_runsFromLeadingWhitespace++; }

51	51

52 void setFirstLine(bool firstLine) { m_isFirstLine = firstLine; }	52 void setFirstLine(bool firstLine) { m_isFirstLine = firstLine; }

53 void setLastLine(bool lastLine) { m_isLastLine = lastLine; }	53 void setLastLine(bool lastLine) { m_isLastLine = lastLine; }

54 void setEmpty(bool empty, LayoutBlock* block = 0, LineWidth* lineWidth = 0)	54 void setEmpty(bool empty, LayoutBlock* block = nullptr, LineWidth* lineWidth = nullptr)

55 {	55 {

56 if (m_isEmpty == empty)	56 if (m_isEmpty == empty)

57 return;	57 return;

58 m_isEmpty = empty;	58 m_isEmpty = empty;

59 if (!empty && block && floatPaginationStrut()) {	59 if (!empty && block && floatPaginationStrut()) {

60 block->setLogicalHeight(block->logicalHeight() + floatPaginationStru t());	60 block->setLogicalHeight(block->logicalHeight() + floatPaginationStru t());

61 setFloatPaginationStrut(0);	61 setFloatPaginationStrut(0);

62 lineWidth->updateAvailableWidth();	62 lineWidth->updateAvailableWidth();

63 }	63 }

64 }	64 }

65	65

66 void setPreviousLineBrokeCleanly(bool previousLineBrokeCleanly) { m_previous LineBrokeCleanly = previousLineBrokeCleanly; }	66 void setPreviousLineBrokeCleanly(bool previousLineBrokeCleanly) { m_previous LineBrokeCleanly = previousLineBrokeCleanly; }

67 void setFloatPaginationStrut(LayoutUnit strut) { m_floatPaginationStrut = st rut; }	67 void setFloatPaginationStrut(LayoutUnit strut) { m_floatPaginationStrut = st rut; }

68	68

69 private:	69 private:

70 bool m_isFirstLine;	70 bool m_isFirstLine;

71 bool m_isLastLine;	71 bool m_isLastLine;

72 bool m_isEmpty;	72 bool m_isEmpty;

73 bool m_previousLineBrokeCleanly;	73 bool m_previousLineBrokeCleanly;

74 LayoutUnit m_floatPaginationStrut;	74 LayoutUnit m_floatPaginationStrut;

75 unsigned m_runsFromLeadingWhitespace;	75 unsigned m_runsFromLeadingWhitespace;

76 };	76 };

77	77

78 }	78 }

79	79

80 #endif // LineInfo_h	80 #endif // LineInfo_h

OLD	NEW