Source/core/rendering/RenderView.h - Issue 209443007: Remove shape-inside support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« Source/core/rendering/RenderBlockLineLayout.cpp ('K') | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/line/BreakingContext.cpp » ('j') | Source/core/rendering/line/BreakingContext.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderView.h

diff --git a/Source/core/rendering/RenderView.h b/Source/core/rendering/RenderView.h

index eb618fcf144201cad98edf250ade24bcaa2d21f3..3a9683551429e3da460ffd42f62ab513f2ec4bf9 100644

--- a/Source/core/rendering/RenderView.h

+++ b/Source/core/rendering/RenderView.h

@@ -218,8 +218,6 @@ private:

{

// We push LayoutState even if layoutState is disabled because it stores layoutDelta too.

if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock()

- || (renderer.isRenderBlock() && toRenderBlock(renderer).shapeInsideInfo())

- || (m_layoutState->shapeInsideInfo() && renderer.isRenderBlock() && !toRenderBlock(renderer).allowsShapeInsideInfoSharing(&m_layoutState->shapeInsideInfo()->owner()))

) {

pushLayoutStateForCurrentFlowThread(renderer);

m_layoutState = new LayoutState(m_layoutState, renderer, offset, pageHeight, pageHeightChanged, colInfo);