| Index: third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.cpp
|
| index 28b72be0fd4be892ea2765f5bd3bf0ca5b1f087d..8541d13a01619be3db87a56a16426d6ab082ec03 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.cpp
|
| @@ -28,9 +28,9 @@ PassRefPtr<AcceleratedStaticBitmapImage> AcceleratedStaticBitmapImage::createFro
|
| return adoptRef(new AcceleratedStaticBitmapImage(std::move(image)));
|
| }
|
|
|
| -PassRefPtr<AcceleratedStaticBitmapImage> AcceleratedStaticBitmapImage::createFromWebGLContextImage(sk_sp<SkImage> image, const gpu::Mailbox& mailbox, const gpu::SyncToken& syncToken)
|
| +PassRefPtr<AcceleratedStaticBitmapImage> AcceleratedStaticBitmapImage::createFromWebGLContextImage(sk_sp<SkImage> image, const gpu::Mailbox& mailbox, const gpu::SyncToken& syncToken, GLuint textureId)
|
| {
|
| - return adoptRef(new AcceleratedStaticBitmapImage(std::move(image), mailbox, syncToken));
|
| + return adoptRef(new AcceleratedStaticBitmapImage(std::move(image), mailbox, syncToken, textureId));
|
| }
|
|
|
| AcceleratedStaticBitmapImage::AcceleratedStaticBitmapImage(sk_sp<SkImage> image)
|
| @@ -40,12 +40,13 @@ AcceleratedStaticBitmapImage::AcceleratedStaticBitmapImage(sk_sp<SkImage> image)
|
| m_threadChecker.DetachFromThread();
|
| }
|
|
|
| -AcceleratedStaticBitmapImage::AcceleratedStaticBitmapImage(sk_sp<SkImage> image, const gpu::Mailbox& mailbox, const gpu::SyncToken& syncToken)
|
| +AcceleratedStaticBitmapImage::AcceleratedStaticBitmapImage(sk_sp<SkImage> image, const gpu::Mailbox& mailbox, const gpu::SyncToken& syncToken, GLuint textureId)
|
| : StaticBitmapImage(std::move(image))
|
| , m_sharedContextId(SharedGpuContext::kNoSharedContext)
|
| , m_hasMailbox(true)
|
| , m_mailbox(mailbox)
|
| , m_syncToken(syncToken)
|
| + , m_textureId(textureId)
|
| {
|
| m_threadChecker.DetachFromThread();
|
|
|
|
|