Bug 826740 - Part b: Remove unused arguments from nsIDOMHTMLCanvasElement; r=khuey

content/html/content/src/HTMLCanvasElement.cpp

@@ -342,7 +342,7 @@ HTMLCanvasElement::ParseAttribute(int32_t aNamespaceID,
 
 NS_IMETHODIMP
 HTMLCanvasElement::ToDataURL(const nsAString& aType, nsIVariant* aParams,
-                             uint8_t optional_argc, nsAString& aDataURL)
+                             nsAString& aDataURL)
 {
   // do a trust check if this is a write-only canvas
   if (mWriteOnly && !nsContentUtils::IsCallerChrome()) {
@@ -551,9 +551,7 @@ HTMLCanvasElement::ToDataURLImpl(const nsAString& aMimeType,
 // XXXkhuey the encoding should be off the main thread, but we're lazy.
 NS_IMETHODIMP
 HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback,
-                          const nsAString& aType,
-                          nsIVariant* aParams,
-                          uint8_t optional_argc)
+                          const nsAString& aType)
 {
   // do a trust check if this is a write-only canvas
   if (mWriteOnly && !nsContentUtils::IsCallerChrome()) {
@@ -605,7 +603,6 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback,
 NS_IMETHODIMP
 HTMLCanvasElement::MozGetAsFile(const nsAString& aName,
                                 const nsAString& aType,
-                                uint8_t optional_argc,
                                 nsIDOMFile** aResult)
 {
   // do a trust check if this is a write-only canvas

dom/interfaces/html/nsIDOMHTMLCanvasElement.idl

@@ -46,7 +46,7 @@ interface nsIFileCallback : nsISupports {
   void receive(in nsIDOMBlob file);
 };
 
-[scriptable, uuid(1cfacc53-ab73-4ceb-9f5f-22387dcd1aae)]
+[scriptable, uuid(83d84fe5-cd02-41ff-ac86-668775627d82)]
 interface nsIDOMHTMLCanvasElement : nsIDOMHTMLElement
 {
   attribute unsigned long width;
@@ -61,18 +61,16 @@ interface nsIDOMHTMLCanvasElement : nsIDOMHTMLElement
   //  toDataURL();              -- defaults to image/png
   //  toDataURL(type);          -- uses given type
   //  toDataURL(type, params);  -- uses given type, and any valid parameters
-  [optional_argc] DOMString toDataURL([optional] in DOMString type,
-                                      [optional] in nsIVariant params);
+  DOMString toDataURL([optional] in DOMString type,
+                      [optional] in nsIVariant params);
 
   // Valid calls are
   // mozGetAsFile(name);              -- defaults to image/png
   // mozGetAsFile(name, type);        -- uses given type
-  [optional_argc] nsIDOMFile mozGetAsFile(in DOMString name,
-                                          [optional] in DOMString type);
+  nsIDOMFile mozGetAsFile(in DOMString name, [optional] in DOMString type);
 
-  [optional_argc] void toBlob(in nsIFileCallback callback,
-                              [optional] in DOMString type,
-                              [optional] in nsIVariant params);
+  void toBlob(in nsIFileCallback callback,
+              [optional] in DOMString type);
 
   // A Mozilla-only extension to get a canvas context backed by double-buffered
   // shared memory. Only privileged callers can call this.