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

Unified Diff: Source/core/layout/line/LineLayoutState.h

Issue 1175953003: Revert "Remove obsolete float-management code from line layout" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutBlockFlowLine.cpp ('k') | Source/core/layout/line/TrailingFloatsRootInlineBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/LineLayoutState.h
diff --git a/Source/core/layout/line/LineLayoutState.h b/Source/core/layout/line/LineLayoutState.h
index 2724405ac74abc20adaa7d316ee4616648039bb8..e1d9d47a7b752e34696074f57eddac462ab402e7 100644
--- a/Source/core/layout/line/LineLayoutState.h
+++ b/Source/core/layout/line/LineLayoutState.h
@@ -39,6 +39,7 @@ public:
, m_floatIndex(0)
, m_endLineLogicalTop(0)
, m_endLineMatched(false)
+ , m_checkForFloatsFromLastLine(false)
, m_hasInlineChild(false)
, m_isFullLayout(fullLayout)
, m_containsBRWithClear(false)
@@ -70,6 +71,9 @@ public:
bool endLineMatched() const { return m_endLineMatched; }
void setEndLineMatched(bool endLineMatched) { m_endLineMatched = endLineMatched; }
+ bool checkForFloatsFromLastLine() const { return m_checkForFloatsFromLastLine; }
+ void setCheckForFloatsFromLastLine(bool check) { m_checkForFloatsFromLastLine = check; }
+
bool hasInlineChild() const { return m_hasInlineChild; }
void setHasInlineChild(bool hasInlineChild) { m_hasInlineChild = hasInlineChild; }
@@ -106,6 +110,7 @@ private:
unsigned m_floatIndex;
LayoutUnit m_endLineLogicalTop;
bool m_endLineMatched;
+ bool m_checkForFloatsFromLastLine;
// Used as a performance optimization to avoid doing a full paint invalidation when our floats
// change but we don't have any inline children.
bool m_hasInlineChild;
« no previous file with comments | « Source/core/layout/LayoutBlockFlowLine.cpp ('k') | Source/core/layout/line/TrailingFloatsRootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698