Source/core/layout/line/RootInlineBox.cpp - Issue 926193003: Move rendering/RenderBox to layout/LayoutBox.

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/layout/line/RootInlineBox.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 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/layout/line/RootInlineBox.cpp

diff --git a/Source/core/layout/line/RootInlineBox.cpp b/Source/core/layout/line/RootInlineBox.cpp

index 3de0b2e6f032f4e5cb9ace7da5d9853ecb5475fb..87f5c1930c3e2355065ea6c78273bfcf0704fd6d 100644

--- a/Source/core/layout/line/RootInlineBox.cpp

+++ b/Source/core/layout/line/RootInlineBox.cpp

@@ -527,7 +527,7 @@ void RootInlineBox::setLineBreakInfo(LayoutObject* obj, unsigned breakPos, const

// This has security implications because if the LayoutObject does not

// point to at least one line box, then that RenderInline can be deleted

// later without resetting the lineBreakObj, leading to use-after-free.

- ASSERT_WITH_SECURITY_IMPLICATION(!obj || obj->isText() || !(obj->isRenderInline() && obj->isBox() && !toRenderBox(obj)->inlineBoxWrapper()));

+ ASSERT_WITH_SECURITY_IMPLICATION(!obj || obj->isText() || !(obj->isRenderInline() && obj->isBox() && !toLayoutBox(obj)->inlineBoxWrapper()));

m_lineBreakObj = obj;

m_lineBreakPos = breakPos;