Changeset 89183 in webkit

Timestamp:

Jun 17, 2011 7:38:45 PM (13 years ago)

Author:

jchaffraix@webkit.org

Message:

2011-06-17 Julien Chaffraix <​jchaffraix@webkit.org>

Reviewed by Darin Adler.

Assertion failure in SVGTextLayoutEngine constructor (!m_layoutAttributes.isEmpty())
​https://bugs.webkit.org/show_bug.cgi?id=62884

• svg/custom/assert-empty-layout-attributes-expected.txt: Added.
• svg/custom/assert-empty-layout-attributes.svg: Added.

2011-06-17 Julien Chaffraix <​jchaffraix@webkit.org>

Reviewed by Darin Adler.

Assertion failure in SVGTextLayoutEngine constructor (!m_layoutAttributes.isEmpty())
​https://bugs.webkit.org/show_bug.cgi?id=62884

Test: svg/custom/assert-empty-layout-attributes.svg

• rendering/svg/SVGRootInlineBox.cpp: (WebCore::SVGRootInlineBox::computePerCharacterLayoutInformation): Added a early return here. It is not needed to do the text layout algorithm if you don't have any layout information as your size is (0, 0) anyway.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/assert-empty-layout-attributes-expected.txt (added)
• LayoutTests/svg/custom/assert-empty-layout-attributes.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/SVGRootInlineBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-17  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Assertion failure in SVGTextLayoutEngine constructor (!m_layoutAttributes.isEmpty())
+        https://bugs.webkit.org/show_bug.cgi?id=62884
+
+        * svg/custom/assert-empty-layout-attributes-expected.txt: Added.
+        * svg/custom/assert-empty-layout-attributes.svg: Added.
+
 2011-06-17  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-17  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Assertion failure in SVGTextLayoutEngine constructor (!m_layoutAttributes.isEmpty())
+        https://bugs.webkit.org/show_bug.cgi?id=62884
+
+        Test: svg/custom/assert-empty-layout-attributes.svg
+
+        * rendering/svg/SVGRootInlineBox.cpp:
+        (WebCore::SVGRootInlineBox::computePerCharacterLayoutInformation): Added a early return here.
+        It is not needed to do the text layout algorithm if you don't have any layout information as
+        your size is (0, 0) anyway.
+
 2011-06-17  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -78 +78 @@
 
     Vector<SVGTextLayoutAttributes>& attributes = parentBlock->layoutAttributes();
+    if (attributes.isEmpty())
+        return;
+
     if (parentBlock->needsReordering())
         reorderValueLists(attributes);