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]>

Author: drWulf

include/core/SkCanvas.h

@@ -2586,6 +2586,8 @@ 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,
@@ -2602,15 +2604,7 @@ class SK_API SkCanvas {
     void predrawNotify(bool willOverwritesEntireSurface = false);
     void predrawNotify(const SkRect* rect, const SkPaint* paint, ShaderOverrideOpacity);
 
-    // 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;
+    SkBaseDevice* getDevice() const;
 
     class MCRec;