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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiles/software_image_decode_controller.h

Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
« cc/tiles/gpu_image_decode_controller.cc ('K') | « cc/tiles/gpu_image_decode_controller_unittest.cc ('k') | cc/tiles/software_image_decode_controller.cc » ('j') | cc/tiles/software_image_decode_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/software_image_decode_controller.h
diff --git a/cc/tiles/software_image_decode_controller.h b/cc/tiles/software_image_decode_controller.h
index a94c45f7071a0b80c26d03d771667df2d75651d0..6f80620c802b31303a095bb0c48d4e6f4d5d83c5 100644
--- a/cc/tiles/software_image_decode_controller.h
+++ b/cc/tiles/software_image_decode_controller.h
@@ -24,7 +24,7 @@
#include "cc/playback/draw_image.h"
#include "cc/raster/tile_task_runner.h"
#include "cc/tiles/image_decode_controller.h"
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
namespace cc {
@@ -162,7 +162,7 @@ class CC_EXPORT SoftwareImageDecodeController
bool locked_;
SkImageInfo image_info_;
std::unique_ptr<base::DiscardableMemory> memory_;
- skia::RefPtr<SkImage> image_;
+ sk_sp<SkImage> image_;
SkSize src_rect_offset_;
uint64_t tracing_id_;
};
« cc/tiles/gpu_image_decode_controller.cc ('K') | « cc/tiles/gpu_image_decode_controller_unittest.cc ('k') | cc/tiles/software_image_decode_controller.cc » ('j') | cc/tiles/software_image_decode_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698