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

Unified Diff: Source/core/rendering/LayoutState.cpp

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Zoltan's comments Created 6 years, 9 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
Index: Source/core/rendering/LayoutState.cpp
diff --git a/Source/core/rendering/LayoutState.cpp b/Source/core/rendering/LayoutState.cpp
index e9cb94b10e2472b672b4caf5e24b973d10338639..f9599a26c024e02388f9e916563528b4584df982 100644
--- a/Source/core/rendering/LayoutState.cpp
+++ b/Source/core/rendering/LayoutState.cpp
@@ -36,7 +36,6 @@ namespace WebCore {
LayoutState::LayoutState(LayoutState* prev, RenderBox& renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged, ColumnInfo* columnInfo)
: m_columnInfo(columnInfo)
, m_next(prev)
- , m_shapeInsideInfo(0)
#ifndef NDEBUG
, m_renderer(&renderer)
#endif
@@ -104,13 +103,6 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox& renderer, const LayoutSiz
if (!m_columnInfo)
m_columnInfo = m_next->m_columnInfo;
- if (renderer.isRenderBlock()) {
- const RenderBlock& renderBlock = toRenderBlock(renderer);
- m_shapeInsideInfo = renderBlock.shapeInsideInfo();
- if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock.allowsShapeInsideInfoSharing(&m_next->m_shapeInsideInfo->owner()))
- m_shapeInsideInfo = m_next->m_shapeInsideInfo;
- }
-
if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) {
m_layoutDelta = m_next->m_layoutDelta;
#if !ASSERT_DISABLED
@@ -134,7 +126,6 @@ LayoutState::LayoutState(RenderObject& root)
#endif
, m_columnInfo(0)
, m_next(0)
- , m_shapeInsideInfo(0)
, m_pageLogicalHeight(0)
#ifndef NDEBUG
, m_renderer(&root)

Powered by Google App Engine
This is Rietveld 408576698