From c69567406e32521b504f4e20e1be75177a4d47ee Mon Sep 17 00:00:00 2001
From: Vee Satayamas <vsatayamas@gmail.com>
Date: Wed, 17 Aug 2016 18:57:19 +0700
Subject: [PATCH 1/2] Fix #12193 Servo displays upper level Thai character in
 wrong place.

---
 components/gfx/text/glyph.rs                         | 12 ++++++------
 .../html/word-break-break-all-007.htm.ini            |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 tests/wpt/metadata-css/css-text-3_dev/html/word-break-break-all-007.htm.ini

diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index 73a66ff19bf..ea5a009959e 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -254,10 +254,10 @@ impl<'a> DetailedGlyphStore {
 
         let i = self.detail_lookup.binary_search(&key)
             .expect("Invalid index not found in detailed glyph lookup table!");
-
-        assert!(i + (count as usize) <= self.detail_buffer.len());
+        let main_detail_offset = self.detail_lookup[i].detail_offset;
+        assert!(main_detail_offset + (count as usize) <= self.detail_buffer.len());
         // return a slice into the buffer
-        &self.detail_buffer[i .. i + count as usize]
+        &self.detail_buffer[main_detail_offset .. main_detail_offset + count as usize]
     }
 
     fn detailed_glyph_with_index(&'a self,
@@ -274,9 +274,9 @@ impl<'a> DetailedGlyphStore {
 
         let i = self.detail_lookup.binary_search(&key)
             .expect("Invalid index not found in detailed glyph lookup table!");
-
-        assert!(i + (detail_offset as usize) < self.detail_buffer.len());
-        &self.detail_buffer[i + (detail_offset as usize)]
+        let main_detail_offset = self.detail_lookup[i].detail_offset;
+        assert!(main_detail_offset + (detail_offset as usize) < self.detail_buffer.len());
+        &self.detail_buffer[main_detail_offset + (detail_offset as usize)]
     }
 
     fn ensure_sorted(&mut self) {
diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/word-break-break-all-007.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/word-break-break-all-007.htm.ini
deleted file mode 100644
index b2b3212943b..00000000000
--- a/tests/wpt/metadata-css/css-text-3_dev/html/word-break-break-all-007.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-break-break-all-007.htm]
-  type: reftest
-  expected: FAIL

From a83fd079df1c824956dc2a692226ef6c8a6be3dc Mon Sep 17 00:00:00 2001
From: Vee Satayamas <vsatayamas@gmail.com>
Date: Fri, 19 Aug 2016 00:45:46 +0700
Subject: [PATCH 2/2] reftest for issue #12193 Servo displays upper level Thai
 character in wrong place.

---
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../mozilla/tests/css/complex_glyphs_a.html   |  7 ++++++
 .../mozilla/tests/css/complex_glyphs_ref.html |  6 +++++
 3 files changed, 37 insertions(+)
 create mode 100644 tests/wpt/mozilla/tests/css/complex_glyphs_a.html
 create mode 100644 tests/wpt/mozilla/tests/css/complex_glyphs_ref.html

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 99a9304ba6a..b5338d3d1da 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -1340,6 +1340,18 @@
             "url": "/_mozilla/css/clip_a.html"
           }
         ],
+        "css/complex_glyphs_a.html": [
+          {
+            "path": "css/complex_glyphs_a.html",
+            "references": [
+              [
+                "/_mozilla/css/complex_glyphs_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/complex_glyphs_a.html"
+          }
+        ],
         "css/content_color.html": [
           {
             "path": "css/content_color.html",
@@ -16688,6 +16700,18 @@
           "url": "/_mozilla/css/clip_a.html"
         }
       ],
+      "css/complex_glyphs_a.html": [
+        {
+          "path": "css/complex_glyphs_a.html",
+          "references": [
+            [
+              "/_mozilla/css/complex_glyphs_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/complex_glyphs_a.html"
+        }
+      ],
       "css/content_color.html": [
         {
           "path": "css/content_color.html",
diff --git a/tests/wpt/mozilla/tests/css/complex_glyphs_a.html b/tests/wpt/mozilla/tests/css/complex_glyphs_a.html
new file mode 100644
index 00000000000..08032c978d5
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/complex_glyphs_a.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="match" href="complex_glyphs_ref.html">
+<body>
+ยินดี
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/css/complex_glyphs_ref.html b/tests/wpt/mozilla/tests/css/complex_glyphs_ref.html
new file mode 100644
index 00000000000..d168d10945d
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/complex_glyphs_ref.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<meta charset="utf-8">
+<body>
+ยิน&#X200B;ดี
+</body>
+<html>