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

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: cr comments 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
« no previous file with comments | « sky/engine/core/rendering/RenderInline.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d5a9eec7e095cc6d3fee480eb2e00495a1584b83 100644
--- a/sky/engine/core/rendering/RenderObject.h
+++ b/sky/engine/core/rendering/RenderObject.h
@@ -264,11 +264,6 @@ public:
// children.
virtual RenderBlock* firstLineBlock() const;
- // Called when an object that was floating or positioned becomes a normal flow object
- // again. We have to make sure the render tree updates as needed to accommodate the new
- // normal flow object.
- void handleDynamicFloatPositionChange();
-
// RenderObject tree manipulation
//////////////////////////////////////////
virtual bool canHaveChildren() const { return virtualChildren(); }
@@ -332,10 +327,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 +980,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 +1019,6 @@ private:
ADD_BOOLEAN_BITFIELD(layoutDidGetCalled, LayoutDidGetCalled);
- // from RenderBlock
- ADD_BOOLEAN_BITFIELD(childrenInline, ChildrenInline);
-
// from RenderInline
ADD_BOOLEAN_BITFIELD(alwaysCreateLineBoxesForRenderInline, AlwaysCreateLineBoxesForRenderInline);
« no previous file with comments | « sky/engine/core/rendering/RenderInline.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698