commit aebe4390af5cff0ab5d8165920cc8c6a9f21847f
author Mike Reed <reed@google.com> Fri Dec 20 14:59:49 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 20 20:31:08 2019 +0000
tree 8fb5286b8003d526079974b7cb2203a95e6aed7d
parent c15afe488bfa692f1a9c8fef371653646057a12a

move clip-stencil function into GpuDevice

Will follow-up with a change that doesn't use SkRegions!

Note:

The previous code flow gathered a region for all devices (in the canvas method).
However, it only tried to draw into the top device. The new code just focuses on
the top device, which ought to give the same results.

Change-Id: Ic5ed47e7908d646700c09b10faa538415522c645
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261283
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/android/SkAndroidFrameworkUtils.cpp

diff --git a/src/android/SkAndroidFrameworkUtils.cpp b/src/android/SkAndroidFrameworkUtils.cpp
index d5d5333..a7ea2ea 100644
--- a/src/android/SkAndroidFrameworkUtils.cpp
+++ b/src/android/SkAndroidFrameworkUtils.cpp
@@ -11,50 +11,16 @@
 #include "src/core/SkDevice.h"
 #include "src/image/SkSurface_Base.h"
 
-#if SK_SUPPORT_GPU
-#include "src/gpu/GrClip.h"
-#include "src/gpu/GrRenderTargetContext.h"
-#include "src/gpu/GrStyle.h"
-#include "src/gpu/GrUserStencilSettings.h"
-#include "src/gpu/effects/GrDisableColorXP.h"
-#endif //SK_SUPPORT_GPU
-
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 #include <log/log.h>
 
 #if SK_SUPPORT_GPU
 bool SkAndroidFrameworkUtils::clipWithStencil(SkCanvas* canvas) {
-    SkRegion clipRegion;
-    canvas->temporary_internal_getRgnClip(&clipRegion);
-    if (clipRegion.isEmpty()) {
-        return false;
-    }
     SkBaseDevice* device = canvas->getDevice();
-    if (!device) {
-        return false;
-    }
-    GrRenderTargetContext* rtc = device->accessRenderTargetContext();
-    if (!rtc) {
-        return false;
-    }
-    GrPaint grPaint;
-    grPaint.setXPFactory(GrDisableColorXPFactory::Get());
-    GrNoClip noClip;
-    static constexpr GrUserStencilSettings kDrawToStencil(
-        GrUserStencilSettings::StaticInit<
-            0x1,
-            GrUserStencilTest::kAlways,
-            0x1,
-            GrUserStencilOp::kReplace,
-            GrUserStencilOp::kReplace,
-            0x1>()
-    );
-    rtc->drawRegion(noClip, std::move(grPaint), GrAA::kNo, SkMatrix::I(), clipRegion,
-                    GrStyle::SimpleFill(), &kDrawToStencil);
-    return true;
+    return device && device->android_utils_clipWithStencil();
 }
-#endif //SK_SUPPORT_GPU
+#endif
 
 void SkAndroidFrameworkUtils::SafetyNetLog(const char* bugNumber) {
     android_errorWriteLog(0x534e4554, bugNumber);