third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h - Issue 1455763002: Use union type in ImageBitmapFactories.idl

Unified Diff: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h

Issue 1455763002: Use union type in ImageBitmapFactories.idl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: better argument passing Created 5 years, 1 month 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

« no previous file with comments | « third_party/WebKit/Source/core/html/ImageData.cpp ('k') | third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h

diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h

index 39422b187ee4bdca86f65b17897f237e623ed97f..3a311c14e86c5cdfed8f79635fccd87a82e7a4a3 100644

--- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h

+++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h

@@ -34,33 +34,30 @@

#include "bindings/core/v8/ScriptPromise.h"

#include "bindings/core/v8/ScriptPromiseResolver.h"

#include "bindings/core/v8/ScriptState.h"

+#include "bindings/core/v8/UnionTypesCore.h"

#include "core/fileapi/FileReaderLoader.h"

#include "core/fileapi/FileReaderLoaderClient.h"

#include "platform/Supplementable.h"

#include "platform/geometry/IntRect.h"

-#include "wtf/Forward.h"

-#include "wtf/HashSet.h"

namespace blink {

+class ImageBitmapSource;

class Blob;

class EventTarget;

class ExceptionState;

-class ImageBitmap;

-class ImageData;

class ExecutionContext;

+typedef HTMLImageElementOrHTMLVideoElementOrHTMLCanvasElementOrBlobOrImageDataOrImageBitmap ImageBitmapSourceUnion;

class ImageBitmapFactories final : public NoBaseWillBeGarbageCollectedFinalized<ImageBitmapFactories>, public WillBeHeapSupplement<LocalDOMWindow>, public WillBeHeapSupplement<WorkerGlobalScope> {

WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageBitmapFactories);

USING_FAST_MALLOC_WILL_BE_REMOVED(ImageBitmapFactories);

public:

- static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, Blob*, ExceptionState&);

- static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, Blob*, int sx, int sy, int sw, int sh, ExceptionState&);

- static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageData*, ExceptionState&);

- static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageData*, int sx, int sy, int sw, int sh, ExceptionState&);

- static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageBitmap*, ExceptionState&);

- static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageBitmap*, int sx, int sy, int sw, int sh, ExceptionState&);

+ static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, const ImageBitmapSourceUnion&, ExceptionState&);

+ static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, const ImageBitmapSourceUnion&, int sx, int sy, int sw, int sh, ExceptionState&);

+ static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageBitmapSource*, int sx, int sy, int sw, int sh, ExceptionState&);

virtual ~ImageBitmapFactories() { }