103 files changed, 1 insertions, 1 deletions
diff --git a/gfx/moz.build b/gfx/moz.build
index fdf65eb18..89f61325e 100644
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -10,7 +10,6 @@ DIRS += [
     'qcms',
     'gl',
     'layers',
-    'ots/src',
     'thebes',
     'ipc',
     'config',
diff --git a/libs/moz.build b/libs/moz.build
index 869b09cfe..8c2989f29 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -8,6 +8,7 @@ DIRS += [
     'angle',
     'graphite2/src',
     'harfbuzz/src',
+    'ots/src',
 ]
 
 if CONFIG['MOZ_TREE_CAIRO']:
diff --git a/gfx/ots/LICENSE b/libs/ots/LICENSE
index d5e3bff5a..d5e3bff5a 100644
--- a/gfx/ots/LICENSE
+++ b/libs/ots/LICENSE
diff --git a/gfx/ots/README.mozilla b/libs/ots/README.mozilla
index 0353a99c5..0353a99c5 100644
--- a/gfx/ots/README.mozilla
+++ b/libs/ots/README.mozilla
diff --git a/gfx/ots/include/opentype-sanitiser.h b/libs/ots/include/opentype-sanitiser.h
index 52cbd3aee..52cbd3aee 100644
--- a/gfx/ots/include/opentype-sanitiser.h
+++ b/libs/ots/include/opentype-sanitiser.h
diff --git a/gfx/ots/include/ots-memory-stream.h b/libs/ots/include/ots-memory-stream.h
index cd5b089fa..cd5b089fa 100644
--- a/gfx/ots/include/ots-memory-stream.h
+++ b/libs/ots/include/ots-memory-stream.h
diff --git a/gfx/ots/ots-lz4.patch b/libs/ots/ots-lz4.patch
index 4251e72d6..4251e72d6 100644
--- a/gfx/ots/ots-lz4.patch
+++ b/libs/ots/ots-lz4.patch
diff --git a/gfx/ots/ots-visibility.patch b/libs/ots/ots-visibility.patch
index c1265472b..c1265472b 100644
--- a/gfx/ots/ots-visibility.patch
+++ b/libs/ots/ots-visibility.patch
diff --git a/gfx/ots/src/avar.cc b/libs/ots/src/avar.cc
index 2a431b1c2..2a431b1c2 100644
--- a/gfx/ots/src/avar.cc
+++ b/libs/ots/src/avar.cc
diff --git a/gfx/ots/src/avar.h b/libs/ots/src/avar.h
index 756651c04..756651c04 100644
--- a/gfx/ots/src/avar.h
+++ b/libs/ots/src/avar.h
diff --git a/gfx/ots/src/cff.cc b/libs/ots/src/cff.cc
index b0affd510..b0affd510 100644
--- a/gfx/ots/src/cff.cc
+++ b/libs/ots/src/cff.cc
diff --git a/gfx/ots/src/cff.h b/libs/ots/src/cff.h
index cfce9ab91..cfce9ab91 100644
--- a/gfx/ots/src/cff.h
+++ b/libs/ots/src/cff.h
diff --git a/gfx/ots/src/cff_charstring.cc b/libs/ots/src/cff_charstring.cc
index 23c17d183..23c17d183 100644
--- a/gfx/ots/src/cff_charstring.cc
+++ b/libs/ots/src/cff_charstring.cc
diff --git a/gfx/ots/src/cff_charstring.h b/libs/ots/src/cff_charstring.h
index 5a2fa9ff2..5a2fa9ff2 100644
--- a/gfx/ots/src/cff_charstring.h
+++ b/libs/ots/src/cff_charstring.h
diff --git a/gfx/ots/src/cmap.cc b/libs/ots/src/cmap.cc
index 72c2a20fc..72c2a20fc 100644
--- a/gfx/ots/src/cmap.cc
+++ b/libs/ots/src/cmap.cc
diff --git a/gfx/ots/src/cmap.h b/libs/ots/src/cmap.h
index feddbc696..feddbc696 100644
--- a/gfx/ots/src/cmap.h
+++ b/libs/ots/src/cmap.h
diff --git a/gfx/ots/src/cvar.cc b/libs/ots/src/cvar.cc
index a2bad7a15..a2bad7a15 100644
--- a/gfx/ots/src/cvar.cc
+++ b/libs/ots/src/cvar.cc
diff --git a/gfx/ots/src/cvar.h b/libs/ots/src/cvar.h
index 8f31e98cd..8f31e98cd 100644
--- a/gfx/ots/src/cvar.h
+++ b/libs/ots/src/cvar.h
diff --git a/gfx/ots/src/cvt.cc b/libs/ots/src/cvt.cc
index 2e0257889..2e0257889 100644
--- a/gfx/ots/src/cvt.cc
+++ b/libs/ots/src/cvt.cc
diff --git a/gfx/ots/src/cvt.h b/libs/ots/src/cvt.h
index 88a96ca20..88a96ca20 100644
--- a/gfx/ots/src/cvt.h
+++ b/libs/ots/src/cvt.h
diff --git a/gfx/ots/src/feat.cc b/libs/ots/src/feat.cc
index 374a7ae9f..374a7ae9f 100644
--- a/gfx/ots/src/feat.cc
+++ b/libs/ots/src/feat.cc
diff --git a/gfx/ots/src/feat.h b/libs/ots/src/feat.h
index 29c2656ff..29c2656ff 100644
--- a/gfx/ots/src/feat.h
+++ b/libs/ots/src/feat.h
diff --git a/gfx/ots/src/fpgm.cc b/libs/ots/src/fpgm.cc
index bb52b367f..bb52b367f 100644
--- a/gfx/ots/src/fpgm.cc
+++ b/libs/ots/src/fpgm.cc
diff --git a/gfx/ots/src/fpgm.h b/libs/ots/src/fpgm.h
index 9ed6b34bf..9ed6b34bf 100644
--- a/gfx/ots/src/fpgm.h
+++ b/libs/ots/src/fpgm.h
diff --git a/gfx/ots/src/fvar.cc b/libs/ots/src/fvar.cc
index 6f9b4d6eb..6f9b4d6eb 100644
--- a/gfx/ots/src/fvar.cc
+++ b/libs/ots/src/fvar.cc
diff --git a/gfx/ots/src/fvar.h b/libs/ots/src/fvar.h
index a469c8cdd..a469c8cdd 100644
--- a/gfx/ots/src/fvar.h
+++ b/libs/ots/src/fvar.h
diff --git a/gfx/ots/src/gasp.cc b/libs/ots/src/gasp.cc
index 2a03c831f..2a03c831f 100644
--- a/gfx/ots/src/gasp.cc
+++ b/libs/ots/src/gasp.cc
diff --git a/gfx/ots/src/gasp.h b/libs/ots/src/gasp.h
index ce9e987aa..ce9e987aa 100644
--- a/gfx/ots/src/gasp.h
+++ b/libs/ots/src/gasp.h
diff --git a/gfx/ots/src/gdef.cc b/libs/ots/src/gdef.cc
index 71e1075e3..71e1075e3 100644
--- a/gfx/ots/src/gdef.cc
+++ b/libs/ots/src/gdef.cc
diff --git a/gfx/ots/src/gdef.h b/libs/ots/src/gdef.h
index 7c7cc0ce5..7c7cc0ce5 100644
--- a/gfx/ots/src/gdef.h
+++ b/libs/ots/src/gdef.h
diff --git a/gfx/ots/src/glat.cc b/libs/ots/src/glat.cc
index 23f7dfd9a..23f7dfd9a 100644
--- a/gfx/ots/src/glat.cc
+++ b/libs/ots/src/glat.cc
diff --git a/gfx/ots/src/glat.h b/libs/ots/src/glat.h
index 04c9c1cce..04c9c1cce 100644
--- a/gfx/ots/src/glat.h
+++ b/libs/ots/src/glat.h
diff --git a/gfx/ots/src/gloc.cc b/libs/ots/src/gloc.cc
index 9c5ee3bdf..9c5ee3bdf 100644
--- a/gfx/ots/src/gloc.cc
+++ b/libs/ots/src/gloc.cc
diff --git a/gfx/ots/src/gloc.h b/libs/ots/src/gloc.h
index 60184ffb9..60184ffb9 100644
--- a/gfx/ots/src/gloc.h
+++ b/libs/ots/src/gloc.h
diff --git a/gfx/ots/src/glyf.cc b/libs/ots/src/glyf.cc
index 322fd52fe..322fd52fe 100644
--- a/gfx/ots/src/glyf.cc
+++ b/libs/ots/src/glyf.cc
diff --git a/gfx/ots/src/glyf.h b/libs/ots/src/glyf.h
index 08c585df3..08c585df3 100644
--- a/gfx/ots/src/glyf.h
+++ b/libs/ots/src/glyf.h
diff --git a/gfx/ots/src/gpos.cc b/libs/ots/src/gpos.cc
index 034f9799d..034f9799d 100644
--- a/gfx/ots/src/gpos.cc
+++ b/libs/ots/src/gpos.cc
diff --git a/gfx/ots/src/gpos.h b/libs/ots/src/gpos.h
index 423c8ae83..423c8ae83 100644
--- a/gfx/ots/src/gpos.h
+++ b/libs/ots/src/gpos.h
diff --git a/gfx/ots/src/graphite.h b/libs/ots/src/graphite.h
index 452cb26a8..452cb26a8 100644
--- a/gfx/ots/src/graphite.h
+++ b/libs/ots/src/graphite.h
diff --git a/gfx/ots/src/gsub.cc b/libs/ots/src/gsub.cc
index c90fb48f3..c90fb48f3 100644
--- a/gfx/ots/src/gsub.cc
+++ b/libs/ots/src/gsub.cc
diff --git a/gfx/ots/src/gsub.h b/libs/ots/src/gsub.h
index 76c990465..76c990465 100644
--- a/gfx/ots/src/gsub.h
+++ b/libs/ots/src/gsub.h
diff --git a/gfx/ots/src/gvar.cc b/libs/ots/src/gvar.cc
index 324a0fc83..324a0fc83 100644
--- a/gfx/ots/src/gvar.cc
+++ b/libs/ots/src/gvar.cc
diff --git a/gfx/ots/src/gvar.h b/libs/ots/src/gvar.h
index 8a90c57a3..8a90c57a3 100644
--- a/gfx/ots/src/gvar.h
+++ b/libs/ots/src/gvar.h
diff --git a/gfx/ots/src/hdmx.cc b/libs/ots/src/hdmx.cc
index 42ac9de8d..42ac9de8d 100644
--- a/gfx/ots/src/hdmx.cc
+++ b/libs/ots/src/hdmx.cc
diff --git a/gfx/ots/src/hdmx.h b/libs/ots/src/hdmx.h
index 5d323dd7e..5d323dd7e 100644
--- a/gfx/ots/src/hdmx.h
+++ b/libs/ots/src/hdmx.h
diff --git a/gfx/ots/src/head.cc b/libs/ots/src/head.cc
index 6088504c8..6088504c8 100644
--- a/gfx/ots/src/head.cc
+++ b/libs/ots/src/head.cc
diff --git a/gfx/ots/src/head.h b/libs/ots/src/head.h
index a040fcf24..a040fcf24 100644
--- a/gfx/ots/src/head.h
+++ b/libs/ots/src/head.h
diff --git a/gfx/ots/src/hhea.cc b/libs/ots/src/hhea.cc
index d024aaac4..d024aaac4 100644
--- a/gfx/ots/src/hhea.cc
+++ b/libs/ots/src/hhea.cc
diff --git a/gfx/ots/src/hhea.h b/libs/ots/src/hhea.h
index 0405bd9d1..0405bd9d1 100644
--- a/gfx/ots/src/hhea.h
+++ b/libs/ots/src/hhea.h
diff --git a/gfx/ots/src/hmtx.cc b/libs/ots/src/hmtx.cc
index 2ef7771fd..2ef7771fd 100644
--- a/gfx/ots/src/hmtx.cc
+++ b/libs/ots/src/hmtx.cc
diff --git a/gfx/ots/src/hmtx.h b/libs/ots/src/hmtx.h
index dbea9c80c..dbea9c80c 100644
--- a/gfx/ots/src/hmtx.h
+++ b/libs/ots/src/hmtx.h
diff --git a/gfx/ots/src/hvar.cc b/libs/ots/src/hvar.cc
index 2bcea8680..2bcea8680 100644
--- a/gfx/ots/src/hvar.cc
+++ b/libs/ots/src/hvar.cc
diff --git a/gfx/ots/src/hvar.h b/libs/ots/src/hvar.h
index 5bfd2e4ea..5bfd2e4ea 100644
--- a/gfx/ots/src/hvar.h
+++ b/libs/ots/src/hvar.h
diff --git a/gfx/ots/src/kern.cc b/libs/ots/src/kern.cc
index ec41dfb9c..ec41dfb9c 100644
--- a/gfx/ots/src/kern.cc
+++ b/libs/ots/src/kern.cc
diff --git a/gfx/ots/src/kern.h b/libs/ots/src/kern.h
index 38f056851..38f056851 100644
--- a/gfx/ots/src/kern.h
+++ b/libs/ots/src/kern.h
diff --git a/gfx/ots/src/layout.cc b/libs/ots/src/layout.cc
index 8e99f573d..8e99f573d 100644
--- a/gfx/ots/src/layout.cc
+++ b/libs/ots/src/layout.cc
diff --git a/gfx/ots/src/layout.h b/libs/ots/src/layout.h
index d10a3be5b..d10a3be5b 100644
--- a/gfx/ots/src/layout.h
+++ b/libs/ots/src/layout.h
diff --git a/gfx/ots/src/loca.cc b/libs/ots/src/loca.cc
index 4f322027d..4f322027d 100644
--- a/gfx/ots/src/loca.cc
+++ b/libs/ots/src/loca.cc
diff --git a/gfx/ots/src/loca.h b/libs/ots/src/loca.h
index da3241842..da3241842 100644
--- a/gfx/ots/src/loca.h
+++ b/libs/ots/src/loca.h
diff --git a/gfx/ots/src/ltsh.cc b/libs/ots/src/ltsh.cc
index 4c40c5eb7..4c40c5eb7 100644
--- a/gfx/ots/src/ltsh.cc
+++ b/libs/ots/src/ltsh.cc
diff --git a/gfx/ots/src/ltsh.h b/libs/ots/src/ltsh.h
index cc9fbf62d..cc9fbf62d 100644
--- a/gfx/ots/src/ltsh.h
+++ b/libs/ots/src/ltsh.h
diff --git a/gfx/ots/src/math.cc b/libs/ots/src/math.cc
index c94e3bee3..c94e3bee3 100644
--- a/gfx/ots/src/math.cc
+++ b/libs/ots/src/math.cc
diff --git a/gfx/ots/src/math_.h b/libs/ots/src/math_.h
index 875cacd4d..875cacd4d 100644
--- a/gfx/ots/src/math_.h
+++ b/libs/ots/src/math_.h
diff --git a/gfx/ots/src/maxp.cc b/libs/ots/src/maxp.cc
index 232e4a988..232e4a988 100644
--- a/gfx/ots/src/maxp.cc
+++ b/libs/ots/src/maxp.cc
diff --git a/gfx/ots/src/maxp.h b/libs/ots/src/maxp.h
index 99dbdc439..99dbdc439 100644
--- a/gfx/ots/src/maxp.h
+++ b/libs/ots/src/maxp.h
diff --git a/gfx/ots/src/metrics.cc b/libs/ots/src/metrics.cc
index b49d73c5d..b49d73c5d 100644
--- a/gfx/ots/src/metrics.cc
+++ b/libs/ots/src/metrics.cc
diff --git a/gfx/ots/src/metrics.h b/libs/ots/src/metrics.h
index efe14c070..efe14c070 100644
--- a/gfx/ots/src/metrics.h
+++ b/libs/ots/src/metrics.h
diff --git a/gfx/ots/src/moz.build b/libs/ots/src/moz.build
index 909a2092e..909a2092e 100644
--- a/gfx/ots/src/moz.build
+++ b/libs/ots/src/moz.build
diff --git a/gfx/ots/src/mvar.cc b/libs/ots/src/mvar.cc
index d021203d3..d021203d3 100644
--- a/gfx/ots/src/mvar.cc
+++ b/libs/ots/src/mvar.cc
diff --git a/gfx/ots/src/mvar.h b/libs/ots/src/mvar.h
index 81fb6155d..81fb6155d 100644
--- a/gfx/ots/src/mvar.h
+++ b/libs/ots/src/mvar.h
diff --git a/gfx/ots/src/name.cc b/libs/ots/src/name.cc
index 11deeecaa..11deeecaa 100644
--- a/gfx/ots/src/name.cc
+++ b/libs/ots/src/name.cc
diff --git a/gfx/ots/src/name.h b/libs/ots/src/name.h
index 68c7ac096..68c7ac096 100644
--- a/gfx/ots/src/name.h
+++ b/libs/ots/src/name.h
diff --git a/gfx/ots/src/os2.cc b/libs/ots/src/os2.cc
index 5376a1dbb..5376a1dbb 100644
--- a/gfx/ots/src/os2.cc
+++ b/libs/ots/src/os2.cc
diff --git a/gfx/ots/src/os2.h b/libs/ots/src/os2.h
index b3f1bad9b..b3f1bad9b 100644
--- a/gfx/ots/src/os2.h
+++ b/libs/ots/src/os2.h
diff --git a/gfx/ots/src/ots.cc b/libs/ots/src/ots.cc
index 38d97a9ed..38d97a9ed 100644
--- a/gfx/ots/src/ots.cc
+++ b/libs/ots/src/ots.cc
diff --git a/gfx/ots/src/ots.h b/libs/ots/src/ots.h
index 4d2be1689..4d2be1689 100644
--- a/gfx/ots/src/ots.h
+++ b/libs/ots/src/ots.h
diff --git a/gfx/ots/src/post.cc b/libs/ots/src/post.cc
index 704c32007..704c32007 100644
--- a/gfx/ots/src/post.cc
+++ b/libs/ots/src/post.cc
diff --git a/gfx/ots/src/post.h b/libs/ots/src/post.h
index c341e391c..c341e391c 100644
--- a/gfx/ots/src/post.h
+++ b/libs/ots/src/post.h
diff --git a/gfx/ots/src/prep.cc b/libs/ots/src/prep.cc
index 943bb45b9..943bb45b9 100644
--- a/gfx/ots/src/prep.cc
+++ b/libs/ots/src/prep.cc
diff --git a/gfx/ots/src/prep.h b/libs/ots/src/prep.h
index 4d3eda2cd..4d3eda2cd 100644
--- a/gfx/ots/src/prep.h
+++ b/libs/ots/src/prep.h
diff --git a/gfx/ots/src/sile.cc b/libs/ots/src/sile.cc
index 74405e56e..74405e56e 100644
--- a/gfx/ots/src/sile.cc
+++ b/libs/ots/src/sile.cc
diff --git a/gfx/ots/src/sile.h b/libs/ots/src/sile.h
index bdb00606f..bdb00606f 100644
--- a/gfx/ots/src/sile.h
+++ b/libs/ots/src/sile.h
diff --git a/gfx/ots/src/silf.cc b/libs/ots/src/silf.cc
index fa4e59e52..fa4e59e52 100644
--- a/gfx/ots/src/silf.cc
+++ b/libs/ots/src/silf.cc
diff --git a/gfx/ots/src/silf.h b/libs/ots/src/silf.h
index b6c08032f..b6c08032f 100644
--- a/gfx/ots/src/silf.h
+++ b/libs/ots/src/silf.h
diff --git a/gfx/ots/src/sill.cc b/libs/ots/src/sill.cc
index c7b20a980..c7b20a980 100644
--- a/gfx/ots/src/sill.cc
+++ b/libs/ots/src/sill.cc
diff --git a/gfx/ots/src/sill.h b/libs/ots/src/sill.h
index 30f9b8d83..30f9b8d83 100644
--- a/gfx/ots/src/sill.h
+++ b/libs/ots/src/sill.h
diff --git a/gfx/ots/src/stat.cc b/libs/ots/src/stat.cc
index 9b7828109..9b7828109 100644
--- a/gfx/ots/src/stat.cc
+++ b/libs/ots/src/stat.cc
diff --git a/gfx/ots/src/stat.h b/libs/ots/src/stat.h
index 873d08edc..873d08edc 100644
--- a/gfx/ots/src/stat.h
+++ b/libs/ots/src/stat.h
diff --git a/gfx/ots/src/variations.cc b/libs/ots/src/variations.cc
index cb7e5fb32..cb7e5fb32 100644
--- a/gfx/ots/src/variations.cc
+++ b/libs/ots/src/variations.cc
diff --git a/gfx/ots/src/variations.h b/libs/ots/src/variations.h
index aaaac1784..aaaac1784 100644
--- a/gfx/ots/src/variations.h
+++ b/libs/ots/src/variations.h
diff --git a/gfx/ots/src/vdmx.cc b/libs/ots/src/vdmx.cc
index 54055777a..54055777a 100644
--- a/gfx/ots/src/vdmx.cc
+++ b/libs/ots/src/vdmx.cc
diff --git a/gfx/ots/src/vdmx.h b/libs/ots/src/vdmx.h
index 6ccf6dc1b..6ccf6dc1b 100644
--- a/gfx/ots/src/vdmx.h
+++ b/libs/ots/src/vdmx.h
diff --git a/gfx/ots/src/vhea.cc b/libs/ots/src/vhea.cc
index e44bedf20..e44bedf20 100644
--- a/gfx/ots/src/vhea.cc
+++ b/libs/ots/src/vhea.cc
diff --git a/gfx/ots/src/vhea.h b/libs/ots/src/vhea.h
index 8776acd11..8776acd11 100644
--- a/gfx/ots/src/vhea.h
+++ b/libs/ots/src/vhea.h
diff --git a/gfx/ots/src/vmtx.cc b/libs/ots/src/vmtx.cc
index d576ae294..d576ae294 100644
--- a/gfx/ots/src/vmtx.cc
+++ b/libs/ots/src/vmtx.cc
diff --git a/gfx/ots/src/vmtx.h b/libs/ots/src/vmtx.h
index b243fe214..b243fe214 100644
--- a/gfx/ots/src/vmtx.h
+++ b/libs/ots/src/vmtx.h
diff --git a/gfx/ots/src/vorg.cc b/libs/ots/src/vorg.cc
index 3b4b51c53..3b4b51c53 100644
--- a/gfx/ots/src/vorg.cc
+++ b/libs/ots/src/vorg.cc
diff --git a/gfx/ots/src/vorg.h b/libs/ots/src/vorg.h
index caffea875..caffea875 100644
--- a/gfx/ots/src/vorg.h
+++ b/libs/ots/src/vorg.h
diff --git a/gfx/ots/src/vvar.cc b/libs/ots/src/vvar.cc
index b47ea479d..b47ea479d 100644
--- a/gfx/ots/src/vvar.cc
+++ b/libs/ots/src/vvar.cc
diff --git a/gfx/ots/src/vvar.h b/libs/ots/src/vvar.h
index 15d435745..15d435745 100644
--- a/gfx/ots/src/vvar.h
+++ b/libs/ots/src/vvar.h
diff --git a/gfx/ots/sync.sh b/libs/ots/sync.sh
index 81738f9e1..81738f9e1 100755..100644
--- a/gfx/ots/sync.sh
+++ b/libs/ots/sync.sh
diff --git a/gfx/ots/tests/cff_charstring_test.cc b/libs/ots/tests/cff_charstring_test.cc
index 18e077e8f..18e077e8f 100644
--- a/gfx/ots/tests/cff_charstring_test.cc
+++ b/libs/ots/tests/cff_charstring_test.cc
diff --git a/gfx/ots/tests/layout_common_table_test.cc b/libs/ots/tests/layout_common_table_test.cc
index 91e429741..91e429741 100644
--- a/gfx/ots/tests/layout_common_table_test.cc
+++ b/libs/ots/tests/layout_common_table_test.cc