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

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

Issue 729693003: First step at getting rid of anonymous blocks and continuations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Address review 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/RenderBox.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 f80848e90fd853b9870aeec2da316d0747efb409..7ee9de9d7a1810e6bafc733f5140d30033779522 100644
--- a/sky/engine/core/rendering/RenderObject.h
+++ b/sky/engine/core/rendering/RenderObject.h
@@ -326,6 +326,7 @@ public:
virtual bool isMedia() const { return false; }
virtual bool isRenderBlock() const { return false; }
virtual bool isRenderBlockFlow() const { return false; }
+ virtual bool isRenderParagraph() const { return false; }
virtual bool isRenderImage() const { return false; }
virtual bool isRenderInline() const { return false; }
virtual bool isRenderView() const { return false; }
@@ -335,7 +336,8 @@ public:
bool everHadLayout() const { return m_bitfields.everHadLayout(); }
- bool childrenInline() const { return m_bitfields.childrenInline(); }
+ // FIXME(sky): Remove this concept.
+ bool childrenInline() const { return isRenderParagraph(); }
void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); }
bool alwaysCreateLineBoxesForRenderInline() const
@@ -400,7 +402,7 @@ public:
// This function is kept in sync with anonymous block creation conditions in
// RenderBlock::createAnonymousBlock(). This includes creating an anonymous
// RenderBlock having a BLOCK or BOX display. See https://bugs.webkit.org/show_bug.cgi?id=56709.
- return isAnonymous() && style()->display() == BLOCK && style()->styleType() == NOPSEUDO && isRenderBlock();
+ return isAnonymous() && style()->display() == PARAGRAPH;
}
bool isElementContinuation() const { return node() && node()->renderer() != this; }
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698