third_party/WebKit/Source/core/frame/ImageBitmap.h - Issue 2039983002: Change code path for structured cloning ImageBitmap

Unified Diff: third_party/WebKit/Source/core/frame/ImageBitmap.h

Issue 2039983002: Change code path for structured cloning ImageBitmap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clean up code, should work Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp ('K') | « third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp ('k') | third_party/WebKit/Source/core/frame/ImageBitmap.cpp » ('j') | third_party/WebKit/Source/core/frame/ImageBitmap.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1e6e3db9db56924decb8f44f2124148eb065a267..c8dc1905b5c04bd6721b67c214cb9d0493918fe8 100644

--- a/third_party/WebKit/Source/core/frame/ImageBitmap.h

+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h

@@ -37,11 +37,12 @@ public:

static ImageBitmap* create(HTMLImageElement*, const IntRect&, Document*, const ImageBitmapOptions& = ImageBitmapOptions());

static ImageBitmap* create(HTMLVideoElement*, const IntRect&, Document*, const ImageBitmapOptions& = ImageBitmapOptions());

static ImageBitmap* create(HTMLCanvasElement*, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());

- static ImageBitmap* create(ImageData*, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions(), const bool& isImageDataPremultiplied = false, const bool& isImageDataOriginClean = true);

+ static ImageBitmap* create(ImageData*, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());

static ImageBitmap* create(ImageBitmap*, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());

static ImageBitmap* create(PassRefPtr<StaticBitmapImage>);

static ImageBitmap* create(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());

static ImageBitmap* create(WebExternalTextureMailbox&);

+ static ImageBitmap* create(std::unique_ptr<uint8_t[]>, uint32_t, uint32_t, bool, bool);

jbroman 2016/06/28 18:50:22 Please name these parameters, here and below. "uin

xidachen 2016/06/29 12:58:35 Done.

static PassRefPtr<SkImage> getSkImageFromDecoder(std::unique_ptr<ImageDecoder>);

// Type and helper function required by CallbackPromiseAdapter:

@@ -82,11 +83,12 @@ 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&, const bool&, const bool&);

+ ImageBitmap(ImageData*, const IntRect&, const ImageBitmapOptions&);

ImageBitmap(ImageBitmap*, const IntRect&, const ImageBitmapOptions&);

ImageBitmap(PassRefPtr<StaticBitmapImage>);

ImageBitmap(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions&);

ImageBitmap(WebExternalTextureMailbox&);

+ ImageBitmap(std::unique_ptr<uint8_t[]>, uint32_t, uint32_t, bool, bool);

void parseOptions(const ImageBitmapOptions&, bool&, bool&);