Revert of skia: ANGLE deps roll (patchset #1 id:1 of https://codereview.chromium...

Reason for revert:
Compile error that the try bots didn't catch :(

Original issue's description:
> ANGLE deps roll
>
> If we ever want to allow the command buffer as a skia gles2 backend,
> we need a more up to date version of ANGLE, specifically there are
> 4 defines that differ between newer and older versions of ANGLE which
> we use in skia, I've updated these in this change.
>
> I'm not quite sure if what I've done for the 'angle_path' is correct,
> I tried setting it to a path relative to skia, and to '<(DEPTH)', both
> of which do not compile correctly, only '../' worked.
>
> Committed: https://skia.googlesource.com/skia/+/db0b1e796ddbd08e6be8a666537318b1c0e2ce56

TBR=bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1245223007

diff --git a/DEPS b/DEPS
index 56d40a1d40f028b44b7d61c34d62edfa9a9c991e..a26db2d95c59780af9dab808fd6c95a9fa468959 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ deps = {
   # There is some duplication here that might be worth cleaning up:
   #   - can use use our existing t_p/e/libjpeg instead of pulling it for Android?
 
-  "third_party/externals/angle2"  : "https://chromium.googlesource.com/angle/angle.git@44897140a2ae07dc5ba88190100179baa6fe7914",
+  "third_party/externals/angle2"  : "https://chromium.googlesource.com/angle/angle.git@c415283b2bcd786e1a8c55c19ef3511eb2b3928c",
   "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
   "third_party/externals/gyp"     : "https://chromium.googlesource.com/external/gyp.git@08429da7955a98ef764fafa223dd7de73f654b2d",
   "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35",

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 10b465ac8eb6f4cc7aa926fa71b2450f69fd2e9b..dd6465325e766e317e40d48a057f922e8ecb3ce3 100644 (file)
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -36,7 +36,6 @@
   # which deals with these same constraints in a similar manner.
   #
   'variables': {  # level 1
-    'angle_path%': '../',
     'variables': {  # level 2
 
       # Variables needed by conditions list within the level-2 variables dict.

diff --git a/src/gpu/gl/angle/SkANGLEGLContext.cpp b/src/gpu/gl/angle/SkANGLEGLContext.cpp
index fec23e63e84f982a3e215b93f3e32b4ce55357a3..f6321988aa552f3cd23bf240ebd52935e736897d 100644 (file)
--- a/src/gpu/gl/angle/SkANGLEGLContext.cpp
+++ b/src/gpu/gl/angle/SkANGLEGLContext.cpp
@@ -10,10 +10,10 @@
 
 #include <EGL/egl.h>
 
-#define EGL_PLATFORM_ANGLE_ANGLE                0x3202
-#define EGL_PLATFORM_ANGLE_TYPE_ANGLE           0x3203
-#define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE      0x3207
-#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE     0x3208
+#define EGL_PLATFORM_ANGLE_ANGLE                0x3201
+#define EGL_PLATFORM_ANGLE_TYPE_ANGLE           0x3202
+#define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE      0x3206
+#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE     0x3207
 
 void* SkANGLEGLContext::GetD3DEGLDisplay(void* nativeDisplay) {