Diff
Modified: trunk/LayoutTests/ChangeLog (202058 => 202059)
--- trunk/LayoutTests/ChangeLog 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/LayoutTests/ChangeLog 2016-06-14 20:15:47 UTC (rev 202059)
@@ -1,3 +1,17 @@
+2016-06-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202057.
+ https://bugs.webkit.org/show_bug.cgi?id=158749
+
+ This change broke the Windows build. (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Honor bidi unicode codepoints"
+ https://bugs.webkit.org/show_bug.cgi?id=149170
+ http://trac.webkit.org/changeset/202057
+
2016-06-14 Myles C. Maxfield <[email protected]>
Honor bidi unicode codepoints
Deleted: trunk/LayoutTests/fast/text/isolate-ignore-expected.html (202058 => 202059)
--- trunk/LayoutTests/fast/text/isolate-ignore-expected.html 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/LayoutTests/fast/text/isolate-ignore-expected.html 2016-06-14 20:15:47 UTC (rev 202059)
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-This test makes sure that isolate codepoints are ignored.
-<div dir="ltr">עברית English עברית</div>
-<div dir="ltr">English עברית English</div>
-<div dir="rtl">עברית English עברית</div>
-<div dir="rtl">English עברית English</div>
-<div dir="ltr">עברית English עברית</div>
-<div dir="ltr">English עברית English</div>
-<div dir="rtl">עברית English עברית</div>
-<div dir="rtl">English עברית English</div>
-<div dir="ltr">עברית English עברית</div>
-<div dir="ltr">English עברית English</div>
-<div dir="rtl">עברית English עברית</div>
-<div dir="rtl">English עברית English</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/text/isolate-ignore.html (202058 => 202059)
--- trunk/LayoutTests/fast/text/isolate-ignore.html 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/LayoutTests/fast/text/isolate-ignore.html 2016-06-14 20:15:47 UTC (rev 202059)
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-This test makes sure that isolate codepoints are ignored.
-<div dir="ltr">עברית ⁨English⁩ עברית</div>
-<div dir="ltr">English ⁨עברית⁩ English</div>
-<div dir="rtl">עברית ⁨English⁩ עברית</div>
-<div dir="rtl">English ⁨עברית⁩ English</div>
-<div dir="ltr">עברית ⁦English⁩ עברית</div>
-<div dir="ltr">English ⁦עברית⁩ English</div>
-<div dir="rtl">עברית ⁦English⁩ עברית</div>
-<div dir="rtl">English ⁦עברית⁩ English</div>
-<div dir="ltr">עברית ⁧English⁩ עברית</div>
-<div dir="ltr">English ⁧עברית⁩ English</div>
-<div dir="rtl">עברית ⁧English⁩ עברית</div>
-<div dir="rtl">English ⁧עברית⁩ English</div>
-</body>
-</html>
Modified: trunk/Source/WTF/ChangeLog (202058 => 202059)
--- trunk/Source/WTF/ChangeLog 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/Source/WTF/ChangeLog 2016-06-14 20:15:47 UTC (rev 202059)
@@ -1,3 +1,17 @@
+2016-06-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202057.
+ https://bugs.webkit.org/show_bug.cgi?id=158749
+
+ This change broke the Windows build. (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Honor bidi unicode codepoints"
+ https://bugs.webkit.org/show_bug.cgi?id=149170
+ http://trac.webkit.org/changeset/202057
+
2016-06-14 Myles C. Maxfield <[email protected]>
Honor bidi unicode codepoints
Modified: trunk/Source/WTF/wtf/unicode/CharacterNames.h (202058 => 202059)
--- trunk/Source/WTF/wtf/unicode/CharacterNames.h 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/Source/WTF/wtf/unicode/CharacterNames.h 2016-06-14 20:15:47 UTC (rev 202059)
@@ -48,7 +48,6 @@
const UChar carriageReturn = 0x000D;
const UChar ethiopicPrefaceColon = 0x1366;
const UChar ethiopicWordspace = 0x1361;
-const UChar firstStrongIsolate = 0x2068;
const UChar fisheye = 0x25C9;
const UChar quotationMark = 0x0022;
const UChar hebrewPunctuationGeresh = 0x05F3;
@@ -63,7 +62,6 @@
const UChar leftDoubleQuotationMark = 0x201C;
const UChar leftSingleQuotationMark = 0x2018;
const UChar leftToRightEmbed = 0x202A;
-const UChar leftToRightIsolate = 0x2066;
const UChar leftToRightMark = 0x200E;
const UChar leftToRightOverride = 0x202D;
const UChar minusSign = 0x2212;
@@ -72,12 +70,10 @@
const UChar noBreakSpace = 0x00A0;
const UChar objectReplacementCharacter = 0xFFFC;
const UChar popDirectionalFormatting = 0x202C;
-const UChar popDirectionalIsolate = 0x2069;
const UChar replacementCharacter = 0xFFFD;
const UChar rightDoubleQuotationMark = 0x201D;
const UChar rightSingleQuotationMark = 0x2019;
const UChar rightToLeftEmbed = 0x202B;
-const UChar rightToLeftIsolate = 0x2067;
const UChar rightToLeftMark = 0x200F;
const UChar rightToLeftOverride = 0x202E;
const UChar sesameDot = 0xFE45;
@@ -111,7 +107,6 @@
using WTF::Unicode::carriageReturn;
using WTF::Unicode::ethiopicPrefaceColon;
using WTF::Unicode::ethiopicWordspace;
-using WTF::Unicode::firstStrongIsolate;
using WTF::Unicode::fisheye;
using WTF::Unicode::hebrewPunctuationGeresh;
using WTF::Unicode::hebrewPunctuationGershayim;
@@ -125,7 +120,6 @@
using WTF::Unicode::leftDoubleQuotationMark;
using WTF::Unicode::leftSingleQuotationMark;
using WTF::Unicode::leftToRightEmbed;
-using WTF::Unicode::leftToRightIsolate;
using WTF::Unicode::leftToRightMark;
using WTF::Unicode::leftToRightOverride;
using WTF::Unicode::minusSign;
@@ -134,12 +128,10 @@
using WTF::Unicode::noBreakSpace;
using WTF::Unicode::objectReplacementCharacter;
using WTF::Unicode::popDirectionalFormatting;
-using WTF::Unicode::popDirectionalIsolate;
using WTF::Unicode::replacementCharacter;
using WTF::Unicode::rightDoubleQuotationMark;
using WTF::Unicode::rightSingleQuotationMark;
using WTF::Unicode::rightToLeftEmbed;
-using WTF::Unicode::rightToLeftIsolate;
using WTF::Unicode::rightToLeftMark;
using WTF::Unicode::rightToLeftOverride;
using WTF::Unicode::sesameDot;
Modified: trunk/Source/WebCore/ChangeLog (202058 => 202059)
--- trunk/Source/WebCore/ChangeLog 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/Source/WebCore/ChangeLog 2016-06-14 20:15:47 UTC (rev 202059)
@@ -1,3 +1,17 @@
+2016-06-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202057.
+ https://bugs.webkit.org/show_bug.cgi?id=158749
+
+ This change broke the Windows build. (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Honor bidi unicode codepoints"
+ https://bugs.webkit.org/show_bug.cgi?id=149170
+ http://trac.webkit.org/changeset/202057
+
2016-06-14 Myles C. Maxfield <[email protected]>
Honor bidi unicode codepoints
Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (202058 => 202059)
--- trunk/Source/WebCore/platform/graphics/Font.cpp 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2016-06-14 20:15:47 UTC (rev 202059)
@@ -185,13 +185,9 @@
buffer[rightToLeftEmbed - start] = zeroWidthSpace;
buffer[leftToRightOverride - start] = zeroWidthSpace;
buffer[rightToLeftOverride - start] = zeroWidthSpace;
- buffer[leftToRightIsolate - start] = zeroWidthSpace;
- buffer[rightToLeftIsolate - start] = zeroWidthSpace;
buffer[zeroWidthNonJoiner - start] = zeroWidthSpace;
buffer[zeroWidthJoiner - start] = zeroWidthSpace;
buffer[popDirectionalFormatting - start] = zeroWidthSpace;
- buffer[popDirectionalIsolate - start] = zeroWidthSpace;
- buffer[firstStrongIsolate - start] = zeroWidthSpace;
} else if (start == (objectReplacementCharacter & ~(GlyphPage::size - 1))) {
// Object replacement character must not render at all.
buffer[objectReplacementCharacter - start] = zeroWidthSpace;
Modified: trunk/Source/WebCore/platform/text/BidiResolver.h (202058 => 202059)
--- trunk/Source/WebCore/platform/text/BidiResolver.h 2016-06-14 19:01:58 UTC (rev 202058)
+++ trunk/Source/WebCore/platform/text/BidiResolver.h 2016-06-14 20:15:47 UTC (rev 202059)
@@ -632,7 +632,7 @@
// We ignore all character directionality while in unicode-bidi: isolate spans.
// We'll handle ordering the isolated characters in a second pass.
- if (inIsolate() || dirCurrent == U_FIRST_STRONG_ISOLATE || dirCurrent == U_LEFT_TO_RIGHT_ISOLATE || dirCurrent == U_RIGHT_TO_LEFT_ISOLATE || dirCurrent == U_POP_DIRECTIONAL_ISOLATE)
+ if (inIsolate())
dirCurrent = U_OTHER_NEUTRAL;
ASSERT(m_status.eor != U_OTHER_NEUTRAL || m_eor.atEnd());
