aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--experimental/skottie/Skottie.cpp12
-rw-r--r--src/core/SkColorMatrixFilterRowMajor255.cpp2
-rw-r--r--src/gpu/GrResourceProvider.cpp2
-rw-r--r--src/gpu/GrResourceProvider.h2
-rw-r--r--src/gpu/gl/GrGLAssembleInterface.cpp4
-rw-r--r--src/gpu/gl/GrGLGpu.cpp2
-rw-r--r--src/pdf/SkPDFBitmap.cpp4
-rw-r--r--src/pdf/SkPDFFormXObject.cpp2
-rw-r--r--src/pdf/SkPDFMetadata.cpp4
9 files changed, 17 insertions, 17 deletions
diff --git a/experimental/skottie/Skottie.cpp b/experimental/skottie/Skottie.cpp
index 9c5849ffa6..7486502f2e 100644
--- a/experimental/skottie/Skottie.cpp
+++ b/experimental/skottie/Skottie.cpp
@@ -140,7 +140,7 @@ sk_sp<sksg::RenderNode> AttachOpacity(const Json::Value& jtransform, AttachConte
opacityNode->setOpacity(o * 0.01f);
});
- return opacityNode;
+ return std::move(opacityNode);
}
sk_sp<sksg::RenderNode> AttachComposition(const Json::Value&, AttachContext* ctx);
@@ -182,7 +182,7 @@ sk_sp<sksg::GeometryNode> AttachRRectGeometry(const Json::Value& jrect, AttachCo
return nullptr;
}
- return rect_node;
+ return std::move(rect_node);
}
sk_sp<sksg::GeometryNode> AttachEllipseGeometry(const Json::Value& jellipse, AttachContext* ctx) {
@@ -206,7 +206,7 @@ sk_sp<sksg::GeometryNode> AttachEllipseGeometry(const Json::Value& jellipse, Att
return nullptr;
}
- return rect_node;
+ return std::move(rect_node);
}
sk_sp<sksg::GeometryNode> AttachPolystarGeometry(const Json::Value& jstar, AttachContext* ctx) {
@@ -255,7 +255,7 @@ sk_sp<sksg::GeometryNode> AttachPolystarGeometry(const Json::Value& jstar, Attac
adapter->setRotation(r);
});
- return path_node;
+ return std::move(path_node);
}
sk_sp<sksg::Color> AttachColor(const Json::Value& obj, AttachContext* ctx) {
@@ -1112,7 +1112,7 @@ sk_sp<sksg::RenderNode> AttachLayer(const Json::Value& jlayer,
layerCtx->fCurrentMatte.reset();
}
- return controller_node;
+ return std::move(controller_node);
}
sk_sp<sksg::RenderNode> AttachComposition(const Json::Value& comp, AttachContext* ctx) {
@@ -1142,7 +1142,7 @@ sk_sp<sksg::RenderNode> AttachComposition(const Json::Value& comp, AttachContext
comp_group->addChild(std::move(layers[i]));
}
- return comp_group;
+ return std::move(comp_group);
}
} // namespace
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp
index 566ca8024f..09b0e76136 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.cpp
+++ b/src/core/SkColorMatrixFilterRowMajor255.cpp
@@ -329,5 +329,5 @@ SkColorMatrixFilterRowMajor255::MakeSingleChannelOutput(const SkScalar row[5]) {
memcpy(cf->fMatrix + 5 * i, row, sizeof(SkScalar) * 5);
}
cf->initState();
- return cf;
+ return std::move(cf);
}
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index df848e8d3c..2d2b3a7bc9 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -288,7 +288,7 @@ sk_sp<const GrBuffer> GrResourceProvider::findOrMakeStaticBuffer(GrBufferType in
const void* data,
const GrUniqueKey& key) {
if (auto buffer = this->findByUniqueKey<GrBuffer>(key)) {
- return buffer;
+ return std::move(buffer);
}
if (auto buffer = this->createBuffer(size, intendedType, kStatic_GrAccessPattern, 0,
data)) {
diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/GrResourceProvider.h
index e1d85f92e4..a853f08ca3 100644
--- a/src/gpu/GrResourceProvider.h
+++ b/src/gpu/GrResourceProvider.h
@@ -142,7 +142,7 @@ public:
int vertCount,
const GrUniqueKey& key) {
if (auto buffer = this->findByUniqueKey<GrBuffer>(key)) {
- return buffer;
+ return std::move(buffer);
}
return this->createPatternedIndexBuffer(pattern, patternSize, reps, vertCount, key);
}
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 6282488389..5c5e05a166 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -411,7 +411,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g
interface->fStandard = kGL_GrGLStandard;
interface->fExtensions.swap(&extensions);
- return interface;
+ return std::move(interface);
}
sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc get) {
@@ -844,7 +844,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc
interface->fStandard = kGLES_GrGLStandard;
interface->fExtensions.swap(&extensions);
- return interface;
+ return std::move(interface);
}
SK_API const GrGLInterface* GrGLAssembleInterface(void *ctx, GrGLGetProc get) {
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 1cf60d8ffd..574dd9ae41 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -1480,7 +1480,7 @@ sk_sp<GrTexture> GrGLGpu::onCreateTexture(const GrSurfaceDesc& desc,
fHWBoundRenderTargetUniqueID.makeInvalid();
}
}
- return tex;
+ return std::move(tex);
}
namespace {
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index b575d16430..9d86d90bed 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -433,7 +433,7 @@ sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image, int encodingQua
SkISize dimensions = image->dimensions();
sk_sp<SkData> data = image->refEncodedData();
if (auto jpeg = make_jpeg_bitmap(std::move(data), dimensions)) {
- return jpeg;
+ return std::move(jpeg);
}
const bool isOpaque = image_compute_is_opaque(image.get());
@@ -441,7 +441,7 @@ sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image, int encodingQua
if (encodingQuality <= 100 && isOpaque) {
data = image->encodeToData(SkEncodedImageFormat::kJPEG, encodingQuality);
if (auto jpeg = make_jpeg_bitmap(std::move(data), dimensions)) {
- return jpeg;
+ return std::move(jpeg);
}
}
diff --git a/src/pdf/SkPDFFormXObject.cpp b/src/pdf/SkPDFFormXObject.cpp
index d0c7fe76c5..99146a29f3 100644
--- a/src/pdf/SkPDFFormXObject.cpp
+++ b/src/pdf/SkPDFFormXObject.cpp
@@ -35,5 +35,5 @@ sk_sp<SkPDFObject> SkPDFMakeFormXObject(std::unique_ptr<SkStreamAsset> content,
}
group->insertBool("I", true); // Isolated.
form->dict()->insertObject("Group", std::move(group));
- return form;
+ return std::move(form);
}
diff --git a/src/pdf/SkPDFMetadata.cpp b/src/pdf/SkPDFMetadata.cpp
index d91272cb2e..ccb3ef38b5 100644
--- a/src/pdf/SkPDFMetadata.cpp
+++ b/src/pdf/SkPDFMetadata.cpp
@@ -132,7 +132,7 @@ sk_sp<SkPDFObject> SkPDFMetadata::MakeDocumentInformationDict(
if (metadata.fModified.fEnabled) {
dict->insertString("ModDate", pdf_date(metadata.fModified.fDateTime));
}
- return dict;
+ return std::move(dict);
}
SkPDFMetadata::UUID SkPDFMetadata::CreateUUID(
@@ -184,7 +184,7 @@ sk_sp<SkPDFObject> SkPDFMetadata::MakePdfId(const UUID& doc,
SkString(reinterpret_cast<const char*>(&doc), sizeof(UUID)));
array->appendString(
SkString(reinterpret_cast<const char*>(&instance), sizeof(UUID)));
- return array;
+ return std::move(array);
}
// Convert a block of memory to hexadecimal. Input and output pointers will be
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 22:50:48 +0000