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

Unified Diff: Source/core/rendering/RenderObject.h

Issue 688703003: [New Multicolumn] Add RenderMultiColumnSpannerSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: There won't ever be any intervening non-multicol fragmentation contexts. 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 | « Source/core/rendering/RenderMultiColumnSpannerSet.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.h
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
index 87e8fb5a04d6436db471d96de35cea8aacfd4559..38b749f4c6cdf899267eb0fd17d054af534a646d 100644
--- a/Source/core/rendering/RenderObject.h
+++ b/Source/core/rendering/RenderObject.h
@@ -357,6 +357,7 @@ public:
bool isRenderIFrame() const { return isOfType(RenderObjectRenderIFrame); }
bool isRenderImage() const { return isOfType(RenderObjectRenderImage); }
bool isRenderMultiColumnSet() const { return isOfType(RenderObjectRenderMultiColumnSet); }
+ bool isRenderMultiColumnSpannerSet() const { return isOfType(RenderObjectRenderMultiColumnSpannerSet); }
bool isRenderRegion() const { return isOfType(RenderObjectRenderRegion); }
bool isRenderScrollbarPart() const { return isOfType(RenderObjectRenderScrollbarPart); }
bool isRenderTableCol() const { return isOfType(RenderObjectRenderTableCol); }
@@ -507,7 +508,7 @@ public:
// RenderBlock::createAnonymousBlock(). This includes creating an anonymous
// RenderBlock having a BLOCK or BOX display. Other classes such as RenderTextFragment
// are not RenderBlocks and will return false. See https://bugs.webkit.org/show_bug.cgi?id=56709.
- return isAnonymous() && (style()->display() == BLOCK || style()->display() == BOX) && style()->styleType() == NOPSEUDO && isRenderBlock() && !isListMarker() && !isRenderFlowThread()
+ return isAnonymous() && (style()->display() == BLOCK || style()->display() == BOX) && style()->styleType() == NOPSEUDO && isRenderBlock() && !isListMarker() && !isRenderFlowThread() && !isRenderMultiColumnSet()
&& !isRenderFullScreen()
&& !isRenderFullScreenPlaceholder();
}
@@ -1083,6 +1084,7 @@ protected:
RenderObjectRenderImage,
RenderObjectRenderInline,
RenderObjectRenderMultiColumnSet,
+ RenderObjectRenderMultiColumnSpannerSet,
RenderObjectRenderPart,
RenderObjectRenderRegion,
RenderObjectRenderScrollbarPart,
« no previous file with comments | « Source/core/rendering/RenderMultiColumnSpannerSet.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698