diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 9ab9b3c12ee..1cc0eb180fd 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -1842,9 +1842,9 @@ nsHTMLDocument::Open(JSContext *cx, jsval *argv, PRUint32 argc) #define NS_GENERATE_PARSER_KEY() (void*)((mIsWriting << 31) | (mWriteLevel & 0x7fffffff)) NS_IMETHODIMP -nsHTMLDocument::Clear() +nsHTMLDocument::Clear(JSContext* cx, jsval* argv, PRUint32 argc) { - return Open(); + return Open(cx, argv, argc); } NS_IMETHODIMP diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h index 16f061eccdf..7885c0debc2 100644 --- a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h +++ b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h @@ -72,7 +72,7 @@ public: NS_IMETHOD Writeln(JSContext* cx, jsval* argv, PRUint32 argc)=0; - NS_IMETHOD Clear()=0; + NS_IMETHOD Clear(JSContext* cx, jsval* argv, PRUint32 argc)=0; NS_IMETHOD CaptureEvents(PRInt32 aEventFlags)=0; @@ -101,7 +101,7 @@ public: NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc); \ NS_IMETHOD Write(JSContext* cx, jsval* argv, PRUint32 argc); \ NS_IMETHOD Writeln(JSContext* cx, jsval* argv, PRUint32 argc); \ - NS_IMETHOD Clear(); \ + NS_IMETHOD Clear(JSContext* cx, jsval* argv, PRUint32 argc); \ NS_IMETHOD CaptureEvents(PRInt32 aEventFlags); \ NS_IMETHOD ReleaseEvents(PRInt32 aEventFlags); \ NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt); \ @@ -127,7 +127,7 @@ public: NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Open(cx, argv, argc); } \ NS_IMETHOD Write(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Write(cx, argv, argc); } \ NS_IMETHOD Writeln(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Writeln(cx, argv, argc); } \ - NS_IMETHOD Clear() { return _to Clear(); } \ + NS_IMETHOD Clear(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Clear(cx, argv, argc); } \ NS_IMETHOD CaptureEvents(PRInt32 aEventFlags) { return _to CaptureEvents(aEventFlags); } \ NS_IMETHOD ReleaseEvents(PRInt32 aEventFlags) { return _to ReleaseEvents(aEventFlags); } \ NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt) { return _to RouteEvent(aEvt); } \ diff --git a/mozilla/dom/public/idl/html/HTMLDocument.idl b/mozilla/dom/public/idl/html/HTMLDocument.idl index 209a673e04c..8c1746b55ad 100644 --- a/mozilla/dom/public/idl/html/HTMLDocument.idl +++ b/mozilla/dom/public/idl/html/HTMLDocument.idl @@ -42,7 +42,7 @@ void open(/* ... */); void write(/* ... */); void writeln(/* ... */); - void clear(); + void clear(/* ... */); void captureEvents(in long eventFlags); void releaseEvents(in long eventFlags); diff --git a/mozilla/dom/src/html/nsJSHTMLDocument.cpp b/mozilla/dom/src/html/nsJSHTMLDocument.cpp index 914c0c9173f..48197d9befd 100644 --- a/mozilla/dom/src/html/nsJSHTMLDocument.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDocument.cpp @@ -1190,7 +1190,7 @@ NSHTMLDocumentClear(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval } - result = nativeThis->Clear(); + result = nativeThis->Clear(cx, argv+0, argc-0); if (NS_FAILED(result)) { return nsJSUtils::nsReportError(cx, obj, result); } diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 9ab9b3c12ee..1cc0eb180fd 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -1842,9 +1842,9 @@ nsHTMLDocument::Open(JSContext *cx, jsval *argv, PRUint32 argc) #define NS_GENERATE_PARSER_KEY() (void*)((mIsWriting << 31) | (mWriteLevel & 0x7fffffff)) NS_IMETHODIMP -nsHTMLDocument::Clear() +nsHTMLDocument::Clear(JSContext* cx, jsval* argv, PRUint32 argc) { - return Open(); + return Open(cx, argv, argc); } NS_IMETHODIMP