Chromium Code Reviews| 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 bb5aa15194715dee7716fe4fbb397b23429b68e9..381db3746d7ce39ee535dd9eb3f4957bb2aa5880 100644 |
| --- a/third_party/WebKit/Source/core/frame/ImageBitmap.h |
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h |
| @@ -35,6 +35,15 @@ enum DataColorFormat { |
| N32ColorType, |
| }; |
| +struct ParsedOptions { |
|
jbroman
2016/07/07 19:18:00
This struct (and the method that makes it) seem pr
xidachen
2016/07/07 20:43:29
Done.
|
| + bool flipY = false; |
| + bool premultiplyAlpha = true; |
| + bool shouldScaleInput = false; |
| + unsigned resizeWidth = 0; |
| + unsigned resizeHeight = 0; |
| + SkFilterQuality resizeQuality = kLow_SkFilterQuality; |
| +}; |
| + |
| class CORE_EXPORT ImageBitmap final : public GarbageCollectedFinalized<ImageBitmap>, public ScriptWrappable, public CanvasImageSource, public ImageBitmapSource { |
| DEFINE_WRAPPERTYPEINFO(); |
| public: |
| @@ -87,17 +96,17 @@ public: |
| DECLARE_VIRTUAL_TRACE(); |
| private: |
| - ImageBitmap(HTMLImageElement*, const IntRect&, Document*, const ImageBitmapOptions&); |
| - ImageBitmap(HTMLVideoElement*, const IntRect&, Document*, const ImageBitmapOptions&); |
| - ImageBitmap(HTMLCanvasElement*, const IntRect&, const ImageBitmapOptions&); |
| - ImageBitmap(ImageData*, const IntRect&, const ImageBitmapOptions&); |
| - ImageBitmap(ImageBitmap*, const IntRect&, const ImageBitmapOptions&); |
| + ImageBitmap(HTMLImageElement*, IntRect&, Document*, const ImageBitmapOptions&); |
| + ImageBitmap(HTMLVideoElement*, IntRect&, Document*, const ImageBitmapOptions&); |
| + ImageBitmap(HTMLCanvasElement*, IntRect&, const ImageBitmapOptions&); |
| + ImageBitmap(ImageData*, IntRect&, const ImageBitmapOptions&); |
| + ImageBitmap(ImageBitmap*, IntRect&, const ImageBitmapOptions&); |
| ImageBitmap(PassRefPtr<StaticBitmapImage>); |
| - ImageBitmap(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions&); |
| + ImageBitmap(PassRefPtr<StaticBitmapImage>, IntRect&, const ImageBitmapOptions&); |
| ImageBitmap(WebExternalTextureMailbox&); |
| ImageBitmap(std::unique_ptr<uint8_t[]> data, uint32_t width, uint32_t height, bool isImageBitmapPremultiplied, bool isImageBitmapOriginClean); |
| - void parseOptions(const ImageBitmapOptions&, bool&, bool&); |
| + ParsedOptions parseOptions(const ImageBitmapOptions&, const int, const int); |
|
jbroman
2016/07/07 19:18:00
Please name parameters whose use is not obvious, l
xidachen
2016/07/07 20:43:29
This line is removed because this function is now
|
| RefPtr<StaticBitmapImage> m_image; |
| bool m_isNeutered = false; |