Reland "Rename getTopDevice/getDevice to topDevice/baseDevice"

This reverts commit d8b939e.

Reason for revert: fix SkAndroidFrameworkUtils getDevice() reference

Original change's description:
> Revert "Rename getTopDevice/getDevice to topDevice/baseDevice"
>
> This reverts commit 632a23a.
>
> Reason for revert: breaking android roll
>
> Original change's description:
> > Rename getTopDevice/getDevice to topDevice/baseDevice
> >
> > This addresses nit from https://skia-review.googlesource.com/c/skia/+/344663
> > and also moves topDevice() to be private, since it's not really meant
> > for arbitrary subclasses to access anyways. Classes outside of SkCanvas
> > that need topDevice/baseDevice are already friended anyways.
> >
> > Bug: skia:10987
> > Change-Id: Ib0b0dffb5b1c35d5a0c78aeb8903e4cf0b8810a9
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344960
> > Reviewed-by: Mike Klein <[email protected]>
> > Reviewed-by: Mike Reed <[email protected]>
> > Commit-Queue: Michael Ludwig <[email protected]>
>
> [email protected],[email protected],[email protected]
>
> Change-Id: I9b70230f7db5d31cede2ea03e7abc7c154021204
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10987
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345158
> Reviewed-by: Derek Sollenberger <[email protected]>
> Commit-Queue: Derek Sollenberger <[email protected]>

[email protected],[email protected],[email protected],[email protected]

# Not skipping CQ checks because this is a reland.

Bug: skia:10987
Change-Id: Ibf6397b54655c25ef3d348210de5eb6dab416723
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345165
Reviewed-by: Michael Ludwig <[email protected]>
Commit-Queue: Michael Ludwig <[email protected]>

Author: lhkbob

include/core/SkCanvas.h

@@ -2573,8 +2573,6 @@ class SK_API SkCanvas {
     bool clipRectBounds(const SkRect* bounds, SkIRect* intersection,
                         const SkImageFilter* imageFilter = nullptr);
 
-    SkBaseDevice* getTopDevice() const;
-
 private:
     static void DrawDeviceWithFilter(SkBaseDevice* src, const SkImageFilter* filter,
                                      SkBaseDevice* dst, const SkIPoint& dstOrigin,
@@ -2591,7 +2589,15 @@ class SK_API SkCanvas {
     void predrawNotify(bool willOverwritesEntireSurface = false);
     void predrawNotify(const SkRect* rect, const SkPaint* paint, ShaderOverrideOpacity);
 
-    SkBaseDevice* getDevice() const;
+    // The bottom-most device in the stack, only changed by init(). Image properties and the final
+    // canvas pixels are determined by this device.
+    SkBaseDevice* baseDevice();
+    const SkBaseDevice* baseDevice() const;
+
+    // The top-most device in the stack, will change within saveLayer()'s. All drawing and clipping
+    // operations should route to this device.
+    SkBaseDevice* topDevice();
+    const SkBaseDevice* topDevice() const;
 
     class MCRec;
 

src/android/SkAndroidFrameworkUtils.cpp

@@ -17,8 +17,7 @@
 
 #if SK_SUPPORT_GPU
 bool SkAndroidFrameworkUtils::clipWithStencil(SkCanvas* canvas) {
-    SkBaseDevice* device = canvas->getDevice();
-    return device && device->android_utils_clipWithStencil();
+    return canvas->baseDevice()->android_utils_clipWithStencil();
 }
 #endif