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

Unified Diff: examples/ui/png_viewer/png_viewer.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 | « examples/ui/pdf_viewer/pdf_viewer.cc ('k') | mojo/skia/ganesh_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/ui/png_viewer/png_viewer.cc
diff --git a/examples/ui/png_viewer/png_viewer.cc b/examples/ui/png_viewer/png_viewer.cc
index de10c25dbf725b35e144a00b2f6e578b354a8d4a..6e895234df02351ccb2165516905201c1588314f 100644
--- a/examples/ui/png_viewer/png_viewer.cc
+++ b/examples/ui/png_viewer/png_viewer.cc
@@ -30,7 +30,7 @@ class PNGView : public mojo::ui::GaneshView {
public:
PNGView(mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector,
mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
- const skia::RefPtr<SkImage>& image)
+ const sk_sp<SkImage>& image)
: GaneshView(app_connector.Pass(),
view_owner_request.Pass(),
"PNGViewer"),
@@ -104,14 +104,14 @@ class PNGView : public mojo::ui::GaneshView {
nullptr);
}
- skia::RefPtr<SkImage> image_;
+ sk_sp<SkImage> image_;
DISALLOW_COPY_AND_ASSIGN(PNGView);
};
class PNGContentViewProviderApp : public mojo::ui::ViewProviderApp {
public:
- PNGContentViewProviderApp(skia::RefPtr<SkImage> image) : image_(image) {
+ PNGContentViewProviderApp(sk_sp<SkImage> image) : image_(image) {
DCHECK(image_);
}
@@ -126,7 +126,7 @@ class PNGContentViewProviderApp : public mojo::ui::ViewProviderApp {
}
private:
- skia::RefPtr<SkImage> image_;
+ sk_sp<SkImage> image_;
DISALLOW_COPY_AND_ASSIGN(PNGContentViewProviderApp);
};
@@ -151,8 +151,7 @@ class PNGContentViewerApp : public mojo::ui::ContentViewerApp {
return nullptr;
}
- return new PNGContentViewProviderApp(
- skia::AdoptRef(SkImage::NewFromBitmap(bitmap)));
+ return new PNGContentViewProviderApp(SkImage::MakeFromBitmap(bitmap));
}
private:
« no previous file with comments | « examples/ui/pdf_viewer/pdf_viewer.cc ('k') | mojo/skia/ganesh_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698