angle.patch

diff --git a/BUILD.gn b/BUILD.gn
index 595e09a71c..0e00ce2cd1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -356,10 +356,7 @@ config("extra_warnings") {
       "-Wconditional-uninitialized",
       "-Wextra-semi-stmt",
       "-Wfloat-conversion",
-      "-Winconsistent-missing-destructor-override",
-      "-Wmissing-field-initializers",
       "-Wnewline-eof",
-      "-Wnon-virtual-dtor",
       "-Wredundant-parens",
       "-Wreturn-std-move",
       "-Wshadow",
@@ -368,7 +365,6 @@ config("extra_warnings") {
       "-Wundefined-reinterpret-cast",
       "-Wunneeded-internal-declaration",
       "-Wunused-but-set-variable",
-      "-Wsuggest-destructor-override",
       "-Wsuggest-override",
 
       # The below warnings are used by WebKit. We enable them to make rolling
@@ -378,6 +374,12 @@ config("extra_warnings") {
       "-Wstrict-prototypes",
       "-Wunreachable-code-aggressive",
       "-Wshorten-64-to-32",
+
+      "-Wno-header-hygiene",
+      "-Wno-ignored-attributes",
+      "-Wno-reorder-ctor",
+      "-Wno-unused-private-field",
+      "-Wno-unused-variable",
     ]
   }
 
diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni
index ce5ab0ba89..3c7e3fbea5 100644
--- a/src/libGLESv2.gni
+++ b/src/libGLESv2.gni
@@ -146,11 +146,7 @@ if (is_apple) {
 
 if (is_win) {
   libangle_common_sources += [ "src/common/system_utils_win.cpp" ]
-  if (angle_is_winuwp) {
-    libangle_common_sources += [ "src/common/system_utils_winuwp.cpp" ]
-  } else {
-    libangle_common_sources += [ "src/common/system_utils_win32.cpp" ]
-  }
+  libangle_common_sources += [ "src/common/system_utils_win32.cpp" ]
 }
 
 libangle_image_util_headers = [
diff --git a/src/common/system_utils_win.cpp b/src/common/system_utils_win.cpp
index 6a653ac339..a433189712 100644
--- a/src/common/system_utils_win.cpp
+++ b/src/common/system_utils_win.cpp
@@ -6,6 +6,10 @@
 
 // system_utils_win.cpp: Implementation of OS-specific functions for Windows
 
+#if defined(ANGLE_IS_WINUWP)
+#    undef ANGLE_IS_WINUWP
+#endif
+
 #include "system_utils.h"
 
 #include <fileapi.h>
diff --git a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
index 471d942c60..f7ae59f49b 100644
--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -11,6 +11,10 @@
 #    pragma allow_unsafe_buffers
 #endif
 
+#if defined(ANGLE_ENABLE_WINDOWS_UWP)
+#    undef ANGLE_ENABLE_WINDOWS_UWP
+#endif
+
 #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
 
 #include <algorithm>
diff --git a/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp b/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
index ac6d9a5220..62b0b1853d 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
@@ -6,6 +6,10 @@
 
 // Trim11.cpp: Trim support utility class.
 
+#if defined(ANGLE_ENABLE_WINDOWS_UWP)
+#    undef ANGLE_ENABLE_WINDOWS_UWP
+#endif
+
 #include "libANGLE/renderer/d3d/d3d11/Trim11.h"
 #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
 #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
 
diff --git a/src/common/system_utils_winuwp.cpp b/src/common/system_utils_winuwp.cpp
index a0ed2c821b..a715a6c97e 100644
--- a/src/common/system_utils_winuwp.cpp
+++ b/src/common/system_utils_winuwp.cpp
@@ -6,6 +6,10 @@
 
 // system_utils_winuwp.cpp: Implementation of OS-specific functions for Windows UWP
 
+#ifdef UNSAFE_BUFFERS_BUILD
+#    pragma allow_unsafe_buffers
+#endif
+
 #include "common/debug.h"
 #include "system_utils.h"
 
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
index 8b724762d5..ac3340e81c 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
@@ -9,6 +9,7 @@
 
 #include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
 #include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
+#include <cmath>
 
 namespace rx
 {
@@ -291,6 +292,6 @@ RECT InspectableNativeWindow::clientRect(const Size &size)
 {
     // We don't have to check if a swapchain scale was specified here; the default value is 1.0f
     // which will have no effect.
-    return {0, 0, lround(size.Width * mSwapChainScale), lround(size.Height * mSwapChainScale)};
+    return {0, 0, std::lround(size.Width * mSwapChainScale), std::lround(size.Height * mSwapChainScale)};
 }
 }  // namespace rx