Chromium Code Reviews| 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 f5938fe0ea6b32ef2c4f4b4efe8fe7a29b588290..69e6ca47bb4996eb61dc7035a52e0e50139d444d 100644 |
| --- a/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h |
| +++ b/third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.h |
| @@ -24,11 +24,14 @@ class WebThread; |
| class PLATFORM_EXPORT AcceleratedStaticBitmapImage final |
| : public StaticBitmapImage { |
| public: |
| - // SkImage with a texture backing that is assumed to be from the shared context of the current thread. |
| + // SkImage with a texture backing that is assumed to be from the shared |
| + // context of the current thread. |
| static PassRefPtr<AcceleratedStaticBitmapImage> createFromSharedContextImage( |
| 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. |
| + // 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> createFromWebGLContextImage( |
| sk_sp<SkImage>, |
| const gpu::Mailbox&, |
| @@ -74,14 +77,17 @@ class PLATFORM_EXPORT AcceleratedStaticBitmapImage final |
| // Id of the shared context where m_image was created |
| unsigned m_sharedContextId; |
| - // True when the below mailbox and sync token are valid for getting at the texture backing the object's SkImage. |
| + // True when the below mailbox and sync token are valid for getting at the |
| + // texture backing the object's SkImage. |
| bool m_hasMailbox = false; |
| - // A mailbox referring to the texture id backing the SkImage. The mailbox is valid as long as the SkImage is held alive. |
| + // A mailbox referring to the texture id backing the SkImage. The mailbox is |
| + // valid as long as the SkImage is held alive. |
| gpu::Mailbox m_mailbox; |
| // This token must be waited for before using the mailbox. |
| gpu::SyncToken m_syncToken; |
| - // Thread that m_image belongs to. Set to null when m_image belong to the same thread |
| - // as this AcceleratedStaticBitmapImage. Should only be non-null after a transfer. |
| + // Thread that m_image belongs to. Set to null when |m_image| belongs to the |
|
Stephen White
2016/10/05 14:45:37
Nit: the first instance of m_image on this line do
Peter Kasting
2016/10/05 18:46:01
Yeah, there's no style rule, and existing code is
|
| + // same thread as this AcceleratedStaticBitmapImage. Should only be non-null |
| + // after a transfer. |
| WebThread* m_imageThread = nullptr; |
| base::ThreadChecker m_threadChecker; |