Bug 825527 - Part 5: Turn on the WebIDL bindings for HTMLImageElement; r=bzbarsky

content/canvas/src/CanvasRenderingContext2D.cpp

@@ -1421,7 +1421,7 @@ CanvasRenderingContext2D::CreatePattern(const HTMLImageOrCanvasOrVideoElement& e
       return pat.forget();
     }
   } else if (element.IsHTMLImageElement()) {
-    htmlElement = element.GetAsHTMLImageElement();
+    htmlElement = &element.GetAsHTMLImageElement();
   } else {
     htmlElement = element.GetAsHTMLVideoElement();
   }
@@ -2944,7 +2944,7 @@ CanvasRenderingContext2D::DrawImage(const HTMLImageOrCanvasOrVideoElement& image
     }
   } else {
     if (image.IsHTMLImageElement()) {
-      HTMLImageElement* img = image.GetAsHTMLImageElement();
+      HTMLImageElement* img = &image.GetAsHTMLImageElement();
       element = img;
     } else {
       nsHTMLVideoElement* video = image.GetAsHTMLVideoElement();

content/html/content/src/HTMLImageElement.cpp

@@ -76,6 +76,7 @@ HTMLImageElement::HTMLImageElement(already_AddRefed<nsINodeInfo> aNodeInfo)
 {
   // We start out broken
   AddStatesSilently(NS_EVENT_STATE_BROKEN);
+  SetIsDOMBinding();
 }
 
 HTMLImageElement::~HTMLImageElement()

content/html/content/test/test_bug389797.html

@@ -159,8 +159,7 @@ HTML_TAG("i", "");
 HTML_TAG("iframe", "IFrame", [ "nsIDOMGetSVGDocument", "nsIDOMMozBrowserFrame" ],
                              [ "nsIFrameLoaderOwner" ]);
 HTML_TAG("image", "Span");
-HTML_TAG("img", "Image", [], [ "imgINotificationObserver",
-                               "nsIImageLoadingContent" ]);
+HTML_TAG("img", "Image", [ "nsIImageLoadingContent" ], []);
 HTML_TAG("input", "Input", [], [ "imgINotificationObserver",
                                  "nsIImageLoadingContent",
                                  "nsIDOMNSEditableElement" ]);

dom/base/nsDOMClassInfo.cpp

@@ -2633,6 +2633,7 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(HTMLImageElement, nsIDOMHTMLImageElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLImageElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIImageLoadingContent)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 

dom/bindings/Bindings.conf

@@ -344,6 +344,10 @@ DOMInterfaces = {
   'hasInstanceInterface': 'nsIDOMHTMLHeadingElement',
 },
 
+'HTMLImageElement': {
+  'hasInstanceInterface': 'nsIDOMHTMLImageElement',
+},
+
 'HTMLLabelElement': {
     'resultNotAddRefed': [
         'form', 'control'
@@ -1040,7 +1044,6 @@ addExternalIface('DOMStringList')
 addExternalIface('File')
 addExternalIface('HitRegionOptions', nativeType='nsISupports')
 addExternalIface('HTMLHeadElement', nativeType='mozilla::dom::Element')
-addExternalIface('HTMLImageElement', nativeType='mozilla::dom::HTMLImageElement')
 addExternalIface('imgINotificationObserver', nativeType='imgINotificationObserver')
 addExternalIface('imgIRequest', nativeType='imgIRequest', notflattened=True)
 addExternalIface('LockedFile')

dom/webidl/CanvasRenderingContext2D.webidl

@@ -15,7 +15,6 @@ interface CanvasGradient;
 interface CanvasPattern;
 interface HitRegionOptions;
 interface HTMLCanvasElement;
-interface HTMLImageElement;
 interface HTMLVideoElement;
 interface TextMetrics;
 interface Window;

dom/webidl/WebGLRenderingContext.webidl

@@ -19,7 +19,6 @@
 // bindings yet.
 interface Event;
 interface HTMLCanvasElement;
-interface HTMLImageElement;
 interface HTMLVideoElement;
 interface ImageData;
 

dom/webidl/WebIDL.mk

@@ -58,6 +58,7 @@ webidl_files = \
   HTMLFontElement.webidl \
   HTMLFrameSetElement.webidl \
   HTMLHeadingElement.webidl \
+  HTMLImageElement.webidl \
   HTMLLabelElement.webidl \
   HTMLOptionsCollection.webidl \
   HTMLPropertiesCollection.webidl \

js/xpconnect/src/dom_quickstubs.qsconf

@@ -148,11 +148,6 @@ members = [
     'nsIDOMHTMLIFrameElement.src',
     'nsIDOMHTMLIFrameElement.contentDocument',
     'nsIDOMHTMLIFrameElement.contentWindow',
-    'nsIDOMHTMLImageElement.src',
-    'nsIDOMHTMLImageElement.name',
-    'nsIDOMHTMLImageElement.height',
-    'nsIDOMHTMLImageElement.width',
-    'nsIDOMHTMLImageElement.complete',
     'nsIDOMHTMLInputElement.defaultChecked',
     'nsIDOMHTMLInputElement.disabled',
     'nsIDOMHTMLInputElement.select',