commit e55e56038cf443251b6e8a85b431df85828067cc
author Florin Malita <fmalita@chromium.org> Fri May 01 09:33:49 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 01 16:35:32 2020 +0000
tree 53562dc2dd25cfc28aac6db3cc3325e9064bb6d8
parent ef41d500cc2ec4f587cbda0e0c47de59aaac3d04

Hoist pixel geometry adjustments out of SkBaseDevice::CreateInfo()

We only call CreateInfo() from internalSaveLayer(), and always pass
kNever_TileUsage.  Move the related pixel geo override to
internalSaveLayer, and remove CreateInfo::AdjustPixelGeometry().

(also swap the args order to "prove" we're covering all callers)

NOTREECHECKS=true
Change-Id: Ie11c3f501d262f070cf97797cb549d3afa87d679
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/286876
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 3b6abc0..d5e9ae0 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1167,12 +1167,17 @@
     sk_sp<SkBaseDevice> newDevice;
     {
         SkASSERT(info.alphaType() != kOpaque_SkAlphaType);
-        const SkBaseDevice::TileUsage usage = SkBaseDevice::kNever_TileUsage;
+
+        // TODO: reinstate kPreserveLCDText_SaveLayerFlag
+        geo = kUnknown_SkPixelGeometry;
+
         const bool trackCoverage =
                 SkToBool(saveLayerFlags & kMaskAgainstCoverage_EXPERIMENTAL_DONT_USE_SaveLayerFlag);
-        const SkBaseDevice::CreateInfo createInfo = SkBaseDevice::CreateInfo(info, usage, geo,
-                                                                             trackCoverage,
-                                                                             fAllocator.get());
+        const auto createInfo = SkBaseDevice::CreateInfo(info,
+                                                         geo,
+                                                         SkBaseDevice::kNever_TileUsage,
+                                                         trackCoverage,
+                                                         fAllocator.get());
         newDevice.reset(priorDevice->onCreateDevice(createInfo, paint));
         if (!newDevice) {
             return;