diff options
Diffstat (limited to 'WebCore/bindings/js/JSHTMLDocumentCustom.cpp')
| -rw-r--r-- | WebCore/bindings/js/JSHTMLDocumentCustom.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/WebCore/bindings/js/JSHTMLDocumentCustom.cpp b/WebCore/bindings/js/JSHTMLDocumentCustom.cpp index be57a3d..be2d158 100644 --- a/WebCore/bindings/js/JSHTMLDocumentCustom.cpp +++ b/WebCore/bindings/js/JSHTMLDocumentCustom.cpp @@ -51,7 +51,7 @@ bool JSHTMLDocument::canGetItemsForName(ExecState*, HTMLDocument* document, cons return atomicPropertyName && (document->hasNamedItem(atomicPropertyName) || document->hasExtraNamedItem(atomicPropertyName)); } -JSValue* JSHTMLDocument::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) +JSValuePtr JSHTMLDocument::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { JSHTMLDocument* thisObj = static_cast<JSHTMLDocument*>(asObject(slot.slotBase())); HTMLDocument* document = static_cast<HTMLDocument*>(thisObj->impl()); @@ -78,16 +78,17 @@ JSValue* JSHTMLDocument::nameGetter(ExecState* exec, const Identifier& propertyN // Custom attributes -JSValue* JSHTMLDocument::all(ExecState* exec) const +JSValuePtr JSHTMLDocument::all(ExecState* exec) const { // If "all" has been overwritten, return the overwritten value - if (JSValue* v = getDirect(Identifier(exec, "all"))) + JSValuePtr v = getDirect(Identifier(exec, "all")); + if (v) return v; return toJS(exec, static_cast<HTMLDocument*>(impl())->all().get()); } -void JSHTMLDocument::setAll(ExecState* exec, JSValue* value) +void JSHTMLDocument::setAll(ExecState* exec, JSValuePtr value) { // Add "all" to the property map. putDirect(Identifier(exec, "all"), value); @@ -95,7 +96,7 @@ void JSHTMLDocument::setAll(ExecState* exec, JSValue* value) // Custom functions -JSValue* JSHTMLDocument::open(ExecState* exec, const ArgList& args) +JSValuePtr JSHTMLDocument::open(ExecState* exec, const ArgList& args) { // For compatibility with other browsers, pass open calls with more than 2 parameters to the window. if (args.size() > 2) { @@ -103,9 +104,9 @@ JSValue* JSHTMLDocument::open(ExecState* exec, const ArgList& args) if (frame) { JSDOMWindowShell* wrapper = toJSDOMWindowShell(frame); if (wrapper) { - JSValue* function = wrapper->get(exec, Identifier(exec, "open")); + JSValuePtr function = wrapper->get(exec, Identifier(exec, "open")); CallData callData; - CallType callType = function->getCallData(callData); + CallType callType = function.getCallData(callData); if (callType == CallTypeNone) return throwError(exec, TypeError); return call(exec, function, callType, callData, wrapper, args); @@ -120,7 +121,7 @@ JSValue* JSHTMLDocument::open(ExecState* exec, const ArgList& args) // In the case of two parameters or fewer, do a normal document open. static_cast<HTMLDocument*>(impl())->open(activeDocument); - return jsUndefined(); + return this; } static String writeHelper(ExecState* exec, const ArgList& args) @@ -130,22 +131,22 @@ static String writeHelper(ExecState* exec, const ArgList& args) unsigned size = args.size(); if (size == 1) - return args.at(exec, 0)->toString(exec); + return args.at(exec, 0).toString(exec); Vector<UChar> result; for (unsigned i = 0; i < size; ++i) - append(result, args.at(exec, i)->toString(exec)); + append(result, args.at(exec, i).toString(exec)); return String::adopt(result); } -JSValue* JSHTMLDocument::write(ExecState* exec, const ArgList& args) +JSValuePtr JSHTMLDocument::write(ExecState* exec, const ArgList& args) { Document* activeDocument = asJSDOMWindow(exec->lexicalGlobalObject())->impl()->document(); static_cast<HTMLDocument*>(impl())->write(writeHelper(exec, args), activeDocument); return jsUndefined(); } -JSValue* JSHTMLDocument::writeln(ExecState* exec, const ArgList& args) +JSValuePtr JSHTMLDocument::writeln(ExecState* exec, const ArgList& args) { Document* activeDocument = asJSDOMWindow(exec->lexicalGlobalObject())->impl()->document(); static_cast<HTMLDocument*>(impl())->write(writeHelper(exec, args) + "\n", activeDocument); |