Changeset 186560 in webkit

Timestamp:

Jul 8, 2015, 6:03:55 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r184653. rdar://problem/21716528

Location:

branches/safari-600.1.4.17-branch

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/BreakingContextInlineHeaders.h (modified) (1 diff)
• Source/WebCore/rendering/line/LineBreaker.cpp (modified) (1 diff)

branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-07-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r184653. rdar://problem/21716528
+
+    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-07-08  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r184653. rdar://problem/21716528
+
+    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-07-08  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-600.1.4.17-branch/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h

@@ -599 +599 @@
         commitLineBreakAtCurrentWidth(m_current.renderer());
 
-    if (renderText->style().hasTextCombine() && m_current.renderer()->isCombineText() && !toRenderCombineText(*m_current.renderer()).isCombined()) {
+    if (renderText->style().hasTextCombine() && m_current.renderer()->isCombineText()) {
         RenderCombineText& combineRenderer = toRenderCombineText(*m_current.renderer());
         combineRenderer.combineText();

branches/safari-600.1.4.17-branch/Source/WebCore/rendering/line/LineBreaker.cpp

@@ -68 +68 @@
         } else if (object.isFloating())
             m_block.positionNewFloatOnLine(m_block.insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
-        else if (object.isText() && object.style().hasTextCombine() && object.isCombineText() && !toRenderCombineText(object).isCombined()) {
+        else if (object.style().hasTextCombine() && object.isCombineText()) {
             toRenderCombineText(object).combineText();
             if (toRenderCombineText(object).isCombined())