Backed out changeset 4294063f1606 (bug 1688452) for causing mochitest…

… and wpt failures. CLOSED TREE
inscapist · Nov 20, 2021 · 5b58543 · 5b58543
1 parent 5dbb675
commit 5b58543
Show file tree

Hide file tree

Showing 19 changed files with 223 additions and 809 deletions.
diff --git a/config/recurse.mk b/config/recurse.mk
@@ -217,7 +217,7 @@ endif
 ifdef MOZ_USING_WASM_SANDBOXING
 security/rlbox/target-objects: config/external/wasm2c_sandbox_compiler/host
 security/rlbox/target: security/rlbox/target-objects
-dom/media/ogg/target-objects extensions/spellcheck/hunspell/glue/target-objects gfx/thebes/target-objects parser/expat/target-objects parser/htmlparser/target-objects: security/rlbox/target-objects
+dom/media/ogg/target-objects extensions/spellcheck/hunspell/glue/target-objects gfx/thebes/target-objects: security/rlbox/target-objects
 endif
 
 # Most things are built during compile (target/host), but some things happen during export

diff --git a/layout/build/moz.build b/layout/build/moz.build
@@ -51,7 +51,6 @@ LOCAL_INCLUDES += [
     "/js/xpconnect/src",
     "/netwerk/base",
     "/netwerk/cookie",
-    "/parser/htmlparser",
     "/toolkit/components/sessionstore",
     "/view",
 ]

diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
@@ -128,8 +128,6 @@
 #include "RestoreTabContentObserver.h"
 #include "mozilla/intl/nsComplexBreaker.h"
 
-#include "nsRLBoxExpatDriver.h"
-
 using namespace mozilla;
 using namespace mozilla::net;
 using namespace mozilla::dom;
@@ -296,8 +294,6 @@ nsresult nsLayoutStatics::Initialize() {
 
   ComplexBreaker::Initialize();
 
-  RLBoxExpatSandboxPool::Initialize();
-
   return NS_OK;
 }
 

diff --git a/parser/expat/expat_config.h b/parser/expat/expat_config.h
@@ -6,11 +6,18 @@
 #ifndef __expat_config_h__
 #define __expat_config_h__
 
-#ifdef MOZ_IN_WASM_SANDBOX
-#   include "expat_config_rlbox.h"
-#else
-#  include "expat_config_moz.h"
-#endif
+#define MOZ_UNICODE
+#include "nspr.h"
+
+#ifdef IS_LITTLE_ENDIAN
+#define BYTEORDER 1234
+#else 
+#define BYTEORDER 4321
+#endif /* IS_LITTLE_ENDIAN */
+
+#if PR_BYTES_PER_INT != 4
+#define int int32_t
+#endif /* PR_BYTES_PER_INT != 4 */
 
 /* Other Mozilla code relies on memmove already, so we assume it's available */
 #define HAVE_MEMMOVE 1

diff --git a/parser/expat/expat_config_moz.h b/parser/expat/expat_config_moz.h
diff --git a/parser/expat/expat_config_rlbox.h b/parser/expat/expat_config_rlbox.h
diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build
@@ -4,16 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include("sources.mozbuild")
-
 EXPORTS += [
     'expat.h',
     'expat_external.h',
 ]
 
-SOURCES += expat_sources
+SOURCES += [
+    'xmlparse.c',
+    'xmlrole.c',
+    'xmltok.c',
+]
 
 FINAL_LIBRARY = 'gkmedias'
 
-for k, v in expat_defines:
-    DEFINES[k] = v
+DEFINES['HAVE_EXPAT_CONFIG_H'] = True
diff --git a/parser/expat/lib/sources.mozbuild b/parser/expat/lib/sources.mozbuild
diff --git a/parser/expat/moz.build b/parser/expat/moz.build
@@ -11,12 +11,5 @@ DIRS += ['lib']
 
 EXPORTS += [
     'expat_config.h',
-    'expat_config_moz.h',
-    'expat_config_rlbox.h',
-    'rlbox_expat.h',
-    'rlbox_expat_types.h',
 ]
 
-LOCAL_INCLUDES += [
-    '!/security/rlbox',
-]
diff --git a/parser/expat/rlbox_expat.h b/parser/expat/rlbox_expat.h
diff --git a/parser/expat/rlbox_expat_types.h b/parser/expat/rlbox_expat_types.h
diff --git a/parser/htmlparser/moz.build b/parser/htmlparser/moz.build
@@ -29,7 +29,6 @@ EXPORTS += [
     "nsParserBase.h",
     "nsParserCIID.h",
     "nsParserConstants.h",
-    "nsRLBoxExpatDriver.h",
     "nsScannerString.h",
 ]
 
@@ -58,8 +57,4 @@ FINAL_LIBRARY = "xul"
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += ["-Wno-error=shadow"]
 
-LOCAL_INCLUDES += [
-    "!/security/rlbox",
-]
-
 REQUIRES_UNIFIED_BUILD = True