Fix for bug 19185. document.clear(), which exists for JS compatibility anyway, now takes a JS context and uses it to find the URL of the calling context. r=pollmann
git-svn-id: svn://10.0.0.236/trunk@59576 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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); } \
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
void open(/* ... */);
|
||||
void write(/* ... */);
|
||||
void writeln(/* ... */);
|
||||
void clear();
|
||||
void clear(/* ... */);
|
||||
|
||||
void captureEvents(in long eventFlags);
|
||||
void releaseEvents(in long eventFlags);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user