Title: [158729] trunk
- Revision
- 158729
- Author
- [email protected]
- Date
- 2013-11-06 00:05:09 -0800 (Wed, 06 Nov 2013)
Log Message
Assertion failure end < m_runCount in WebCore::BidiRunList<WebCore::BidiRun>::reverseRuns
https://bugs.webkit.org/show_bug.cgi?id=123863
Reviewed by Andreas Kling.
Source/WebCore:
Merge https://chromium.googlesource.com/chromium/blink/+/cbaa92c763a37d89eeabd01658e522219299290c
Test: fast/text/bidi-reverse-runs-crash.html
* platform/text/BidiResolver.h:
(WebCore::BidiResolver<Iterator, Run>::createBidiRunsForLine): Don't reverse the runs if there's
nothing to be reversed.
LayoutTests:
* fast/text/bidi-reverse-runs-crash-expected.txt: Added.
* fast/text/bidi-reverse-runs-crash.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (158728 => 158729)
--- trunk/LayoutTests/ChangeLog 2013-11-06 08:02:18 UTC (rev 158728)
+++ trunk/LayoutTests/ChangeLog 2013-11-06 08:05:09 UTC (rev 158729)
@@ -1,3 +1,13 @@
+2013-11-06 Ryosuke Niwa <[email protected]>
+
+ Assertion failure end < m_runCount in WebCore::BidiRunList<WebCore::BidiRun>::reverseRuns
+ https://bugs.webkit.org/show_bug.cgi?id=123863
+
+ Reviewed by Andreas Kling.
+
+ * fast/text/bidi-reverse-runs-crash-expected.txt: Added.
+ * fast/text/bidi-reverse-runs-crash.html: Added.
+
2013-11-05 Ryosuke Niwa <[email protected]>
Add more tests for formaction, formenctype, formmethod, formnovalidate, and formtarget attributes
Added: trunk/LayoutTests/fast/text/bidi-reverse-runs-crash-expected.txt (0 => 158729)
--- trunk/LayoutTests/fast/text/bidi-reverse-runs-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/bidi-reverse-runs-crash-expected.txt 2013-11-06 08:05:09 UTC (rev 158729)
@@ -0,0 +1,2 @@
+
+PASS if did not hit an assertion.
Added: trunk/LayoutTests/fast/text/bidi-reverse-runs-crash.html (0 => 158729)
--- trunk/LayoutTests/fast/text/bidi-reverse-runs-crash.html (rev 0)
+++ trunk/LayoutTests/fast/text/bidi-reverse-runs-crash.html 2013-11-06 08:05:09 UTC (rev 158729)
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html dir="RTL">
+<meta charset="ISO-8859-8">sdf
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<input>
+<i dir="">
+<tt dir="auto"></tt>
+<div>PASS if did not hit an assertion.</div>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (158728 => 158729)
--- trunk/Source/WebCore/ChangeLog 2013-11-06 08:02:18 UTC (rev 158728)
+++ trunk/Source/WebCore/ChangeLog 2013-11-06 08:05:09 UTC (rev 158729)
@@ -1,3 +1,18 @@
+2013-11-06 Ryosuke Niwa <[email protected]>
+
+ Assertion failure end < m_runCount in WebCore::BidiRunList<WebCore::BidiRun>::reverseRuns
+ https://bugs.webkit.org/show_bug.cgi?id=123863
+
+ Reviewed by Andreas Kling.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/cbaa92c763a37d89eeabd01658e522219299290c
+
+ Test: fast/text/bidi-reverse-runs-crash.html
+
+ * platform/text/BidiResolver.h:
+ (WebCore::BidiResolver<Iterator, Run>::createBidiRunsForLine): Don't reverse the runs if there's
+ nothing to be reversed.
+
2013-11-05 Ryosuke Niwa <[email protected]>
Address the review comment after r158724.
Modified: trunk/Source/WebCore/platform/text/BidiResolver.h (158728 => 158729)
--- trunk/Source/WebCore/platform/text/BidiResolver.h 2013-11-06 08:02:18 UTC (rev 158728)
+++ trunk/Source/WebCore/platform/text/BidiResolver.h 2013-11-06 08:05:09 UTC (rev 158729)
@@ -532,7 +532,7 @@
m_direction = override == VisualLeftToRightOverride ? U_LEFT_TO_RIGHT : U_RIGHT_TO_LEFT;
appendRun();
m_runs.setLogicallyLastRun(m_runs.lastRun());
- if (override == VisualRightToLeftOverride)
+ if (override == VisualRightToLeftOverride && m_runs.runCount())
m_runs.reverseRuns(0, m_runs.runCount() - 1);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
