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

Unified Diff: third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 years, 3 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
Index: third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h
diff --git a/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h b/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h
index a45db448f88088283da39340d67a7ef67803c5fc..aa8b38e9d46e78c4cc772c0f529a1e1d25c3a860 100644
--- a/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h
+++ b/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h
@@ -9,6 +9,7 @@
#include "gpu/command_buffer/common/sync_token.h"
#include "platform/geometry/IntSize.h"
#include "platform/graphics/StaticBitmapImage.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include <memory>
@@ -23,20 +24,20 @@ namespace blink {
class PLATFORM_EXPORT AcceleratedStaticBitmapImage final : public StaticBitmapImage {
public:
// SkImage with a texture backing that is assumed to be from the shared main thread context.
- static PassRefPtr<AcceleratedStaticBitmapImage> create(PassRefPtr<SkImage>);
+ static PassRefPtr<AcceleratedStaticBitmapImage> create(sk_sp<SkImage>);
// Can specify the GrContext that created the texture backing the for the given SkImage. Ideally all callers would use this option.
// The |mailbox| is a name for the texture backing the SkImage, allowing other contexts to use the same backing.
- static PassRefPtr<AcceleratedStaticBitmapImage> create(PassRefPtr<SkImage>, sk_sp<GrContext>, const gpu::Mailbox&, const gpu::SyncToken&);
+ static PassRefPtr<AcceleratedStaticBitmapImage> create(sk_sp<SkImage>, sk_sp<GrContext>, const gpu::Mailbox&, const gpu::SyncToken&);
~AcceleratedStaticBitmapImage() override;
// StaticBitmapImage overrides.
- PassRefPtr<SkImage> imageForCurrentFrame() override;
+ sk_sp<SkImage> imageForCurrentFrame() override;
void copyToTexture(WebGraphicsContext3DProvider*, GLuint destTextureId, GLenum destInternalFormat, GLenum destType, bool flipY) override;
private:
- AcceleratedStaticBitmapImage(PassRefPtr<SkImage>);
- AcceleratedStaticBitmapImage(PassRefPtr<SkImage>, sk_sp<GrContext>, const gpu::Mailbox&, const gpu::SyncToken&);
+ AcceleratedStaticBitmapImage(sk_sp<SkImage>);
+ AcceleratedStaticBitmapImage(sk_sp<SkImage>, sk_sp<GrContext>, const gpu::Mailbox&, const gpu::SyncToken&);
bool switchStorageToMailbox(WebGraphicsContext3DProvider*);
GLuint switchStorageToSkImageForWebGL(WebGraphicsContext3DProvider*);

Powered by Google App Engine
This is Rietveld 408576698