Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4518)

Unified Diff: cc/tiles/gpu_image_decode_controller.cc

Issue 2285013003: No longer calling DeferredTextureImageUsageParams' default ctor. (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/gpu_image_decode_controller.cc
diff --git a/cc/tiles/gpu_image_decode_controller.cc b/cc/tiles/gpu_image_decode_controller.cc
index a13affef5ee0bd732552f89ed8effddbf1b824af..cd3240b0d876727a7c7629b8014fd95ccd3137b5 100644
--- a/cc/tiles/gpu_image_decode_controller.cc
+++ b/cc/tiles/gpu_image_decode_controller.cc
@@ -56,17 +56,6 @@ SkFilterQuality CalculateUploadScaleFilterQuality(const DrawImage& draw_image) {
return std::min(kMedium_SkFilterQuality, draw_image.filter_quality());
}
-SkImage::DeferredTextureImageUsageParams ParamsFromDrawImage(
- const DrawImage& draw_image,
- int upload_scale_mip_level) {
- SkImage::DeferredTextureImageUsageParams params;
- params.fMatrix = draw_image.matrix();
- params.fQuality = draw_image.filter_quality();
- params.fPreScaleMipLevel = upload_scale_mip_level;
-
- return params;
-}
-
// Calculate the mip level to upload-scale the image to before uploading. We use
// mip levels rather than exact scales to increase re-use of scaled images.
int CalculateUploadScaleMipLevel(const DrawImage& draw_image) {
@@ -943,8 +932,9 @@ void GpuImageDecodeController::DecodeImageIfNecessary(
backing_memory =
base::DiscardableMemoryAllocator::GetInstance()
->AllocateLockedDiscardableMemory(image_data->size);
- auto params =
- ParamsFromDrawImage(draw_image, image_data->upload_scale_mip_level);
+ auto params = SkImage::DeferredTextureImageUsageParams(
+ draw_image.matrix(), draw_image.filter_quality(),
+ image_data->upload_scale_mip_level);
if (!draw_image.image()->getDeferredTextureImageData(
*context_threadsafe_proxy_.get(), &params, 1,
backing_memory->data())) {
@@ -1031,8 +1021,8 @@ GpuImageDecodeController::CreateImageData(const DrawImage& draw_image) {
DecodedDataMode mode;
int upload_scale_mip_level = CalculateUploadScaleMipLevel(draw_image);
- SkImage::DeferredTextureImageUsageParams params =
- ParamsFromDrawImage(draw_image, upload_scale_mip_level);
+ auto params = SkImage::DeferredTextureImageUsageParams(
+ draw_image.matrix(), draw_image.filter_quality(), upload_scale_mip_level);
size_t data_size = draw_image.image()->getDeferredTextureImageData(
*context_threadsafe_proxy_.get(), &params, 1, nullptr);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698