Source/WebCore/rendering/RenderBlock.cpp - Issue 10871074: Merge 124556

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/WebCore/rendering/RenderBlock.cpp

Issue 10871074: Merge 124556 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 4 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/WebCore/rendering/RenderBlock.cpp

===================================================================

--- Source/WebCore/rendering/RenderBlock.cpp (revision 126630)

+++ Source/WebCore/rendering/RenderBlock.cpp (working copy)

@@ -1853,13 +1853,9 @@

// Check if this node is allowed to run-in. E.g. <select> expects its renderer to

// be a RenderListBox or RenderMenuList, and hence cannot be a RenderInline run-in.

- Node* runInNode = runIn->node();

- if (runInNode && runInNode->hasTagName(selectTag))

+ if (!runIn->canBeReplacedWithInlineRunIn())

return;

- if (runInNode && runInNode->hasTagName(progressTag))

- return;

RenderObject* curr = runIn->nextSibling();

if (!curr || !curr->isRenderBlock() || !curr->childrenInline())

return;