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

Unified Diff: third_party/WebKit/Source/core/layout/line/LineInfo.h

Issue 1899193007: Remove special-code for paginating floats followed by lines of text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/LineBreaker.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/line/LineInfo.h
diff --git a/third_party/WebKit/Source/core/layout/line/LineInfo.h b/third_party/WebKit/Source/core/layout/line/LineInfo.h
index 7487716fc2a99339c84a4b8022c3448b8204f4d4..e882c632810ee83d0d36bd0d6b19b709eee516e5 100644
--- a/third_party/WebKit/Source/core/layout/line/LineInfo.h
+++ b/third_party/WebKit/Source/core/layout/line/LineInfo.h
@@ -45,34 +45,21 @@ public:
bool isLastLine() const { return m_isLastLine; }
bool isEmpty() const { return m_isEmpty; }
bool previousLineBrokeCleanly() const { return m_previousLineBrokeCleanly; }
- LayoutUnit floatPaginationStrut() const { return m_floatPaginationStrut; }
unsigned runsFromLeadingWhitespace() const { return m_runsFromLeadingWhitespace; }
void resetRunsFromLeadingWhitespace() { m_runsFromLeadingWhitespace = 0; }
void incrementRunsFromLeadingWhitespace() { m_runsFromLeadingWhitespace++; }
void setFirstLine(bool firstLine) { m_isFirstLine = firstLine; }
void setLastLine(bool lastLine) { m_isLastLine = lastLine; }
- void setEmpty(bool empty, LineLayoutBlockFlow block = LineLayoutBlockFlow(), LineWidth* lineWidth = nullptr)
- {
- if (m_isEmpty == empty)
- return;
- m_isEmpty = empty;
- if (!empty && block && floatPaginationStrut()) {
- block.setLogicalHeight(block.logicalHeight() + floatPaginationStrut());
- setFloatPaginationStrut(LayoutUnit());
- lineWidth->updateAvailableWidth();
- }
- }
+ void setEmpty(bool empty) { m_isEmpty = empty; }
void setPreviousLineBrokeCleanly(bool previousLineBrokeCleanly) { m_previousLineBrokeCleanly = previousLineBrokeCleanly; }
- void setFloatPaginationStrut(LayoutUnit strut) { m_floatPaginationStrut = strut; }
private:
bool m_isFirstLine;
bool m_isLastLine;
bool m_isEmpty;
bool m_previousLineBrokeCleanly;
- LayoutUnit m_floatPaginationStrut;
unsigned m_runsFromLeadingWhitespace;
};
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/LineBreaker.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698