Changeset 184653 in webkit

Timestamp:

May 20, 2015, 1:34:40 PM (10 years ago)

Author:

Antti Koivisto

Message:

Assertion failure in WebCore::BidiRun::BidiRun()
​https://bugs.webkit.org/show_bug.cgi?id=145203
rdar://problem/20958973

Reviewed by Andreas Kling.

Source/WebCore:

Test: fast/text/text-combine-crash.html

• rendering/line/BreakingContext.h:

(WebCore::BreakingContext::handleText):

Renove !isCombined() check. RenderCombineText::combineText() doesn't
do any work unless needed and text may become uncombined too.

• rendering/line/LineBreaker.cpp:

(WebCore::LineBreaker::skipLeadingWhitespace):

Same here.

LayoutTests:

• fast/text/text-combine-crash-expected.txt: Added.
• fast/text/text-combine-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/text-combine-crash-expected.txt (added)
• LayoutTests/fast/text/text-combine-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/line/BreakingContext.h (modified) (1 diff)
• Source/WebCore/rendering/line/LineBreaker.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-20  Antti Koivisto  <antti@apple.com>
+
+        Assertion failure in WebCore::BidiRun::BidiRun()
+        https://bugs.webkit.org/show_bug.cgi?id=145203
+        rdar://problem/20958973
+
+        Reviewed by Andreas Kling.
+
+        * fast/text/text-combine-crash-expected.txt: Added.
+        * fast/text/text-combine-crash.html: Added.
+
 2015-05-20  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-20  Antti Koivisto  <antti@apple.com>
+
+        Assertion failure in WebCore::BidiRun::BidiRun()
+        https://bugs.webkit.org/show_bug.cgi?id=145203
+        rdar://problem/20958973
+
+        Reviewed by Andreas Kling.
+
+        Test: fast/text/text-combine-crash.html
+
+        * rendering/line/BreakingContext.h:
+        (WebCore::BreakingContext::handleText):
+
+            Renove !isCombined() check. RenderCombineText::combineText() doesn't
+            do any work unless needed and text may become uncombined too.
+
+        * rendering/line/LineBreaker.cpp:
+        (WebCore::LineBreaker::skipLeadingWhitespace):
+
+            Same here.
+
 2015-05-20  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/rendering/line/BreakingContext.h

@@ -716 +716 @@
         commitLineBreakAtCurrentWidth(renderText);
 
-    if (renderText.style().hasTextCombine() && is<RenderCombineText>(*m_current.renderer()) && !downcast<RenderCombineText>(*m_current.renderer()).isCombined()) {
+    if (renderText.style().hasTextCombine() && is<RenderCombineText>(*m_current.renderer())) {
         auto& combineRenderer = downcast<RenderCombineText>(*m_current.renderer());
         combineRenderer.combineText();

trunk/Source/WebCore/rendering/line/LineBreaker.cpp

@@ -68 +68 @@
         } else if (object.isFloating())
             m_block.positionNewFloatOnLine(m_block.insertFloatingObject(downcast<RenderBox>(object)), lastFloatFromPreviousLine, lineInfo, width);
-        else if (is<RenderCombineText>(object) && object.style().hasTextCombine() && !downcast<RenderCombineText>(object).isCombined()) {
+        else if (object.style().hasTextCombine() && is<RenderCombineText>(object)) {
             downcast<RenderCombineText>(object).combineText();
             if (downcast<RenderCombineText>(object).isCombined())