Changeset 117790 in webkit

Timestamp:

May 21, 2012 9:12:10 AM (12 years ago)

Author:

schenney@chromium.org

Message:

[Chromium] REGRESSION: Assertion failure on svg/custom/acid3-test-77.html
​https://bugs.webkit.org/show_bug.cgi?id=86715

Reviewed by Nikolas Zimmermann.

Source/WebCore:

Calls to clear the text positioning elements in RenderSVGText must be
protected with a FontCachePurgeProtector so that fonts are not removed
before the SVG metrics are rebuilt. The protection must cover both the
cache clearing and the reconstruction calls.

Patch fixes existing tests.

• rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::subtreeChildWasAdded):
(WebCore::RenderSVGText::subtreeChildWasRemoved):
(WebCore::RenderSVGText::subtreeTextDidChange):
(WebCore::RenderSVGText::removeChild):

LayoutTests:

• platform/chromium/test_expectations.txt: Removing expectation for acid3 test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGText.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-21  Stephen Chenney  <schenney@chromium.org>
+
+        [Chromium] REGRESSION: Assertion failure on svg/custom/acid3-test-77.html
+        https://bugs.webkit.org/show_bug.cgi?id=86715
+
+        Reviewed by Nikolas Zimmermann.
+
+        * platform/chromium/test_expectations.txt: Removing expectation for acid3 test.
+
 2012-05-21  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3748 +3748 @@
 BUGWK86683 WIN LINUX DEBUG SLOW : inspector/profiler/heap-snapshot-summary-show-ranges.html = TEXT
 
-BUGWK86715 DEBUG : svg/custom/acid3-test-77.html = CRASH PASS
-
 BUGWK86907 WIN : http/tests/inspector/compiler-script-mapping.html = PASS TEXT
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Stephen Chenney  <schenney@chromium.org>
+
+        [Chromium] REGRESSION: Assertion failure on svg/custom/acid3-test-77.html
+        https://bugs.webkit.org/show_bug.cgi?id=86715
+
+        Reviewed by Nikolas Zimmermann.
+
+        Calls to clear the text positioning elements in RenderSVGText must be
+        protected with a FontCachePurgeProtector so that fonts are not removed
+        before the SVG metrics are rebuilt. The protection must cover both the
+        cache clearing and the reconstruction calls.
+
+        Patch fixes existing tests.
+
+        * rendering/svg/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::subtreeChildWasAdded):
+        (WebCore::RenderSVGText::subtreeChildWasRemoved):
+        (WebCore::RenderSVGText::subtreeTextDidChange):
+        (WebCore::RenderSVGText::removeChild):
+
 2012-05-21  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp

@@ -172 +172 @@
         return;
 
+    // Always protect the cache before clearing text positioning elements when the cache will subsequently be rebuilt.
+    FontCachePurgePreventer fontCachePurgePreventer;
+
     // The positioning elements cache doesn't include the new 'child' yet. Clear the
     // cache, as the next buildLayoutAttributesForTextRenderer() call rebuilds it.
@@ -307 +310 @@
     }
 
+    // Always protect the cache before clearing text positioning elements when the cache will subsequently be rebuilt.
+    FontCachePurgePreventer fontCachePurgePreventer;
+
     // The positioning elements cache depends on the size of each text renderer in the
     // subtree. If this changes, clear the cache. It's going to be rebuilt below.
@@ -527 +533 @@
     RenderSVGInlineText* text = toRenderSVGInlineText(child);
     Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
+    FontCachePurgePreventer fontCachePurgePreventer;
     subtreeChildWillBeRemoved(text, affectedAttributes);
     RenderSVGBlock::removeChild(child);