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

Unified Diff: sky/engine/core/rendering/line/LineLayoutState.h

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block
Patch Set: Remove unused float-related code instead of moving it. Created 5 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 | « sky/engine/core/rendering/line/LineBreaker.h ('k') | sky/engine/core/rendering/line/LineWidth.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/line/LineLayoutState.h
diff --git a/sky/engine/core/rendering/line/LineLayoutState.h b/sky/engine/core/rendering/line/LineLayoutState.h
index 8ae1b79771991ab85ec6f9c1d5e66505a70a9ee5..f4f04d871a1767c0f9950c2fc798050c844dfba0 100644
--- a/sky/engine/core/rendering/line/LineLayoutState.h
+++ b/sky/engine/core/rendering/line/LineLayoutState.h
@@ -24,7 +24,7 @@
#ifndef SKY_ENGINE_CORE_RENDERING_LINE_LINELAYOUTSTATE_H_
#define SKY_ENGINE_CORE_RENDERING_LINE_LINELAYOUTSTATE_H_
-#include "sky/engine/core/rendering/RenderBlockFlow.h"
+#include "sky/engine/core/rendering/RenderParagraph.h"
#include "sky/engine/platform/geometry/LayoutRect.h"
namespace blink {
@@ -34,12 +34,9 @@ namespace blink {
class LineLayoutState {
public:
LineLayoutState(bool fullLayout)
- : m_lastFloat(0)
- , m_endLine(0)
- , m_floatIndex(0)
+ : m_endLine(0)
, m_endLineLogicalTop(0)
, m_endLineMatched(false)
- , m_checkForFloatsFromLastLine(false)
, m_hasInlineChild(false)
, m_isFullLayout(fullLayout)
, m_adjustedLogicalLineTop(0)
@@ -51,9 +48,6 @@ 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; }
@@ -66,26 +60,15 @@ public:
RootInlineBox* endLine() const { return m_endLine; }
void setEndLine(RootInlineBox* line) { m_endLine = line; }
- FloatingObject* lastFloat() const { return m_lastFloat; }
- void setLastFloat(FloatingObject* lastFloat) { m_lastFloat = lastFloat; }
-
- Vector<RenderBlockFlow::FloatWithRect>& floats() { return m_floats; }
-
- unsigned floatIndex() const { return m_floatIndex; }
- void setFloatIndex(unsigned floatIndex) { m_floatIndex = floatIndex; }
-
LayoutUnit adjustedLogicalLineTop() const { return m_adjustedLogicalLineTop; }
void setAdjustedLogicalLineTop(LayoutUnit value) { m_adjustedLogicalLineTop = value; }
private:
- Vector<RenderBlockFlow::FloatWithRect> m_floats;
- FloatingObject* m_lastFloat;
RootInlineBox* m_endLine;
LineInfo m_lineInfo;
- unsigned m_floatIndex;
LayoutUnit m_endLineLogicalTop;
bool m_endLineMatched;
- bool m_checkForFloatsFromLastLine;
+ // FIXME(sky): Do we still need this?
// 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 | « sky/engine/core/rendering/line/LineBreaker.h ('k') | sky/engine/core/rendering/line/LineWidth.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698