Roll ANGLE

https://chromium.googlesource.com/angle/angle.git/+log/cce8965d2c58..878c8b1e5e89

ANGLE now crashes (on program compilation) if there isn't a flush between uses of different flavors of ANGLE context (e.g., angle_gl_es2 vs. angle_gl_es3).

Change-Id: If59b6ec683e682db5214bb002a70863cee5fe013
Reviewed-on: https://skia-review.googlesource.com/28865
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

2 files changed, 3 insertions, 1 deletions

diff --git a/DEPS b/DEPS
index 6e251261ba..52cae7da9e 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@ use_relative_paths = True
 deps = {
   "buildtools"                          : "https://chromium.googlesource.com/chromium/buildtools.git@e6b510a9daf822bbe9f922c200c58150803d2fd8",
   "common"                              : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92",
-  "third_party/externals/angle2"        : "https://chromium.googlesource.com/angle/angle.git@cce8965d2c58daefb067c5de32b13ed0ffa3abe4",
+  "third_party/externals/angle2"        : "https://chromium.googlesource.com/angle/angle.git@878c8b1e5e89dc6cded6566e7e2fa2272afadb19",
   "third_party/externals/dng_sdk"       : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
   "third_party/externals/expat"         : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55",
   "third_party/externals/freetype"      : "https://skia.googlesource.com/third_party/freetype2.git@447a0b62634802d8acdb56008cff5ff4e50be244",
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 8be3fbc05e..a677cae235 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1450,11 +1450,13 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex
         ReporterContext ctx(reporter, SkString(GrContextFactory::ContextTypeName(contextType)));
         if (ctxInfo.grContext()) {
             (*test)(reporter, ctxInfo);
+            ctxInfo.grContext()->flush();
         }
         ctxInfo = factory->getContextInfo(contextType,
                                           GrContextFactory::ContextOverrides::kRequireNVPRSupport);
         if (ctxInfo.grContext()) {
             (*test)(reporter, ctxInfo);
+            ctxInfo.grContext()->flush();
         }
     }
 #endif