Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
RenderSVGResource shouldn't trigger relayout during render tree teard…
…own.

<https://webkit.org/b/120689>
<rdar://problem/14908967>

Reviewed by Antti Koivisto.

The new assertion in FrameView::scheduleRelayoutOfSubtree() caught a fish!
We were doing some unnecessary relayout scheduling while tearing down SVG
resource renderers.

* rendering/svg/RenderSVGResource.cpp:
(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):

Canonical link: https://commits.webkit.org/138670@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Andreas Kling committed Sep 4, 2013
1 parent 6d533bf commit 0e1364c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
2013-09-04 Andreas Kling <akling@apple.com>

RenderSVGResource shouldn't trigger relayout during render tree teardown.
<https://webkit.org/b/120689>
<rdar://problem/14908967>

Reviewed by Antti Koivisto.

The new assertion in FrameView::scheduleRelayoutOfSubtree() caught a fish!
We were doing some unnecessary relayout scheduling while tearing down SVG
resource renderers.

* rendering/svg/RenderSVGResource.cpp:
(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):

2013-09-04 Daniel Bates <dabates@apple.com>

[iOS] Fix the build following <http://trac.webkit.org/changeset/154903>
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/rendering/svg/RenderSVGResource.cpp
Expand Up @@ -194,7 +194,7 @@ void RenderSVGResource::markForLayoutAndParentResourceInvalidation(RenderObject*
ASSERT(object);
ASSERT(object->node());

if (needsLayout)
if (needsLayout && !object->documentBeingDestroyed())
object->setNeedsLayout(true);

removeFromCacheAndInvalidateDependencies(object, needsLayout);
Expand Down

0 comments on commit 0e1364c

Please sign in to comment.