diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /gfx/2d/SourceSurfaceSkia.h | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.gz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.lz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.xz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'gfx/2d/SourceSurfaceSkia.h')
| -rw-r--r-- | gfx/2d/SourceSurfaceSkia.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gfx/2d/SourceSurfaceSkia.h b/gfx/2d/SourceSurfaceSkia.h index a91ae93ed..ffb8e47bf 100644 --- a/gfx/2d/SourceSurfaceSkia.h +++ b/gfx/2d/SourceSurfaceSkia.h @@ -10,6 +10,10 @@ #include <vector> #include "skia/include/core/SkCanvas.h" #include "skia/include/core/SkImage.h" +#include "mozilla/Maybe.h" +#include "mozilla/Mutex.h" + +typedef mozilla::MutexAutoLock MutexAutoLock; namespace mozilla { @@ -28,7 +32,7 @@ public: virtual IntSize GetSize() const; virtual SurfaceFormat GetFormat() const; - sk_sp<SkImage>& GetImage() { return mImage; } + sk_sp<SkImage> GetImage(Maybe<MutexAutoLock>* aLock); bool InitFromData(unsigned char* aData, const IntSize &aSize, |