diff --git a/gfx/cairo/README b/gfx/cairo/README
index 5dce252c4827..86db6d6dec9b 100644
--- a/gfx/cairo/README
+++ b/gfx/cairo/README
@@ -44,8 +44,6 @@ glyph-safety-margin.patch: Change the glyph dropping safety margin from 2em to 1
win32-vertically-offset-glyph.patch: bug 454098; vertical positioning errors when drawing glyph runs including delta-y offsets on screen via GDI
-win32-canvas-glyph-position.patch: bug 475092; horizontal positioning errors when drawing glyph runs with delta-y offsets to canvas through win32-font
-
==== pixman patches ====
endian.patch: include cairo-platform.h for endian macros
diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
index 3d06b3053d15..c86cab5a5fcc 100644
--- a/gfx/cairo/cairo/src/cairo-win32-font.c
+++ b/gfx/cairo/cairo/src/cairo-win32-font.c
@@ -1187,12 +1187,12 @@ _add_glyph (cairo_glyph_state_t *state,
if (status)
return status;
state->start_x = logical_x;
- } else {
- dx = logical_x - state->last_x;
- status = _cairo_array_append (&state->dx, &dx);
- if (status)
- return status;
}
+
+ dx = logical_x - state->last_x;
+ status = _cairo_array_append (&state->dx, &dx);
+ if (status)
+ return status;
} else {
state->start_x = logical_x;
}
diff --git a/gfx/cairo/win32-canvas-glyph-position.patch b/gfx/cairo/win32-canvas-glyph-position.patch
deleted file mode 100644
index 4ed10596ca1c..000000000000
--- a/gfx/cairo/win32-canvas-glyph-position.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
---- a/gfx/cairo/cairo/src/cairo-win32-font.c
-+++ b/gfx/cairo/cairo/src/cairo-win32-font.c
-@@ -1182,22 +1182,22 @@ _add_glyph (cairo_glyph_state_t *state,
- if (state->glyphs.num_elements > 0) {
- int dx;
-
- if (logical_y != state->last_y) {
- status = _flush_glyphs (state);
- if (status)
- return status;
- state->start_x = logical_x;
-+ } else {
-+ dx = logical_x - state->last_x;
-+ status = _cairo_array_append (&state->dx, &dx);
-+ if (status)
-+ return status;
- }
--
-- dx = logical_x - state->last_x;
-- status = _cairo_array_append (&state->dx, &dx);
-- if (status)
-- return status;
- } else {
- state->start_x = logical_x;
- }
-
- state->last_x = logical_x;
- state->last_y = logical_y;
-
- status = _cairo_array_append (&state->glyphs, &glyph_index);
diff --git a/layout/reftests/fonts/PositioningTest1.ttf b/layout/reftests/fonts/PositioningTest1.ttf
deleted file mode 100644
index c2ca1a7b35f2..000000000000
Binary files a/layout/reftests/fonts/PositioningTest1.ttf and /dev/null differ
diff --git a/layout/reftests/fonts/PositioningTest2.ttf b/layout/reftests/fonts/PositioningTest2.ttf
deleted file mode 100644
index dc9e8326d49e..000000000000
Binary files a/layout/reftests/fonts/PositioningTest2.ttf and /dev/null differ
diff --git a/layout/reftests/text/475092-pos.html b/layout/reftests/text/475092-pos.html
deleted file mode 100644
index 9c907d08f10b..000000000000
--- a/layout/reftests/text/475092-pos.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
- Hello World!
-
diff --git a/layout/reftests/text/475092-ref.html b/layout/reftests/text/475092-ref.html
deleted file mode 100644
index 5e9509783f97..000000000000
--- a/layout/reftests/text/475092-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
- HellO WOrld!
-
diff --git a/layout/reftests/text/475092-sub.html b/layout/reftests/text/475092-sub.html
deleted file mode 100644
index 84b675726f70..000000000000
--- a/layout/reftests/text/475092-sub.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
- Hello World!
-
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index 9243fb1dc220..c478bf8861b6 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -32,5 +32,3 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") != zwnj-01.html zwnj-01-notref.html # Bad
fails-if(MOZ_WIDGET_TOOLKIT=="windows") == cgj-01.html cgj-01-ref.html # bug 455455
== 444656.html 444656-ref.html
== 449555-1.html 449555-1-ref.html
-HTTP(..) == 475092-sub.html 475092-ref.html
-HTTP(..) == 475092-pos.html 475092-ref.html