[native] Update GrDirectContext calls to use safer API
In http://review.skia.org/751523, Skia modified some GrDirectContext
APIs to make them less error-prone in response to https://crbug.com/1475906.
This updates part of Android to call those modified APIs.
Change-Id: Ib19a39cf937ba359b55c600a68a8f1c2266fd35a
diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp
index 1f18b94..82ee95c 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaRenderEngine.cpp
@@ -22,6 +22,7 @@
#include <GrBackendSemaphore.h>
#include <GrContextOptions.h>
+#include <GrTypes.h>
#include <SkBlendMode.h>
#include <SkCanvas.h>
#include <SkColor.h>
@@ -289,12 +290,12 @@
}
if (mGrContext) {
- mGrContext->flushAndSubmit(true);
+ mGrContext->flushAndSubmit(GrSyncCpu::kYes);
mGrContext->abandonContext();
}
if (mProtectedGrContext) {
- mProtectedGrContext->flushAndSubmit(true);
+ mProtectedGrContext->flushAndSubmit(GrSyncCpu::kYes);
mProtectedGrContext->abandonContext();
}
}
@@ -307,7 +308,7 @@
// release any scratch resources before switching into a new mode
if (getActiveGrContext()) {
- getActiveGrContext()->purgeUnlockedResources(true);
+ getActiveGrContext()->purgeUnlockedResources(GrPurgeResourceOptions::kScratchResourcesOnly);
}
// Backend-specific way to switch to protected context