Use union type in ImageBitmapFactories.idl

third_party/WebKit/Source/core/html/HTMLImageElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 11 matching lines @@
  */
 
 #ifndef HTMLImageElement_h
 #define HTMLImageElement_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLImageLoader.h"
 #include "core/html/canvas/CanvasImageSource.h"
+#include "core/imagebitmap/ImageBitmapSource.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/network/ResourceResponse.h"
 #include "wtf/WeakPtr.h"
 
 namespace blink {
 
 class HTMLFormElement;
 class ImageCandidate;
 class ShadowRoot;
 
-class CORE_EXPORT HTMLImageElement final : public HTMLElement, public CanvasImageSource {
+class CORE_EXPORT HTMLImageElement final : public HTMLElement, public CanvasImageSource, public ImageBitmapSource {
     DEFINE_WRAPPERTYPEINFO();
 public:
     class ViewportChangeListener;
 
     static PassRefPtrWillBeRawPtr<HTMLImageElement> create(Document&);
     static PassRefPtrWillBeRawPtr<HTMLImageElement> create(Document&, HTMLFormElement*, bool createdByParser);
     static PassRefPtrWillBeRawPtr<HTMLImageElement> createForJSConstructor(Document&);
     static PassRefPtrWillBeRawPtr<HTMLImageElement> createForJSConstructor(Document&, int width);
     static PassRefPtrWillBeRawPtr<HTMLImageElement> createForJSConstructor(Document&, int width, int height);
 
@@ skipping 55 matching lines @@
     void selectSourceURL(ImageLoader::UpdateFromElementBehavior);
     void reattachFallbackContent();
     void setUseFallbackContent();
     void setIsFallbackImage() { m_isFallbackImage = true; }
 
     FetchRequest::ResourceWidth resourceWidth();
     float sourceSize(Element&);
 
     void forceReload() const;
 
+    // ImageBitmapSource implementation
+    IntSize bitmapSourceSize() override { return IntSize(width(), height()); }

[xidachen, 2015/11/25 17:01:54]

This implementation of bitmapSourceSize will be changed once the imageSize() CL
is landed. Because my implementation here makes its return value non-const.

+    ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageBitmapSource*, int sx, int sy, int sw, int sh, ExceptionState&) override;
+
 protected:
     explicit HTMLImageElement(Document&, HTMLFormElement* = 0, bool createdByParser = false);
 
     void didMoveToNewDocument(Document& oldDocument) override;
     virtual bool useFallbackContent() const { return m_useFallbackContent; }
 
     void didAddUserAgentShadowRoot(ShadowRoot&) override;
     PassRefPtr<ComputedStyle> customStyleForLayoutObject() override;
 private:
     bool areAuthorShadowsAllowed() const override { return false; }
@@ skipping 39 matching lines @@
     unsigned m_intrinsicSizingViewportDependant : 1;
     unsigned m_useFallbackContent : 1;
     unsigned m_isFallbackImage : 1;
 
     ReferrerPolicy m_referrerPolicy;
 };
 
 } // namespace blink
 
 #endif // HTMLImageElement_h