From 88ef3c5a9abc22927365e9c60d7aa0e3e8a339b9 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 28 Jun 2022 23:26:49 +0000
Subject: [PATCH] [reorg] Change OT::Layout::GPOS to OT::Layout::GPOS_impl.

---
 src/OT/Layout/GPOS/Anchor.hh             |  2 +-
 src/OT/Layout/GPOS/AnchorFormat1.hh      |  2 +-
 src/OT/Layout/GPOS/AnchorFormat2.hh      |  2 +-
 src/OT/Layout/GPOS/AnchorFormat3.hh      |  2 +-
 src/OT/Layout/GPOS/AnchorMatrix.hh       |  2 +-
 src/OT/Layout/GPOS/ChainContextPos.hh    |  2 +-
 src/OT/Layout/GPOS/Common.hh             |  2 +-
 src/OT/Layout/GPOS/ContextPos.hh         |  2 +-
 src/OT/Layout/GPOS/CursivePos.hh         |  2 +-
 src/OT/Layout/GPOS/CursivePosFormat1.hh  |  4 ++--
 src/OT/Layout/GPOS/ExtensionPos.hh       |  2 +-
 src/OT/Layout/GPOS/GPOS.hh               |  6 +++---
 src/OT/Layout/GPOS/MarkArray.hh          |  2 +-
 src/OT/Layout/GPOS/MarkBasePos.hh        |  2 +-
 src/OT/Layout/GPOS/MarkBasePosFormat1.hh |  2 +-
 src/OT/Layout/GPOS/MarkLigPos.hh         |  2 +-
 src/OT/Layout/GPOS/MarkLigPosFormat1.hh  |  2 +-
 src/OT/Layout/GPOS/MarkMarkPos.hh        |  2 +-
 src/OT/Layout/GPOS/MarkMarkPosFormat1.hh |  2 +-
 src/OT/Layout/GPOS/MarkRecord.hh         |  2 +-
 src/OT/Layout/GPOS/PairPos.hh            |  2 +-
 src/OT/Layout/GPOS/PairPosFormat1.hh     |  2 +-
 src/OT/Layout/GPOS/PairPosFormat2.hh     |  2 +-
 src/OT/Layout/GPOS/PosLookup.hh          |  2 +-
 src/OT/Layout/GPOS/PosLookupSubTable.hh  |  2 +-
 src/OT/Layout/GPOS/SinglePos.hh          |  2 +-
 src/OT/Layout/GPOS/SinglePosFormat1.hh   |  2 +-
 src/OT/Layout/GPOS/SinglePosFormat2.hh   |  2 +-
 src/OT/Layout/GPOS/ValueFormat.hh        |  2 +-
 src/hb-ot-layout-gpos-table.hh           | 20 ++++++++++----------
 src/hb-ot-layout.cc                      |  2 +-
 src/hb-subset-plan.cc                    |  2 +-
 src/hb-subset.cc                         |  2 +-
 33 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/OT/Layout/GPOS/Anchor.hh b/src/OT/Layout/GPOS/Anchor.hh
