Source/WebCore/rendering/RenderButton.cpp - Issue 10264007: Merge 113252

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

Issue 10264007: Merge 113252 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 8 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/RenderButton.cpp

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

--- Source/WebCore/rendering/RenderButton.cpp (revision 115614)

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

@@ -49,8 +49,7 @@

if (!m_inner) {

// Create an anonymous block.

ASSERT(!firstChild());

- bool isFlexibleBox = style()->display() == BOX || style()->display() == INLINE_BOX;

- m_inner = createAnonymousBlock(isFlexibleBox);

+ m_inner = createAnonymousBlock(style()->display());

setupInnerStyle(m_inner->style());

RenderDeprecatedFlexibleBox::addChild(m_inner);

}

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