mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
Ms2ger 2013-04-13 09:04:53 +02:00
Родитель 15b0f65a83
Коммит bd2685689e
2 изменённых файлов: 8 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
content/html/content/src/HTMLCanvasElement.cpp
Просмотреть файл

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

14
dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
Просмотреть файл

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