Restore squash commit d75c2e9 (woff2)

It seems to have been rewritten incorrectly as commit ff25e5b (even though the message of commit eb5a36d references d75c2e9).
TyHolc · Sep 14, 2023 · 0f2376d · 0f2376d
2 parents a8bd2c3 + e7749ff
commit 0f2376d
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 38 deletions.
diff --git a/third_party/woff2/METADATA b/third_party/woff2/METADATA
@@ -12,6 +12,7 @@ third_party {
     value: "https://github.com/google/woff2.git"
   }
   version: "1bccf208bca986e53a647dfe4811322adb06ecf8"
+  # from https://chromium.googlesource.com/chromium/src/+/87.0.4280.142/third_party/woff2/README.chromium#3
   last_upgrade_date {
     year: 2017
     month: 11

diff --git a/third_party/woff2/README.cobalt b/third_party/woff2/README.cobalt
diff --git a/third_party/woff2/src/buffer.h b/third_party/woff2/src/buffer.h
@@ -39,11 +39,11 @@ typedef unsigned __int64 uint64_t;
 #define woff2_htons(x) htons (x)
 #endif
 
-#include <cstring>
 #define MEMCPY_BUFFER std::memcpy
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <limits>
 
 namespace woff2 {

diff --git a/third_party/woff2/src/font.cc b/third_party/woff2/src/font.cc
@@ -10,12 +10,6 @@
 
 #include <algorithm>
 
-#if !defined(STARBOARD)
-#include <string.h>
-#else
-#include "starboard/client_porting/poem/string_poem.h"
-#endif
-
 #include "./buffer.h"
 #include "./port.h"
 #include "./store_bytes.h"

diff --git a/third_party/woff2/src/glyph.cc b/third_party/woff2/src/glyph.cc
@@ -8,9 +8,8 @@
 
 #include "./glyph.h"
 
-#include <limits>
 #include <stdlib.h>
-
+#include <limits>
 #include "./buffer.h"
 #include "./store_bytes.h"
 

diff --git a/third_party/woff2/src/normalize.cc b/third_party/woff2/src/normalize.cc
@@ -11,12 +11,6 @@
 #include <inttypes.h>
 #include <stddef.h>
 
-#if !defined(STARBOARD)
-#include <cstring>
-#else
-#include "starboard/client_porting/poem/string_poem.h"
-#endif
-
 #include "./buffer.h"
 #include "./port.h"
 #include "./font.h"

diff --git a/third_party/woff2/src/store_bytes.h b/third_party/woff2/src/store_bytes.h
@@ -12,8 +12,7 @@
 
 #include <inttypes.h>
 #include <stddef.h>
-
-#include <cstring>
+#include <string.h>
 #define MEMCPY_STORE_BYTES memcpy
 
 #include "./port.h"

diff --git a/third_party/woff2/src/transform.cc b/third_party/woff2/src/transform.cc
@@ -10,12 +10,6 @@
 
 #include <complex>  // for std::abs
 
-#if !defined(STARBOARD)
-#include <cstring>
-#else
-#include "starboard/client_porting/poem/string_poem.h"
-#endif
-
 #include "./buffer.h"
 #include "./font.h"
 #include "./glyph.h"

diff --git a/third_party/woff2/src/woff2_dec.cc b/third_party/woff2/src/woff2_dec.cc
@@ -8,6 +8,7 @@
 
 #include <woff2/decode.h>
 
+#include <stdlib.h>
 #include <algorithm>
 #include <complex>
 #include <cstring>
@@ -16,7 +17,6 @@
 #include <vector>
 #include <map>
 #include <memory>
-#include <stdlib.h>
 #include <utility>
 
 #include <brotli/decode.h>