index ee54fd162..bfe6b36af 100644
--- a/src/OT/Layout/GPOS/Anchor.hh
+++ b/src/OT/Layout/GPOS/Anchor.hh
@@ -7,7 +7,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct Anchor
 {
diff --git a/src/OT/Layout/GPOS/AnchorFormat1.hh b/src/OT/Layout/GPOS/AnchorFormat1.hh
index c0732469e..738cc31bb 100644
--- a/src/OT/Layout/GPOS/AnchorFormat1.hh
+++ b/src/OT/Layout/GPOS/AnchorFormat1.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct AnchorFormat1
 {
diff --git a/src/OT/Layout/GPOS/AnchorFormat2.hh b/src/OT/Layout/GPOS/AnchorFormat2.hh
index fb7fbdbaf..70b4d19f5 100644
--- a/src/OT/Layout/GPOS/AnchorFormat2.hh
+++ b/src/OT/Layout/GPOS/AnchorFormat2.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct AnchorFormat2
 {
diff --git a/src/OT/Layout/GPOS/AnchorFormat3.hh b/src/OT/Layout/GPOS/AnchorFormat3.hh
index ab94553e9..d77b4699b 100644
--- a/src/OT/Layout/GPOS/AnchorFormat3.hh
+++ b/src/OT/Layout/GPOS/AnchorFormat3.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct AnchorFormat3
 {
diff --git a/src/OT/Layout/GPOS/AnchorMatrix.hh b/src/OT/Layout/GPOS/AnchorMatrix.hh
index 083797904..c442efa1e 100644
--- a/src/OT/Layout/GPOS/AnchorMatrix.hh
+++ b/src/OT/Layout/GPOS/AnchorMatrix.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct AnchorMatrix
 {
diff --git a/src/OT/Layout/GPOS/ChainContextPos.hh b/src/OT/Layout/GPOS/ChainContextPos.hh
index 3b9c3022c..d551ac2a2 100644
--- a/src/OT/Layout/GPOS/ChainContextPos.hh
+++ b/src/OT/Layout/GPOS/ChainContextPos.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct ChainContextPos : ChainContext {};
 
diff --git a/src/OT/Layout/GPOS/Common.hh b/src/OT/Layout/GPOS/Common.hh
index 90feeab64..e16c06729 100644
--- a/src/OT/Layout/GPOS/Common.hh
+++ b/src/OT/Layout/GPOS/Common.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 enum attach_type_t {
   ATTACH_TYPE_NONE      = 0X00,
diff --git a/src/OT/Layout/GPOS/ContextPos.hh b/src/OT/Layout/GPOS/ContextPos.hh
index f4ec6f30e..2a01eaa3a 100644
--- a/src/OT/Layout/GPOS/ContextPos.hh
+++ b/src/OT/Layout/GPOS/ContextPos.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct ContextPos : Context {};
 
diff --git a/src/OT/Layout/GPOS/CursivePos.hh b/src/OT/Layout/GPOS/CursivePos.hh
index 40bcd01bf..c105cfb09 100644
--- a/src/OT/Layout/GPOS/CursivePos.hh
+++ b/src/OT/Layout/GPOS/CursivePos.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct CursivePos
 {
diff --git a/src/OT/Layout/GPOS/CursivePosFormat1.hh b/src/OT/Layout/GPOS/CursivePosFormat1.hh
index f6e46b1a1..e212fab97 100644
--- a/src/OT/Layout/GPOS/CursivePosFormat1.hh
+++ b/src/OT/Layout/GPOS/CursivePosFormat1.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct EntryExitRecord
 {
@@ -52,7 +52,7 @@ struct EntryExitRecord
 static void
 reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, unsigned int new_parent) {
   int chain = pos[i].attach_chain(), type = pos[i].attach_type();
-  if (likely (!chain || 0 == (type & OT::Layout::GPOS::ATTACH_TYPE_CURSIVE)))
+  if (likely (!chain || 0 == (type & ATTACH_TYPE_CURSIVE)))
     return;
 
   pos[i].attach_chain() = 0;
diff --git a/src/OT/Layout/GPOS/ExtensionPos.hh b/src/OT/Layout/GPOS/ExtensionPos.hh
index 89c6de2fd..d1808adab 100644
--- a/src/OT/Layout/GPOS/ExtensionPos.hh
+++ b/src/OT/Layout/GPOS/ExtensionPos.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct ExtensionPos : Extension<ExtensionPos>
 {
diff --git a/src/OT/Layout/GPOS/GPOS.hh b/src/OT/Layout/GPOS/GPOS.hh
index d914e0281..f2673e9aa 100644
--- a/src/OT/Layout/GPOS/GPOS.hh
+++ b/src/OT/Layout/GPOS/GPOS.hh
@@ -8,7 +8,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 static void
 propagate_attachment_offsets (hb_glyph_position_t *pos,
@@ -157,8 +157,8 @@ GPOS::position_finish_offsets (hb_font_t *font, hb_buffer_t *buffer)
 }
 }
 
-struct GPOS_accelerator_t : Layout::GPOS::GPOS::accelerator_t {
-  GPOS_accelerator_t (hb_face_t *face) : Layout::GPOS::GPOS::accelerator_t (face) {}
+struct GPOS_accelerator_t : Layout::GPOS_impl::GPOS::accelerator_t {
+  GPOS_accelerator_t (hb_face_t *face) : Layout::GPOS_impl::GPOS::accelerator_t (face) {}
 };
 
 }
diff --git a/src/OT/Layout/GPOS/MarkArray.hh b/src/OT/Layout/GPOS/MarkArray.hh
index f7e8c4e37..f8cddd199 100644
--- a/src/OT/Layout/GPOS/MarkArray.hh
+++ b/src/OT/Layout/GPOS/MarkArray.hh
@@ -6,7 +6,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct MarkArray : Array16Of<MarkRecord>        /* Array of MarkRecords--in Coverage order */
 {
diff --git a/src/OT/Layout/GPOS/MarkBasePos.hh b/src/OT/Layout/GPOS/MarkBasePos.hh
index 31938f866..e99e13ff8 100644
--- a/src/OT/Layout/GPOS/MarkBasePos.hh
+++ b/src/OT/Layout/GPOS/MarkBasePos.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct MarkBasePos
 {
diff --git a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
index 23884efc2..a10b806fe 100644
--- a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
+++ b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 typedef AnchorMatrix BaseArray;         /* base-major--
                                          * in order of BaseCoverage Index--,
diff --git a/src/OT/Layout/GPOS/MarkLigPos.hh b/src/OT/Layout/GPOS/MarkLigPos.hh
index 2597d6976..7e74aa73e 100644
--- a/src/OT/Layout/GPOS/MarkLigPos.hh
+++ b/src/OT/Layout/GPOS/MarkLigPos.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct MarkLigPos
 {
diff --git a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
index 2665efd4e..4382aa6c6 100644
--- a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
+++ b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 typedef AnchorMatrix LigatureAttach;    /* component-major--
                                          * in order of writing direction--,
diff --git a/src/OT/Layout/GPOS/MarkMarkPos.hh b/src/OT/Layout/GPOS/MarkMarkPos.hh
index e600f1550..c0eee6d54 100644
--- a/src/OT/Layout/GPOS/MarkMarkPos.hh
+++ b/src/OT/Layout/GPOS/MarkMarkPos.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct MarkMarkPos
 {
diff --git a/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh b/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh
index ebe31bbec..c48a74f77 100644
--- a/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh
+++ b/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 typedef AnchorMatrix Mark2Array;        /* mark2-major--
                                          * in order of Mark2Coverage Index--,
diff --git a/src/OT/Layout/GPOS/MarkRecord.hh b/src/OT/Layout/GPOS/MarkRecord.hh
index 1bc3e693a..7a514453a 100644
--- a/src/OT/Layout/GPOS/MarkRecord.hh
+++ b/src/OT/Layout/GPOS/MarkRecord.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct MarkRecord
 {
diff --git a/src/OT/Layout/GPOS/PairPos.hh b/src/OT/Layout/GPOS/PairPos.hh
index 98765c468..8479178d3 100644
--- a/src/OT/Layout/GPOS/PairPos.hh
+++ b/src/OT/Layout/GPOS/PairPos.hh
@@ -6,7 +6,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct PairPos
 {
diff --git a/src/OT/Layout/GPOS/PairPosFormat1.hh b/src/OT/Layout/GPOS/PairPosFormat1.hh
index 0d928dc60..35a2db2d4 100644
--- a/src/OT/Layout/GPOS/PairPosFormat1.hh
+++ b/src/OT/Layout/GPOS/PairPosFormat1.hh
@@ -3,7 +3,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct PairValueRecord
 {
diff --git a/src/OT/Layout/GPOS/PairPosFormat2.hh b/src/OT/Layout/GPOS/PairPosFormat2.hh
index 58845c42e..3f5f9959c 100644
--- a/src/OT/Layout/GPOS/PairPosFormat2.hh
+++ b/src/OT/Layout/GPOS/PairPosFormat2.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct PairPosFormat2
 {
diff --git a/src/OT/Layout/GPOS/PosLookup.hh b/src/OT/Layout/GPOS/PosLookup.hh
index 336689391..f2f3efa15 100644
--- a/src/OT/Layout/GPOS/PosLookup.hh
+++ b/src/OT/Layout/GPOS/PosLookup.hh
@@ -6,7 +6,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct PosLookup : Lookup
 {
diff --git a/src/OT/Layout/GPOS/PosLookupSubTable.hh b/src/OT/Layout/GPOS/PosLookupSubTable.hh
index c90b771d8..c19fbc323 100644
--- a/src/OT/Layout/GPOS/PosLookupSubTable.hh
+++ b/src/OT/Layout/GPOS/PosLookupSubTable.hh
@@ -13,7 +13,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct PosLookupSubTable
 {
diff --git a/src/OT/Layout/GPOS/SinglePos.hh b/src/OT/Layout/GPOS/SinglePos.hh
index 70a2f7e27..57e146bef 100644
--- a/src/OT/Layout/GPOS/SinglePos.hh
+++ b/src/OT/Layout/GPOS/SinglePos.hh
@@ -6,7 +6,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct SinglePos
 {
diff --git a/src/OT/Layout/GPOS/SinglePosFormat1.hh b/src/OT/Layout/GPOS/SinglePosFormat1.hh
index cfbde0db3..8b7840ed0 100644
--- a/src/OT/Layout/GPOS/SinglePosFormat1.hh
+++ b/src/OT/Layout/GPOS/SinglePosFormat1.hh
@@ -6,7 +6,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct SinglePosFormat1
 {
diff --git a/src/OT/Layout/GPOS/SinglePosFormat2.hh b/src/OT/Layout/GPOS/SinglePosFormat2.hh
index e66f43855..0d038b442 100644
--- a/src/OT/Layout/GPOS/SinglePosFormat2.hh
+++ b/src/OT/Layout/GPOS/SinglePosFormat2.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 struct SinglePosFormat2
 {
diff --git a/src/OT/Layout/GPOS/ValueFormat.hh b/src/OT/Layout/GPOS/ValueFormat.hh
index e2fc2c199..b29f287bc 100644
--- a/src/OT/Layout/GPOS/ValueFormat.hh
+++ b/src/OT/Layout/GPOS/ValueFormat.hh
@@ -5,7 +5,7 @@
 
 namespace OT {
 namespace Layout {
-namespace GPOS {
+namespace GPOS_impl {
 
 typedef HBUINT16 Value;
 
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 0f2ce59ab..5e847e0cb 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -33,33 +33,33 @@
 
 namespace OT {
 
-using Layout::GPOS::ATTACH_TYPE_MARK;
-using Layout::GPOS::ATTACH_TYPE_NONE;
-using Layout::GPOS::ATTACH_TYPE_CURSIVE;
-using Layout::GPOS::PosLookup;
+using Layout::GPOS_impl::ATTACH_TYPE_MARK;
+using Layout::GPOS_impl::ATTACH_TYPE_NONE;
+using Layout::GPOS_impl::ATTACH_TYPE_CURSIVE;
+using Layout::GPOS_impl::PosLookup;
 
 // TODO(garretrieger): Move into new layout directory.
 /* Out-of-class implementation for methods recursing */
 #ifndef HB_NO_OT_LAYOUT
 template <typename context_t>
-/*static*/ typename context_t::return_t Layout::GPOS::PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
+/*static*/ typename context_t::return_t PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index)
 {
-  const Layout::GPOS::PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
+  const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
   return l.dispatch (c);
 }
 
 template <>
 inline hb_closure_lookups_context_t::return_t
-Layout::GPOS::PosLookup::dispatch_recurse_func<hb_closure_lookups_context_t> (hb_closure_lookups_context_t *c, unsigned this_index)
+PosLookup::dispatch_recurse_func<hb_closure_lookups_context_t> (hb_closure_lookups_context_t *c, unsigned this_index)
 {
-  const Layout::GPOS::PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (this_index);
+  const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (this_index);
   return l.closure_lookups (c, this_index);
 }
 
 template <>
-inline bool Layout::GPOS::PosLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_apply_context_t *c, unsigned int lookup_index)
+inline bool PosLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_apply_context_t *c, unsigned int lookup_index)
 {
-  const Layout::GPOS::PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
+  const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
   unsigned int saved_lookup_props = c->lookup_props;
   unsigned int saved_lookup_index = c->lookup_index;
   c->set_lookup_index (lookup_index);
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index a17f5f8b0..5dee07eb4 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -55,7 +55,7 @@
 #include "hb-aat-layout-opbd-table.hh" // Just so we compile it; unused otherwise.
 
 using OT::Layout::GSUB::GSUB;
-using OT::Layout::GPOS::GPOS;
+using OT::Layout::GPOS_impl::GPOS;
 
 /**
  * SECTION:hb-ot-layout
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 123767c59..38175fa61 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -41,7 +41,7 @@
 #include "hb-ot-math-table.hh"
 
 using OT::Layout::GSUB::GSUB;
-using OT::Layout::GPOS::GPOS;
+using OT::Layout::GPOS_impl::GPOS;
 
 typedef hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> script_langsys_map;
 #ifndef HB_NO_SUBSET_CFF
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index d8b9d87b1..bcd00c9bf 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -56,7 +56,7 @@
 #include "hb-repacker.hh"
 
 using OT::Layout::GSUB::GSUB;
-using OT::Layout::GPOS::GPOS;
+using OT::Layout::GPOS_impl::GPOS;
 
 /**
  * SECTION:hb-subset