Source/core/page/DOMWindow.h - Issue 20748002: Blob creation methods for ImageBitmap.

Unified Diff: Source/core/page/DOMWindow.h

Issue 20748002: Blob creation methods for ImageBitmap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 5 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

« LayoutTests/fast/canvas/canvas-createImageBitmap-invalid-args.html ('K') | « LayoutTests/fast/canvas/resources/pattern.png ('k') | Source/core/page/DOMWindow.cpp » ('j') | Source/core/page/ImageBitmap.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/DOMWindow.h

diff --git a/Source/core/page/DOMWindow.h b/Source/core/page/DOMWindow.h

index 34eb1e67d5a54415e5b9ae05fc453df7d05bcf27..2617646887c52dd765131d962f708fd7011c80d3 100644

--- a/Source/core/page/DOMWindow.h

+++ b/Source/core/page/DOMWindow.h

@@ -30,12 +30,14 @@

#include "bindings/v8/ScriptWrappable.h"

#include "core/dom/EventTarget.h"

#include "core/page/FrameDestructionObserver.h"

+#include "core/page/ImageBitmap.h"

#include "core/platform/Supplementable.h"

#include "wtf/Forward.h"

namespace WebCore {

class BarProp;

+ class Blob;

class CSSRuleList;

class CSSStyleDeclaration;

class CanvasRenderingContext2D;

@@ -245,18 +247,21 @@ namespace WebCore {

void resizeTo(float width, float height) const;

// Images

- void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

- void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

- void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

- void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

- void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

- void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

- void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

- void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

- void createImageBitmap(ImageData*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

- void createImageBitmap(ImageData*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

- void createImageBitmap(ImageBitmap*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

- void createImageBitmap(ImageBitmap*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

+ void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&) const;

+ void createImageBitmap(HTMLImageElement*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&) const;

+ void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&) const;

+ void createImageBitmap(HTMLVideoElement*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&) const;

+ void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&) const;

+ void createImageBitmap(CanvasRenderingContext2D*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&) const;

+ void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&) const;

+ void createImageBitmap(HTMLCanvasElement*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&) const;

+ void createImageBitmap(Blob*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&);

+ void createImageBitmap(Blob*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&);

+ void createImageBitmap(ImageData*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&) const;

+ void createImageBitmap(ImageData*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&) const;

+ void createImageBitmap(ImageBitmap*, PassRefPtr<ImageBitmapCallback>, ExceptionCode&) const;

+ void createImageBitmap(ImageBitmap*, PassRefPtr<ImageBitmapCallback>, int sx, int sy, int sw, int sh, ExceptionCode&) const;

+ void imageBitmapFinishedLoading(ImageBitmap*);

// WebKit animation extensions

int requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>);

@@ -413,6 +418,7 @@ namespace WebCore {

bool m_shouldPrintWhenFinishedLoading;

HashSet<DOMWindowProperty*> m_properties;

+ HashSet<RefPtr<ImageBitmap> > m_pendingImageBitmaps;

Justin Novosad 2013/07/26 18:15:58 Before we start adding data members to Window, we

mutable RefPtr<Screen> m_screen;

mutable RefPtr<History> m_history;