| Index: third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.h b/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| index 6e8f52cb27324713c86984984ef7ecee91766ef3..f4805a9b499d6008c006051572045748544b7b3f 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| @@ -51,7 +51,7 @@ public:
|
|
|
| bool isNeutered() const { return m_isNeutered; }
|
| bool originClean() const { return m_image->originClean(); }
|
| - bool isPremultiplied() const { return m_isPremultiplied; }
|
| + bool isPremultiplied() const { return m_image->isPremultiplied(); }
|
| PassRefPtr<StaticBitmapImage> transfer();
|
| void close();
|
|
|
| @@ -78,11 +78,10 @@ private:
|
| ImageBitmap(PassRefPtr<StaticBitmapImage>);
|
| ImageBitmap(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions&);
|
|
|
| - void parseOptions(const ImageBitmapOptions&, bool&);
|
| + void parseOptions(const ImageBitmapOptions&, bool&, bool&);
|
|
|
| RefPtr<StaticBitmapImage> m_image;
|
| bool m_isNeutered = false;
|
| - bool m_isPremultiplied = true;
|
| };
|
|
|
| } // namespace blink
|
|
|