Commit d136a1c2 authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot

Revert "Fix regression caused by drawing accelerated content on SW canvas"

This reverts commit 67e499b1.

Reason for revert: As the revert crrev.com/c/2360557 is landed, revert this as well since they seem to tie with each other

Original change's description:
> Fix regression caused by drawing accelerated content on SW canvas
> 
> The recent change introducing PaintImage::GetSwSkImage() caused a
> regression that occurs when drawing accelerated resources on a software
> canvas.
> 
> This is a quick fix to revert the culprit caller back to
> PaintImage::GetSkImage(). This avoids the cost of multiple readbacks
> that GetSwSkImage() incurs. A follow up change will introduce caching in
> GetSwSkImage(), at which point we can use it again.
> 
> Bug: 1115686
> Change-Id: I765f85acf2d53c7f379b4d5cffd86a1224be4318
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358432
> Reviewed-by: Khushal <khushalsagar@chromium.org>
> Commit-Queue: Jonah Chin <jochin@microsoft.com>
> Cr-Commit-Position: refs/heads/master@{#798898}

TBR=khushalsagar@chromium.org,jochin@microsoft.com

Change-Id: I387a67450d86812a66170fe2e8ceb07b5f2128ac
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1115686
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363268Reviewed-by: default avatarHaiyang Pan <hypan@google.com>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#799124}
parent ac7726b8
......@@ -67,9 +67,10 @@ ImageProvider::ScopedResult PlaybackImageProvider::GetRasterContent(
SkSize::Make(1.f, 1.f), draw_image.filter_quality(),
true /* is_budgeted */));
} else {
return ScopedResult(DecodedDrawImage(
paint_image.GetSkImage(), SkSize::Make(0, 0), SkSize::Make(1.f, 1.f),
draw_image.filter_quality(), true /* is_budgeted */));
return ScopedResult(
DecodedDrawImage(paint_image.GetSwSkImage(), SkSize::Make(0, 0),
SkSize::Make(1.f, 1.f), draw_image.filter_quality(),
true /* is_budgeted */));
}
}
......
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