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

Unified Diff: sky/engine/core/rendering/RenderObject.h

Issue 748943002: remove childrenInline & setChildrenInline (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: moar Created 6 years, 1 month 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
Index: sky/engine/core/rendering/RenderObject.h
diff --git a/sky/engine/core/rendering/RenderObject.h b/sky/engine/core/rendering/RenderObject.h
index 1b75379640a3baa87b99f5cc315a4f73bbaca662..fc4f2c60940d96608f4c32f1924f1d072a8b371d 100644
--- a/sky/engine/core/rendering/RenderObject.h
+++ b/sky/engine/core/rendering/RenderObject.h
@@ -332,10 +332,6 @@ public:
bool everHadLayout() const { return m_bitfields.everHadLayout(); }
- // FIXME(sky): Remove this concept.
- bool childrenInline() const { return isRenderParagraph(); }
- void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); }
-
bool alwaysCreateLineBoxesForRenderInline() const
{
ASSERT(isRenderInline());
@@ -989,7 +985,6 @@ private:
, m_everHadLayout(false)
, m_ancestorLineBoxDirty(false)
, m_layoutDidGetCalled(false)
- , m_childrenInline(false)
, m_alwaysCreateLineBoxesForRenderInline(false)
, m_positionedState(IsStaticallyPositioned)
, m_selectionState(SelectionNone)
@@ -1029,9 +1024,6 @@ private:
ADD_BOOLEAN_BITFIELD(layoutDidGetCalled, LayoutDidGetCalled);
- // from RenderBlock
- ADD_BOOLEAN_BITFIELD(childrenInline, ChildrenInline);
-
// from RenderInline
ADD_BOOLEAN_BITFIELD(alwaysCreateLineBoxesForRenderInline, AlwaysCreateLineBoxesForRenderInline);

Powered by Google App Engine
This is Rietveld 408576698