Source/core/rendering/LayoutState.cpp - Issue 178473024: Convert some Shape code to use references

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/LayoutState.cpp

Issue 178473024: Convert some Shape code to use references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: rebased patch Created 6 years, 10 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:

Index: Source/core/rendering/LayoutState.cpp

diff --git a/Source/core/rendering/LayoutState.cpp b/Source/core/rendering/LayoutState.cpp

index 667d4efa2b0998ae2a808f8dc48fa0dba412f080..e9cb94b10e2472b672b4caf5e24b973d10338639 100644

--- a/Source/core/rendering/LayoutState.cpp

+++ b/Source/core/rendering/LayoutState.cpp

@@ -107,7 +107,7 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox& renderer, const LayoutSiz

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()))

+ if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock.allowsShapeInsideInfoSharing(&m_next->m_shapeInsideInfo->owner()))

m_shapeInsideInfo = m_next->m_shapeInsideInfo;

}

« no previous file with comments | « Source/core/rendering/FloatingObjects.cpp ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »