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

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: 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..2e41955e50e83c79aeba5ea26c05ccfdc641a6d8 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 {
@@ -69,7 +69,7 @@ public:
FloatingObject* lastFloat() const { return m_lastFloat; }
void setLastFloat(FloatingObject* lastFloat) { m_lastFloat = lastFloat; }
- Vector<RenderBlockFlow::FloatWithRect>& floats() { return m_floats; }
+ Vector<RenderParagraph::FloatWithRect>& floats() { return m_floats; }
unsigned floatIndex() const { return m_floatIndex; }
void setFloatIndex(unsigned floatIndex) { m_floatIndex = floatIndex; }
@@ -78,7 +78,7 @@ public:
void setAdjustedLogicalLineTop(LayoutUnit value) { m_adjustedLogicalLineTop = value; }
private:
- Vector<RenderBlockFlow::FloatWithRect> m_floats;
+ Vector<RenderParagraph::FloatWithRect> m_floats;
eseidel 2015/04/07 19:01:22 Do these still exist?
ojan 2015/04/07 20:35:46 They don't appear to. Will Remove.
FloatingObject* m_lastFloat;
RootInlineBox* m_endLine;
LineInfo m_lineInfo;
« 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