Title: [195268] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 195268
- Author
- [email protected]
- Date
- 2016-01-19 01:04:02 -0800 (Tue, 19 Jan 2016)
Log Message
Merge r195072 - 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: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195267 => 195268)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 09:02:16 UTC (rev 195267)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 09:04:02 UTC (rev 195268)
@@ -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: releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/TextIterator.cpp (195267 => 195268)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/TextIterator.cpp 2016-01-19 09:02:16 UTC (rev 195267)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/TextIterator.cpp 2016-01-19 09:04:02 UTC (rev 195268)
@@ -1393,7 +1393,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
