Remove some uses of const& SkIRect and SkISize
Change-Id: I8f8cc82e6e9fcc8e3728c5acb1a2e345c04fef22
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/585963
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/graphite/Surface_Graphite.cpp b/src/gpu/graphite/Surface_Graphite.cpp
index 2577a50..45acc42 100644
--- a/src/gpu/graphite/Surface_Graphite.cpp
+++ b/src/gpu/graphite/Surface_Graphite.cpp
@@ -65,7 +65,7 @@
}
void Surface::onAsyncRescaleAndReadPixels(const SkImageInfo& info,
- const SkIRect& srcRect,
+ SkIRect srcRect,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
@@ -80,8 +80,8 @@
void Surface::onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace yuvColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
diff --git a/src/gpu/graphite/Surface_Graphite.h b/src/gpu/graphite/Surface_Graphite.h
index bd93d19..c04477d 100644
--- a/src/gpu/graphite/Surface_Graphite.h
+++ b/src/gpu/graphite/Surface_Graphite.h
@@ -33,15 +33,15 @@
sk_sp<SkImage> onNewImageSnapshot(const SkIRect* subset) override;
void onWritePixels(const SkPixmap&, int x, int y) override;
void onAsyncRescaleAndReadPixels(const SkImageInfo& info,
- const SkIRect& srcRect,
+ SkIRect srcRect,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
ReadPixelsContext context) override;
void onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace yuvColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma rescaleGamma,
RescaleMode,
ReadPixelsCallback callback,
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index ef8857e..f8fcc8f 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -275,7 +275,7 @@
}
void SkImage_Base::onAsyncRescaleAndReadPixels(const SkImageInfo& info,
- const SkIRect& origSrcRect,
+ SkIRect origSrcRect,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
@@ -302,8 +302,8 @@
void SkImage_Base::onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma,
RescaleMode,
ReadPixelsCallback callback,
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index c0e9f2e..4bd16c1 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -66,7 +66,7 @@
* Default implementation does a rescale/read and then calls the callback.
*/
virtual void onAsyncRescaleAndReadPixels(const SkImageInfo&,
- const SkIRect& srcRect,
+ SkIRect srcRect,
RescaleGamma,
RescaleMode,
ReadPixelsCallback,
@@ -76,8 +76,8 @@
*/
virtual void onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma,
RescaleMode,
ReadPixelsCallback,
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 90f1be3..f6ce9af 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -332,7 +332,7 @@
}
void SkImage_Gpu::onAsyncRescaleAndReadPixels(const SkImageInfo& info,
- const SkIRect& srcRect,
+ SkIRect srcRect,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
@@ -354,8 +354,8 @@
void SkImage_Gpu::onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace yuvColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index 001beb7..b47c6f0 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -56,7 +56,7 @@
sk_sp<SkImage> onReinterpretColorSpace(sk_sp<SkColorSpace>) const final;
void onAsyncRescaleAndReadPixels(const SkImageInfo&,
- const SkIRect& srcRect,
+ SkIRect srcRect,
RescaleGamma,
RescaleMode,
ReadPixelsCallback,
@@ -64,8 +64,8 @@
void onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace,
sk_sp<SkColorSpace>,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma,
RescaleMode,
ReadPixelsCallback,
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp
index 3ece583..ec1b2a7 100644
--- a/src/image/SkSurface.cpp
+++ b/src/image/SkSurface.cpp
@@ -85,7 +85,7 @@
}
void SkSurface_Base::onAsyncRescaleAndReadPixels(const SkImageInfo& info,
- const SkIRect& origSrcRect,
+ SkIRect origSrcRect,
SkSurface::RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
SkSurface::ReadPixelsCallback callback,
@@ -110,8 +110,8 @@
}
void SkSurface_Base::onAsyncRescaleAndReadPixelsYUV420(
- SkYUVColorSpace yuvColorSpace, sk_sp<SkColorSpace> dstColorSpace, const SkIRect& srcRect,
- const SkISize& dstSize, RescaleGamma rescaleGamma, RescaleMode,
+ SkYUVColorSpace yuvColorSpace, sk_sp<SkColorSpace> dstColorSpace, SkIRect srcRect,
+ SkISize dstSize, RescaleGamma rescaleGamma, RescaleMode,
ReadPixelsCallback callback, ReadPixelsContext context) {
// TODO: Call non-YUV asyncRescaleAndReadPixels and then make our callback convert to YUV and
// call client's callback.
diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h
index 9ccd062..da41a88 100644
--- a/src/image/SkSurface_Base.h
+++ b/src/image/SkSurface_Base.h
@@ -72,7 +72,7 @@
* Default implementation does a rescale/read and then calls the callback.
*/
virtual void onAsyncRescaleAndReadPixels(const SkImageInfo&,
- const SkIRect& srcRect,
+ const SkIRect srcRect,
RescaleGamma,
RescaleMode,
ReadPixelsCallback,
@@ -82,8 +82,8 @@
*/
virtual void onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma,
RescaleMode,
ReadPixelsCallback,
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 7eff803..01b3b67 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -159,7 +159,7 @@
}
void SkSurface_Gpu::onAsyncRescaleAndReadPixels(const SkImageInfo& info,
- const SkIRect& srcRect,
+ SkIRect srcRect,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
@@ -174,8 +174,8 @@
void SkSurface_Gpu::onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace yuvColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma rescaleGamma,
RescaleMode rescaleMode,
ReadPixelsCallback callback,
diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h
index 4a7bc42..9096c9a 100644
--- a/src/image/SkSurface_Gpu.h
+++ b/src/image/SkSurface_Gpu.h
@@ -32,14 +32,14 @@
sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override;
sk_sp<SkImage> onNewImageSnapshot(const SkIRect* subset) override;
void onWritePixels(const SkPixmap&, int x, int y) override;
- void onAsyncRescaleAndReadPixels(const SkImageInfo& info, const SkIRect& srcRect,
+ void onAsyncRescaleAndReadPixels(const SkImageInfo& info, SkIRect srcRect,
RescaleGamma rescaleGamma, RescaleMode,
ReadPixelsCallback callback,
ReadPixelsContext context) override;
void onAsyncRescaleAndReadPixelsYUV420(SkYUVColorSpace yuvColorSpace,
sk_sp<SkColorSpace> dstColorSpace,
- const SkIRect& srcRect,
- const SkISize& dstSize,
+ SkIRect srcRect,
+ SkISize dstSize,
RescaleGamma rescaleGamma,
RescaleMode,
ReadPixelsCallback callback,
