auto merge of #713 : saneyuki/servo/canvas, r=jdm

3 files changed, 57 insertions, 1 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index a26b2d22c5f..05770570fd9 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -548,6 +548,7 @@ def addHTMLElement(element):
 addHTMLElement('HTMLAnchorElement')
 addHTMLElement('HTMLBodyElement')
 addHTMLElement('HTMLBRElement')
+addHTMLElement('HTMLCanvasElement')
 addHTMLElement('HTMLDivElement')
 addHTMLElement('HTMLElement')
 addHTMLElement('HTMLHeadElement')
@@ -575,7 +576,6 @@ def addExternalHTMLElement(element):
    addExternalIface(element, nativeType=nativeElement,
                     headerFile=nativeElement + '.h')
 
-addExternalHTMLElement('HTMLCanvasElement')
 addExternalHTMLElement('HTMLOptionElement')
 addExternalHTMLElement('HTMLOptGroupElement')
 addExternalHTMLElement('HTMLVideoElement')
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 5af91832b24..140a712b950 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4620,6 +4620,7 @@ class CGBindingRoot(CGThing):
                           'dom::htmlanchorelement::HTMLAnchorElement', #XXXjdm
                           'dom::htmlbodyelement::HTMLBodyElement', 
                           'dom::htmlbrelement::HTMLBRElement', #XXXrecrack
+                          'dom::htmlcanvaselement::HTMLCanvasElement',
                           'dom::htmlelement::HTMLElement', #XXXjdm
                           'dom::htmldocument::HTMLDocument', #XXXjdm
                           'dom::htmlhrelement::HTMLHRElement',
diff --git a/src/components/script/dom/bindings/codegen/HTMLCanvasElement.webidl b/src/components/script/dom/bindings/codegen/HTMLCanvasElement.webidl
new file mode 100644
index 00000000000..d2413381daa
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/HTMLCanvasElement.webidl
@@ -0,0 +1,55 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * http://www.whatwg.org/specs/web-apps/current-work/#the-canvas-element
+ * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
+ * Opera Software ASA. You are granted a license to use, reproduce
+ * and create derivative works of this document.
+ */
+
+// import from http://mxr.mozilla.org/mozilla-central/source/dom/webidl/HTMLCanvasElement.webidl
+
+/*
+interface Blob;
+interface FileCallback;
+interface nsIInputStreamCallback;
+interface nsISupports;
+interface PrintCallback;
+interface Variant;
+*/
+
+interface HTMLCanvasElement : HTMLElement {
+  [Pure, SetterThrows]
+           attribute unsigned long width;
+  [Pure, SetterThrows]
+           attribute unsigned long height;
+/*
+  [Throws]
+  nsISupports? getContext(DOMString contextId, optional any contextOptions = null);
+
+  [Throws]
+  DOMString toDataURL(optional DOMString type = "",
+                      optional any encoderOptions);
+  [Throws]
+  void toBlob(FileCallback _callback,
+              optional DOMString type = "",
+              optional any encoderOptions);
+*/
+};
+/*
+// Mozilla specific bits
+partial interface HTMLCanvasElement {
+  [Pure, SetterThrows]
+           attribute boolean mozOpaque;
+  [Throws]
+  File mozGetAsFile(DOMString name, optional DOMString? type = null);
+  [ChromeOnly, Throws]
+  nsISupports? MozGetIPCContext(DOMString contextId);
+  [ChromeOnly]
+  void mozFetchAsStream(nsIInputStreamCallback callback, optional DOMString? type = null);
+           attribute PrintCallback? mozPrintCallback;
+};
+*/