Source/WebCore/rendering/RenderBox.cpp - Issue 7811011: Revert 94131 - Merge 94107

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

Issue 7811011: Revert 94131 - Merge 94107 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 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/RenderBox.cpp

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

--- Source/WebCore/rendering/RenderBox.cpp (revision 94139)

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

@@ -200,11 +200,6 @@

if (style() && (style()->logicalHeight().isPercent() || style()->logicalMinHeight().isPercent() || style()->logicalMaxHeight().isPercent()))

RenderBlock::removePercentHeightDescendant(this);

- // If this renderer is owning renderer for the frameview's custom scrollbars,

- // we need to clear it from the scrollbar. See webkit bug 64737.

- if (style() && style()->hasPseudoStyle(SCROLLBAR) && frame() && frame()->view())

- frame()->view()->clearOwningRendererForCustomScrollbars(this);

// If the following assertion fails, logicalHeight()/logicalMinHeight()/

// logicalMaxHeight() values are changed from a percent value to a non-percent

// value during laying out. It causes a use-after-free bug.

« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/rendering/RenderScrollbar.cpp » ('j') | no next file with comments »