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

Unified Diff: services/gfx/compositor/render/render_image.cc

Issue 2011713003: Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 7 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 | « services/gfx/compositor/render/render_image.h ('k') | skia/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/gfx/compositor/render/render_image.cc
diff --git a/services/gfx/compositor/render/render_image.cc b/services/gfx/compositor/render/render_image.cc
index fd2572db015146684b16fdc82d3c85b77f52e90b..d4f64a6b74c8e241ed4efcf61a0eede60456f5d7 100644
--- a/services/gfx/compositor/render/render_image.cc
+++ b/services/gfx/compositor/render/render_image.cc
@@ -55,7 +55,7 @@ class RenderImage::Generator : public mojo::skia::MailboxTextureImageGenerator {
scoped_refptr<Releaser> releaser_;
};
-RenderImage::RenderImage(const skia::RefPtr<SkImage>& image,
+RenderImage::RenderImage(const sk_sp<SkImage>& image,
const scoped_refptr<Releaser>& releaser)
: image_(image), releaser_(releaser) {
DCHECK(image_);
@@ -73,12 +73,12 @@ scoped_refptr<RenderImage> RenderImage::CreateFromMailboxTexture(
const scoped_refptr<base::TaskRunner>& task_runner,
const base::Closure& release_task) {
scoped_refptr<Releaser> releaser = new Releaser(task_runner, release_task);
- skia::RefPtr<SkImage> image = skia::AdoptRef(SkImage::NewFromGenerator(
+ sk_sp<SkImage> image = SkImage::MakeFromGenerator(
new Generator(releaser, mailbox_name, sync_point, width, height,
origin == mojo::gfx::composition::MailboxTextureResource::
Origin::BOTTOM_LEFT
? kBottomLeft_GrSurfaceOrigin
- : kTopLeft_GrSurfaceOrigin)));
+ : kTopLeft_GrSurfaceOrigin));
if (!image)
return nullptr;
« no previous file with comments | « services/gfx/compositor/render/render_image.h ('k') | skia/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698