Title: [204774] releases/WebKitGTK/webkit-2.12
- Revision
- 204774
- Author
- [email protected]
- Date
- 2016-08-23 00:17:11 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r202251 - Set the end position on the placeholder BidiRun properly.
https://bugs.webkit.org/show_bug.cgi?id=158958
Reviewed by Myles C. Maxfield.
rdar://problem/26609266
The second paramenter for BidiRun indicates the end position and not the length of the run.
This was regressed at r102875 where only the start position was changed from 0 to pos.
Source/WebCore:
Test: fast/text/international/bidi-style-in-isolate-crash.html
* rendering/InlineIterator.h:
(WebCore::addPlaceholderRunForIsolatedInline):
LayoutTests:
* fast/text/international/bidi-style-in-isolate-crash-expected.txt: Added.
* fast/text/international/bidi-style-in-isolate-crash.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204773 => 204774)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 07:12:54 UTC (rev 204773)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 07:17:11 UTC (rev 204774)
@@ -1,3 +1,17 @@
+2016-06-20 Zalan Bujtas <[email protected]>
+
+ Set the end position on the placeholder BidiRun properly.
+ https://bugs.webkit.org/show_bug.cgi?id=158958
+
+ Reviewed by Myles C. Maxfield.
+ rdar://problem/26609266
+
+ The second paramenter for BidiRun indicates the end position and not the length of the run.
+ This was regressed at r102875 where only the start position was changed from 0 to pos.
+
+ * fast/text/international/bidi-style-in-isolate-crash-expected.txt: Added.
+ * fast/text/international/bidi-style-in-isolate-crash.html: Added.
+
2016-06-16 Zalan Bujtas <[email protected]>
[New Block-Inside-Inline Model] Do not attempt to re-run margin collapsing on the block sequence.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/text/international/bidi-style-in-isolate-crash-expected.txt (0 => 204774)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/text/international/bidi-style-in-isolate-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/text/international/bidi-style-in-isolate-crash-expected.txt 2016-08-23 07:17:11 UTC (rev 204774)
@@ -0,0 +1,2 @@
+PASS if no crash or ASSERT. f
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/text/international/bidi-style-in-isolate-crash.html (0 => 204774)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/text/international/bidi-style-in-isolate-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/text/international/bidi-style-in-isolate-crash.html 2016-08-23 07:17:11 UTC (rev 204774)
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can layout isolates properly</title>
+<style>
+body {
+ width: 10px;
+ text-align: right;
+}
+q, br {
+ unicode-bidi: -webkit-isolate-override;
+}
+</style>
+</head>
+<body>
+PASS if no crash or ASSERT.
+<q>
+f
+ f<br></q>
+</body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</html>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204773 => 204774)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 07:12:54 UTC (rev 204773)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 07:17:11 UTC (rev 204774)
@@ -1,3 +1,19 @@
+2016-06-20 Zalan Bujtas <[email protected]>
+
+ Set the end position on the placeholder BidiRun properly.
+ https://bugs.webkit.org/show_bug.cgi?id=158958
+
+ Reviewed by Myles C. Maxfield.
+ rdar://problem/26609266
+
+ The second paramenter for BidiRun indicates the end position and not the length of the run.
+ This was regressed at r102875 where only the start position was changed from 0 to pos.
+
+ Test: fast/text/international/bidi-style-in-isolate-crash.html
+
+ * rendering/InlineIterator.h:
+ (WebCore::addPlaceholderRunForIsolatedInline):
+
2016-06-16 Zalan Bujtas <[email protected]>
[New Block-Inside-Inline Model] Do not attempt to re-run margin collapsing on the block sequence.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/InlineIterator.h (204773 => 204774)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/InlineIterator.h 2016-08-23 07:12:54 UTC (rev 204773)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/InlineIterator.h 2016-08-23 07:17:11 UTC (rev 204774)
@@ -492,7 +492,7 @@
// of BidiResolver which knows nothing about RenderObjects.
static inline void addPlaceholderRunForIsolatedInline(InlineBidiResolver& resolver, RenderObject& obj, unsigned pos, RenderElement& root)
{
- BidiRun* isolatedRun = new BidiRun(pos, 0, obj, resolver.context(), resolver.dir());
+ BidiRun* isolatedRun = new BidiRun(pos, pos, obj, resolver.context(), resolver.dir());
resolver.runs().addRun(isolatedRun);
// FIXME: isolatedRuns() could be a hash of object->run and then we could cheaply
// ASSERT here that we didn't create multiple objects for the same inline.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
