Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )

1 files changed, 62 insertions, 47 deletions

diff --git a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp
index 6adba28..7ae8c6e 100644
--- a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp
+++ b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp
@@ -33,7 +33,7 @@ using namespace JSC;
 
 namespace WebCore {
 
-ASSERT_CLASS_FITS_IN_CELL(JSConsole)
+ASSERT_CLASS_FITS_IN_CELL(JSConsole);
 
 /* Hash table */
 
@@ -82,9 +82,9 @@ static const HashTable JSConsolePrototypeTable =
 
 const ClassInfo JSConsolePrototype::s_info = { "ConsolePrototype", 0, &JSConsolePrototypeTable, 0 };
 
-JSObject* JSConsolePrototype::self(ExecState* exec)
+JSObject* JSConsolePrototype::self(ExecState* exec, JSGlobalObject* globalObject)
 {
-    return getDOMPrototype<JSConsole>(exec);
+    return getDOMPrototype<JSConsole>(exec, globalObject);
 }
 
 bool JSConsolePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
@@ -103,12 +103,11 @@ JSConsole::JSConsole(PassRefPtr<Structure> structure, PassRefPtr<Console> impl)
 JSConsole::~JSConsole()
 {
     forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get());
-
 }
 
-JSObject* JSConsole::createPrototype(ExecState* exec)
+JSObject* JSConsole::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
 {
-    return new (exec) JSConsolePrototype(JSConsolePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype()));
+    return new (exec) JSConsolePrototype(JSConsolePrototype::createStructure(globalObject->objectPrototype()));
 }
 
 bool JSConsole::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
@@ -116,14 +115,15 @@ bool JSConsole::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa
     return getStaticValueSlot<JSConsole, Base>(exec, &JSConsoleTable, this, propertyName, slot);
 }
 
-JSValuePtr jsConsoleProfiles(ExecState* exec, const Identifier&, const PropertySlot& slot)
+JSValue jsConsoleProfiles(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
     return static_cast<JSConsole*>(asObject(slot.slotBase()))->profiles(exec);
 }
 
-JSValuePtr jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -133,9 +133,10 @@ JSValuePtr jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValuePt
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionError(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionError(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -145,9 +146,10 @@ JSValuePtr jsConsolePrototypeFunctionError(ExecState* exec, JSObject*, JSValuePt
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionInfo(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionInfo(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -157,9 +159,10 @@ JSValuePtr jsConsolePrototypeFunctionInfo(ExecState* exec, JSObject*, JSValuePtr
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionLog(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionLog(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -169,9 +172,10 @@ JSValuePtr jsConsolePrototypeFunctionLog(ExecState* exec, JSObject*, JSValuePtr
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionWarn(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionWarn(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -181,9 +185,10 @@ JSValuePtr jsConsolePrototypeFunctionWarn(ExecState* exec, JSObject*, JSValuePtr
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionDir(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDir(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -193,9 +198,10 @@ JSValuePtr jsConsolePrototypeFunctionDir(ExecState* exec, JSObject*, JSValuePtr
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionDirxml(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDirxml(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -205,9 +211,10 @@ JSValuePtr jsConsolePrototypeFunctionDirxml(ExecState* exec, JSObject*, JSValueP
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionTrace(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTrace(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -217,22 +224,24 @@ JSValuePtr jsConsolePrototypeFunctionTrace(ExecState* exec, JSObject*, JSValuePt
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionAssert(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionAssert(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
     ScriptCallStack callStack(exec, args, 1);
-    bool condition = args.at(exec, 0)->toBoolean(exec);
+    bool condition = args.at(0).toBoolean(exec);
 
     imp->assertCondition(condition, &callStack);
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionCount(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionCount(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -242,60 +251,65 @@ JSValuePtr jsConsolePrototypeFunctionCount(ExecState* exec, JSObject*, JSValuePt
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionProfile(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionProfile(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
     ScriptCallStack callStack(exec, args, 1);
-    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0));
+    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0));
 
     imp->profile(title, &callStack);
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionProfileEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionProfileEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
     ScriptCallStack callStack(exec, args, 1);
-    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0));
+    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0));
 
     imp->profileEnd(title, &callStack);
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionTime(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
-    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0));
+    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0));
 
     imp->time(title);
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionTimeEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionTimeEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
     ScriptCallStack callStack(exec, args, 1);
-    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(exec, 0));
+    const UString& title = valueToStringWithUndefinedOrNullCheck(exec, args.at(0));
 
     imp->timeEnd(title, &callStack);
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionGroup(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroup(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -305,9 +319,10 @@ JSValuePtr jsConsolePrototypeFunctionGroup(ExecState* exec, JSObject*, JSValuePt
     return jsUndefined();
 }
 
-JSValuePtr jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSConsole::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSConsole::s_info))
         return throwError(exec, TypeError);
     JSConsole* castedThisObj = static_cast<JSConsole*>(asObject(thisValue));
     Console* imp = static_cast<Console*>(castedThisObj->impl());
@@ -316,13 +331,13 @@ JSValuePtr jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObject*, JSValu
     return jsUndefined();
 }
 
-JSC::JSValuePtr toJS(JSC::ExecState* exec, Console* object)
+JSC::JSValue toJS(JSC::ExecState* exec, Console* object)
 {
     return getDOMObjectWrapper<JSConsole>(exec, object);
 }
-Console* toConsole(JSC::JSValuePtr value)
+Console* toConsole(JSC::JSValue value)
 {
-    return value->isObject(&JSConsole::s_info) ? static_cast<JSConsole*>(asObject(value))->impl() : 0;
+    return value.isObject(&JSConsole::s_info) ? static_cast<JSConsole*>(asObject(value))->impl() : 0;
 }
 
 }