Commit e53cf7a6 authored by Adlai Holler's avatar Adlai Holler Committed by Commit Bot

Update name for ComputeImageSize skia function

Change-Id: Iebefeb039768f6d15bc0055ca515defebec7e3ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464099
Auto-Submit: Adlai Holler <adlai@google.com>
Commit-Queue: Khushal <khushalsagar@chromium.org>
Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816265}
parent 7005507c
...@@ -352,8 +352,8 @@ bool ServiceImageTransferCacheEntry::BuildFromHardwareDecodedImage( ...@@ -352,8 +352,8 @@ bool ServiceImageTransferCacheEntry::BuildFromHardwareDecodedImage(
DLOG(ERROR) << "Could not generate mipmap chain for plane " << plane; DLOG(ERROR) << "Could not generate mipmap chain for plane " << plane;
return false; return false;
} }
plane_sizes_.push_back( plane_sizes_.push_back(GrDirectContext::ComputeImageSize(
GrContext::ComputeImageSize(plane_images[plane], GrMipMapped::kYes)); plane_images[plane], GrMipMapped::kYes));
safe_total_size += plane_sizes_.back(); safe_total_size += plane_sizes_.back();
} }
if (!safe_total_size.AssignIfValid(&size_)) { if (!safe_total_size.AssignIfValid(&size_)) {
...@@ -473,7 +473,8 @@ bool ServiceImageTransferCacheEntry::Deserialize( ...@@ -473,7 +473,8 @@ bool ServiceImageTransferCacheEntry::Deserialize(
return false; return false;
DCHECK(plane->isTextureBacked()); DCHECK(plane->isTextureBacked());
const size_t plane_size = GrContext::ComputeImageSize(plane, gr_mips); const size_t plane_size =
GrDirectContext::ComputeImageSize(plane, gr_mips);
size_ += plane_size; size_ += plane_size;
plane_sizes_.push_back(plane_size); plane_sizes_.push_back(plane_size);
...@@ -542,7 +543,7 @@ bool ServiceImageTransferCacheEntry::Deserialize( ...@@ -542,7 +543,7 @@ bool ServiceImageTransferCacheEntry::Deserialize(
if (image_) { if (image_) {
// Match GrTexture::onGpuMemorySize so that memory traces agree. // Match GrTexture::onGpuMemorySize so that memory traces agree.
auto gr_mips = has_mips_ ? GrMipMapped::kYes : GrMipMapped::kNo; auto gr_mips = has_mips_ ? GrMipMapped::kYes : GrMipMapped::kNo;
size_ = GrContext::ComputeImageSize(image_, gr_mips); size_ = GrDirectContext::ComputeImageSize(image_, gr_mips);
} }
return !!image_; return !!image_;
...@@ -623,8 +624,8 @@ void ServiceImageTransferCacheEntry::EnsureMips() { ...@@ -623,8 +624,8 @@ void ServiceImageTransferCacheEntry::EnsureMips() {
if (!mipped_plane) if (!mipped_plane)
return; return;
mipped_planes.push_back(std::move(mipped_plane)); mipped_planes.push_back(std::move(mipped_plane));
mipped_plane_sizes.push_back( mipped_plane_sizes.push_back(GrDirectContext::ComputeImageSize(
GrContext::ComputeImageSize(mipped_planes.back(), GrMipMapped::kYes)); mipped_planes.back(), GrMipMapped::kYes));
} }
sk_sp<SkImage> mipped_image = MakeYUVImageFromUploadedPlanes( sk_sp<SkImage> mipped_image = MakeYUVImageFromUploadedPlanes(
context_, mipped_planes, plane_images_format_, yuv_color_space_.value(), context_, mipped_planes, plane_images_format_, yuv_color_space_.value(),
......
...@@ -471,7 +471,7 @@ sk_sp<SkImage> MakeTextureImage(viz::RasterContextProvider* context, ...@@ -471,7 +471,7 @@ sk_sp<SkImage> MakeTextureImage(viz::RasterContextProvider* context,
size_t GetUploadedTextureSizeFromSkImage(const sk_sp<SkImage>& plane, size_t GetUploadedTextureSizeFromSkImage(const sk_sp<SkImage>& plane,
const GrMipMapped mipped) { const GrMipMapped mipped) {
const size_t plane_size = GrContext::ComputeImageSize(plane, mipped); const size_t plane_size = GrDirectContext::ComputeImageSize(plane, mipped);
return plane_size; return plane_size;
} }
......
...@@ -135,7 +135,7 @@ base::CheckedNumeric<uint64_t> GetExpectedTotalMippedSizeForPlanarImage( ...@@ -135,7 +135,7 @@ base::CheckedNumeric<uint64_t> GetExpectedTotalMippedSizeForPlanarImage(
base::CheckedNumeric<uint64_t> safe_total_image_size = 0u; base::CheckedNumeric<uint64_t> safe_total_image_size = 0u;
for (const auto& plane_image : decode_entry->plane_images()) { for (const auto& plane_image : decode_entry->plane_images()) {
safe_total_image_size += base::strict_cast<uint64_t>( safe_total_image_size += base::strict_cast<uint64_t>(
GrContext::ComputeImageSize(plane_image, GrMipMapped::kYes)); GrDirectContext::ComputeImageSize(plane_image, GrMipMapped::kYes));
} }
return safe_total_image_size; return safe_total_image_size;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment