Remove usage of std::move usage for std::string_views * Michael pointed out in https://skia-review.googlesource.com/c/skia/+/1089276/comments/db266ec1_838cfddc that using std::move on string_views doesn't really offer any benefit. While it should be a no-op, removing it will cut down on confusion / redundancy. Change-Id: I019b8d598dbfbbce8d1e5a64c8ebe289362e83a6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1142776 Auto-Submit: Nicolette Prevost <nicolettep@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Thomas Smith <thomsmit@google.com> Commit-Queue: Nicolette Prevost <nicolettep@google.com>
diff --git a/src/gpu/ganesh/GrResourceProvider.cpp b/src/gpu/ganesh/GrResourceProvider.cpp index a58524b..f7598cb 100644 --- a/src/gpu/ganesh/GrResourceProvider.cpp +++ b/src/gpu/ganesh/GrResourceProvider.cpp
@@ -336,7 +336,7 @@ if (GrGpuResource* resource = fCache->findAndRefScratchResource(key)) { fGpu->stats()->incNumScratchTexturesReused(); GrSurface* surface = static_cast<GrSurface*>(resource); - resource->setLabel(std::move(label)); + resource->setLabel(label); return sk_sp<GrTexture>(surface->asTexture()); } return nullptr; @@ -822,7 +822,7 @@ if (resource) { fGpu->stats()->incNumScratchMSAAAttachmentsReused(); GrAttachment* attachment = static_cast<GrAttachment*>(resource); - resource->setLabel(std::move(label)); + resource->setLabel(label); return sk_sp<GrAttachment>(attachment); }
diff --git a/src/gpu/graphite/BufferManager.cpp b/src/gpu/graphite/BufferManager.cpp index 1e040ce..2ef9456 100644 --- a/src/gpu/graphite/BufferManager.cpp +++ b/src/gpu/graphite/BufferManager.cpp
@@ -641,7 +641,7 @@ fTotalRequiredBytes, fBufferType, gpuAccessPattern, - std::move(label)); + label); if (!staticBuffer) { SKGPU_LOG_E("Failed to create static buffer for type %d of size %u bytes.\n", (int) fBufferType, fTotalRequiredBytes);
diff --git a/src/gpu/graphite/Context.cpp b/src/gpu/graphite/Context.cpp index 1822e3f..97e66bb 100644 --- a/src/gpu/graphite/Context.cpp +++ b/src/gpu/graphite/Context.cpp
@@ -544,7 +544,7 @@ PixelTransferResult* result) { sk_sp<Surface> dstSurface = Surface::MakeScratch(recorder.get(), planeInfo, - std::move(label), + label, Budgeted::kYes, Mipmapped::kNo, SkBackingFit::kApprox);
diff --git a/src/gpu/graphite/Device.cpp b/src/gpu/graphite/Device.cpp index ae9f4e3..5969203 100644 --- a/src/gpu/graphite/Device.cpp +++ b/src/gpu/graphite/Device.cpp
@@ -428,7 +428,7 @@ return Make(recorder, TextureProxy::Make(caps, recorder->priv().resourceProvider(), - backingDimensions, textureInfo, std::move(label), budgeted), + backingDimensions, textureInfo, label, budgeted), ii.dimensions(), ii.colorInfo(), props,
diff --git a/src/gpu/graphite/ImageFactories.cpp b/src/gpu/graphite/ImageFactories.cpp index b7ce148..075aa13 100644 --- a/src/gpu/graphite/ImageFactories.cpp +++ b/src/gpu/graphite/ImageFactories.cpp
@@ -93,7 +93,7 @@ } sk_sp<Texture> texture = - recorder->priv().resourceProvider()->createWrappedTexture(backendTex, std::move(label)); + recorder->priv().resourceProvider()->createWrappedTexture(backendTex, label); if (!texture) { SKGPU_LOG_W("Texture creation failed"); return nullptr; @@ -139,7 +139,7 @@ SkImages::GenerateMipmapsFromBase::kNo, releaseP, releaseC, - std::move(label)); + label); } sk_sp<SkImage> WrapTexture(Recorder* recorder, @@ -159,7 +159,7 @@ SkImages::GenerateMipmapsFromBase::kNo, releaseP, releaseC, - std::move(label)); + label); } sk_sp<SkImage> PromiseTextureFrom(Recorder* recorder, @@ -205,7 +205,7 @@ fulfillProc, imageContext, textureReleaseProc, - std::move(label)); + label); if (!proxy) { return nullptr; }
diff --git a/src/gpu/graphite/Image_Base_Graphite.cpp b/src/gpu/graphite/Image_Base_Graphite.cpp index 28cd7d4..c4381e7 100644 --- a/src/gpu/graphite/Image_Base_Graphite.cpp +++ b/src/gpu/graphite/Image_Base_Graphite.cpp
@@ -101,7 +101,7 @@ std::string_view label) const { return CopyAsDraw(recorder, /*drawContext=*/nullptr, this, subset, this->imageInfo().colorInfo(), - budgeted, mipmapped, backingFit, std::move(label)); + budgeted, mipmapped, backingFit, label); } namespace {
diff --git a/src/gpu/graphite/Image_Graphite.cpp b/src/gpu/graphite/Image_Graphite.cpp index 7d18c8a..e2d7f3c 100644 --- a/src/gpu/graphite/Image_Graphite.cpp +++ b/src/gpu/graphite/Image_Graphite.cpp
@@ -80,7 +80,7 @@ // Copy-as-draw sk_sp<Image> srcImage(new Image(srcView, srcColorInfo)); return CopyAsDraw(recorder, drawContext, srcImage.get(), subset, srcColorInfo, - budgeted, mipmapped, backingFit, std::move(label)); + budgeted, mipmapped, backingFit, label); } skgpu::graphite::TextureInfo textureInfo = @@ -92,7 +92,7 @@ recorder->priv().resourceProvider(), backingFit == SkBackingFit::kApprox ? GetApproxSize(subset.size()) : subset.size(), textureInfo, - std::move(label), + label, budgeted); if (!dst) { return nullptr; @@ -140,7 +140,7 @@ this->notifyInUse(recorder, /*drawContext=*/nullptr); return Image::Copy(recorder, /*drawContext=*/nullptr, fTextureProxyView, this->imageInfo().colorInfo(), - subset, budgeted, mipmapped, backingFit, std::move(label)); + subset, budgeted, mipmapped, backingFit, label); } sk_sp<SkImage> Image::onReinterpretColorSpace(sk_sp<SkColorSpace> newCS) const {
diff --git a/src/gpu/graphite/Recorder.cpp b/src/gpu/graphite/Recorder.cpp index 71400f0..792b89e 100644 --- a/src/gpu/graphite/Recorder.cpp +++ b/src/gpu/graphite/Recorder.cpp
@@ -720,9 +720,7 @@ if (!recorder) { return nullptr; } - return recorder->priv().proxyCache()->findOrCreateCachedProxy(recorder, - bitmap, - std::move(label)); + return recorder->priv().proxyCache()->findOrCreateCachedProxy(recorder, bitmap, label); } size_t RecorderPriv::getResourceCacheLimit() const {
diff --git a/src/gpu/graphite/ResourceProvider.cpp b/src/gpu/graphite/ResourceProvider.cpp index b7b9b85..cd67a8a 100644 --- a/src/gpu/graphite/ResourceProvider.cpp +++ b/src/gpu/graphite/ResourceProvider.cpp
@@ -91,22 +91,14 @@ sk_sp<Texture> ResourceProvider::findOrCreateShareableTexture(SkISize dimensions, const TextureInfo& info, std::string_view label) { - return this->findOrCreateTexture(dimensions, - info, - std::move(label), - Budgeted::kYes, - Shareable::kYes); + return this->findOrCreateTexture(dimensions, info, label, Budgeted::kYes, Shareable::kYes); } sk_sp<Texture> ResourceProvider::findOrCreateNonShareableTexture(SkISize dimensions, const TextureInfo& info, std::string_view label, Budgeted budgeted) { - return this->findOrCreateTexture(dimensions, - info, - std::move(label), - budgeted, - Shareable::kNo); + return this->findOrCreateTexture(dimensions, info, label, budgeted, Shareable::kNo); } sk_sp<Texture> ResourceProvider::findOrCreateScratchTexture( @@ -114,12 +106,8 @@ const TextureInfo& info, std::string_view label, const ResourceCache::ScratchResourceSet& unavailable) { - return this->findOrCreateTexture(dimensions, - info, - std::move(label), - Budgeted::kYes, - Shareable::kScratch, - &unavailable); + return this->findOrCreateTexture( + dimensions, info, label, Budgeted::kYes, Shareable::kScratch, &unavailable); } sk_sp<Texture> ResourceProvider::findOrCreateTexture( @@ -151,7 +139,7 @@ if (shareable == Shareable::kYes) { SkASSERT(resource->getLabel() == label); } else { - resource->setLabel(std::move(label)); + resource->setLabel(label); } return sk_sp<Texture>(static_cast<Texture*>(resource)); } @@ -161,7 +149,7 @@ return nullptr; } - tex->setLabel(std::move(label)); + tex->setLabel(label); fResourceCache->insertResource(tex.get(), key, budgeted, shareable); return tex; @@ -171,7 +159,7 @@ std::string_view label) { sk_sp<Texture> texture = this->onCreateWrappedTexture(backendTexture); if (texture) { - texture->setLabel(std::move(label)); + texture->setLabel(label); SkASSERT(texture->ownership() == Ownership::kWrapped); } return texture; @@ -270,7 +258,7 @@ if (shareable == Shareable::kYes) { SkASSERT(resource->getLabel() == label); } else { - resource->setLabel(std::move(label)); + resource->setLabel(label); } return sk_sp<Buffer>(static_cast<Buffer*>(resource)); } @@ -279,7 +267,7 @@ return nullptr; } - buffer->setLabel(std::move(label)); + buffer->setLabel(label); fResourceCache->insertResource(buffer.get(), key, kBudgeted, shareable); return buffer; }
diff --git a/src/gpu/graphite/Surface_Graphite.cpp b/src/gpu/graphite/Surface_Graphite.cpp index ad3a9cc..2780793 100644 --- a/src/gpu/graphite/Surface_Graphite.cpp +++ b/src/gpu/graphite/Surface_Graphite.cpp
@@ -146,7 +146,7 @@ backingFit, SkSurfacePropsCopyOrDefault(props), initialLoadOp, - std::move(label), + label, registerWithRecorder); if (!device) { return nullptr; @@ -237,7 +237,7 @@ label = "SkSurfaceRenderTarget"; } // The client is getting the ref on this surface so it must be unbudgeted. - return skgpu::graphite::Surface::Make(recorder, info, std::move(label), skgpu::Budgeted::kNo, + return skgpu::graphite::Surface::Make(recorder, info, label, skgpu::Budgeted::kNo, mipmapped, SkBackingFit::kExact, props); } @@ -271,7 +271,7 @@ } sk_sp<Texture> texture = - recorder->priv().resourceProvider()->createWrappedTexture(backendTex, std::move(label)); + recorder->priv().resourceProvider()->createWrappedTexture(backendTex, label); if (!texture) { return nullptr; }
diff --git a/src/gpu/graphite/Surface_Graphite.h b/src/gpu/graphite/Surface_Graphite.h index 226bf18..0797d0e 100644 --- a/src/gpu/graphite/Surface_Graphite.h +++ b/src/gpu/graphite/Surface_Graphite.h
@@ -35,7 +35,7 @@ Mipmapped mipmapped = Mipmapped::kNo, SkBackingFit backingFit = SkBackingFit::kExact, const SkSurfaceProps* props = nullptr) { - return Make(recorder, info, std::move(label), budgeted, mipmapped, backingFit, props, + return Make(recorder, info, label, budgeted, mipmapped, backingFit, props, LoadOp::kClear, /*registerWithRecorder=*/true); } // Make a surface that is not registered with the provided recorder. This surface should be @@ -48,7 +48,7 @@ Budgeted budgeted = Budgeted::kYes, Mipmapped mipmapped = Mipmapped::kNo, SkBackingFit backingFit = SkBackingFit::kApprox) { - return Make(recorder, info, std::move(label), budgeted, mipmapped, backingFit, + return Make(recorder, info, label, budgeted, mipmapped, backingFit, /*props=*/nullptr, LoadOp::kDiscard, /*registerWithRecorder=*/false); }
diff --git a/src/gpu/graphite/TextureProxy.cpp b/src/gpu/graphite/TextureProxy.cpp index a68c1b9..406dafc 100644 --- a/src/gpu/graphite/TextureProxy.cpp +++ b/src/gpu/graphite/TextureProxy.cpp
@@ -168,10 +168,7 @@ return nullptr; } - sk_sp<TextureProxy> proxy{new TextureProxy(dimensions, - textureInfo, - std::move(label), - budgeted)}; + sk_sp<TextureProxy> proxy {new TextureProxy(dimensions, textureInfo, label, budgeted)}; if (budgeted == Budgeted::kNo) { // Instantiate immediately to avoid races later on if the client starts to use the wrapping // object on multiple threads.
diff --git a/src/gpu/graphite/TextureUtils.cpp b/src/gpu/graphite/TextureUtils.cpp index f7c72b6..839ae54 100644 --- a/src/gpu/graphite/TextureUtils.cpp +++ b/src/gpu/graphite/TextureUtils.cpp
@@ -77,12 +77,8 @@ // TODO(b/323886870): Historically the scratch surfaces used here were exact-fit but they should // be able to be approx-fit and uninstantiated. - return Surface::MakeScratch(recorder, - info.makeColorType(ct), - std::move(label), - Budgeted::kYes, - Mipmapped::kNo, - backingFit); + return Surface::MakeScratch( + recorder, info.makeColorType(ct), label, Budgeted::kYes, Mipmapped::kNo, backingFit); } bool valid_client_provided_image(const SkImage* clientProvided, @@ -249,7 +245,7 @@ recorder->priv().resourceProvider(), bmpToUpload.dimensions(), textureInfo, - std::move(label), + label, budgeted); if (!proxy) { return {}; @@ -306,7 +302,7 @@ } PromiseLazyInstantiateCallback callback{std::move(releaseHelper), fulfillProc, - fulfillContext, textureReleaseProc, std::move(label)}; + fulfillContext, textureReleaseProc, label}; // Proxies for promise images are assumed to always be destined for a client's SkImage so // are never considered budgeted. return TextureProxy::MakeLazy(caps, dimensions, textureInfo, Budgeted::kNo, isVolatile, @@ -321,12 +317,8 @@ SkImage::RequiredProperties requiredProps, std::string_view label) { auto mm = requiredProps.fMipmapped ? Mipmapped::kYes : Mipmapped::kNo; - auto [view, ct] = MakeBitmapProxyView(recorder, - bitmap, - std::move(mipmaps), - mm, - budgeted, - std::move(label)); + auto [view, ct] = + MakeBitmapProxyView(recorder, bitmap, std::move(mipmaps), mm, budgeted, label); if (!view) { return nullptr; } @@ -378,12 +370,8 @@ .makeAlphaType(kPremul_SkAlphaType)); // The surface goes out of scope when we return, so it can be scratch, but it may or may // not be budgeted depending on how the copied image is used (or returned to the client). - sk_sp<Surface> surface = Surface::MakeScratch(recorder, - dstInfo, - std::move(label), - budgeted, - mipmapped, - backingFit); + sk_sp<Surface> surface = + Surface::MakeScratch(recorder, dstInfo, label, budgeted, mipmapped, backingFit); if (!surface) { return nullptr; }
diff --git a/src/gpu/graphite/UploadBufferManager.cpp b/src/gpu/graphite/UploadBufferManager.cpp index 61e1a3b..90cf954 100644 --- a/src/gpu/graphite/UploadBufferManager.cpp +++ b/src/gpu/graphite/UploadBufferManager.cpp
@@ -53,7 +53,7 @@ requiredBytes32, BufferType::kXferCpuToGpu, AccessPattern::kHostVisible, - std::move(label)); + label); void* bufferMapPtr = buffer ? buffer->map() : nullptr; if (!bufferMapPtr) { // Unlike [Draw|Static]BufferManager, the UploadManager does not track if any buffer @@ -84,7 +84,7 @@ kReusedBufferSize, BufferType::kXferCpuToGpu, AccessPattern::kHostVisible, - std::move(label)); + label); fReusedBufferOffset = 0; if (!fReusedBuffer || !fReusedBuffer->map()) { fReusedBuffer = nullptr;
diff --git a/src/gpu/graphite/dawn/DawnResourceProvider.cpp b/src/gpu/graphite/dawn/DawnResourceProvider.cpp index c919807..92e1226 100644 --- a/src/gpu/graphite/dawn/DawnResourceProvider.cpp +++ b/src/gpu/graphite/dawn/DawnResourceProvider.cpp
@@ -614,8 +614,7 @@ BufferType type, AccessPattern accessPattern, std::string_view label) { - sk_sp<Buffer> buffer = this->findOrCreateNonShareableBuffer( - size, type, accessPattern, std::move(label)); + sk_sp<Buffer> buffer = this->findOrCreateNonShareableBuffer(size, type, accessPattern, label); DawnBuffer* ptr = static_cast<DawnBuffer*>(buffer.release()); return sk_sp<DawnBuffer>(ptr); }