Source/WebCore/rendering/RenderObject.cpp - Issue 10538032: Merge 118542

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

Issue 10538032: Merge 118542 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: Source/WebCore/rendering/RenderObject.cpp

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

--- Source/WebCore/rendering/RenderObject.cpp (revision 119620)

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

@@ -220,7 +220,6 @@

RenderObject::~RenderObject()

{

- ASSERT(!node() || documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);

#ifndef NDEBUG

ASSERT(!m_hasAXObject);

renderObjectCounter.decrement();

@@ -2269,7 +2268,7 @@

inline void RenderObject::clearLayoutRootIfNeeded() const

{

- if (node() && !documentBeingDestroyed() && frame()) {

+ if (!documentBeingDestroyed() && frame()) {

if (FrameView* view = frame()->view()) {

if (view->layoutRoot() == this) {

ASSERT_NOT_REACHED();

« no previous file with comments | « no previous file | no next file » | no next file with comments »