Title: [155055] trunk/Source/WebCore
Revision
155055
Author
[email protected]
Date
2013-09-04 11:50:54 -0700 (Wed, 04 Sep 2013)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (155054 => 155055)


--- trunk/Source/WebCore/ChangeLog	2013-09-04 18:46:20 UTC (rev 155054)
+++ trunk/Source/WebCore/ChangeLog	2013-09-04 18:50:54 UTC (rev 155055)
@@ -1,3 +1,18 @@
+2013-09-04  Andreas Kling  <[email protected]>
+
+        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  <[email protected]>
 
         [iOS] Fix the build following <http://trac.webkit.org/changeset/154903>

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (155054 => 155055)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp	2013-09-04 18:46:20 UTC (rev 155054)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp	2013-09-04 18:50:54 UTC (rev 155055)
@@ -194,7 +194,7 @@
     ASSERT(object);
     ASSERT(object->node());
 
-    if (needsLayout)
+    if (needsLayout && !object->documentBeingDestroyed())
         object->setNeedsLayout(true);
 
     removeFromCacheAndInvalidateDependencies(object, needsLayout);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to