Title: [195072] trunk/Source/WebCore
Revision
195072
Author
[email protected]
Date
2016-01-14 13:31:05 -0800 (Thu, 14 Jan 2016)

Log Message

imported/blink/editing/text-iterator/read-past-cloned-first-letter.html 
crashes
https://bugs.webkit.org/show_bug.cgi?id=153104
-and corresponding-
rdar://problem/24155631

Reviewed by Simon Fraser.

Though we merged the Blink test, we never merged Blink patch that fixed this 
bug. So this is a merge of https://github.com/ChromiumWebApps/blink/commit/5a0d23d4368c661f621364339fde66b41ef019e5
* editing/TextIterator.cpp:
(WebCore::SimplifiedBackwardsTextIterator::handleFirstLetter):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (195071 => 195072)


--- trunk/Source/WebCore/ChangeLog	2016-01-14 21:11:27 UTC (rev 195071)
+++ trunk/Source/WebCore/ChangeLog	2016-01-14 21:31:05 UTC (rev 195072)
@@ -1,3 +1,18 @@
+2016-01-14  Beth Dakin  <[email protected]>
+
+        imported/blink/editing/text-iterator/read-past-cloned-first-letter.html 
+        crashes
+        https://bugs.webkit.org/show_bug.cgi?id=153104
+        -and corresponding-
+        rdar://problem/24155631
+
+        Reviewed by Simon Fraser.
+
+        Though we merged the Blink test, we never merged Blink patch that fixed this 
+        bug. So this is a merge of https://github.com/ChromiumWebApps/blink/commit/5a0d23d4368c661f621364339fde66b41ef019e5
+        * editing/TextIterator.cpp:
+        (WebCore::SimplifiedBackwardsTextIterator::handleFirstLetter):
+
 2016-01-14  Zalan Bujtas  <[email protected]>
 
         ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout() in WebCore::FrameView::scheduleRelayoutOfSubtree

Modified: trunk/Source/WebCore/editing/TextIterator.cpp (195071 => 195072)


--- trunk/Source/WebCore/editing/TextIterator.cpp	2016-01-14 21:11:27 UTC (rev 195071)
+++ trunk/Source/WebCore/editing/TextIterator.cpp	2016-01-14 21:31:05 UTC (rev 195072)
@@ -1388,7 +1388,12 @@
 
     m_shouldHandleFirstLetter = false;
     offsetInNode = 0;
-    return firstRenderTextInFirstLetter(fragment.firstLetter());
+    RenderText* firstLetterRenderer = firstRenderTextInFirstLetter(fragment.firstLetter());
+
+    m_offset = firstLetterRenderer->caretMaxOffset();
+    m_offset += collapsedSpaceLength(*firstLetterRenderer, m_offset);
+
+    return firstLetterRenderer;
 }
 
 bool SimplifiedBackwardsTextIterator::handleReplacedElement()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to