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

1 files changed, 19 insertions, 19 deletions

diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp
index a7a6259d75..743d22bee5 100644
--- a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp
+++ b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp
@@ -39,7 +39,7 @@ using namespace JSC;
 
 namespace WebCore {
 
-ASSERT_CLASS_FITS_IN_CELL(JSXPathExpression)
+ASSERT_CLASS_FITS_IN_CELL(JSXPathExpression);
 
 /* Hash table */
 
@@ -75,13 +75,13 @@ public:
     JSXPathExpressionConstructor(ExecState* exec)
         : DOMObject(JSXPathExpressionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype()))
     {
-        putDirect(exec->propertyNames().prototype, JSXPathExpressionPrototype::self(exec), None);
+        putDirect(exec->propertyNames().prototype, JSXPathExpressionPrototype::self(exec, exec->lexicalGlobalObject()), None);
     }
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
     virtual const ClassInfo* classInfo() const { return &s_info; }
     static const ClassInfo s_info;
 
-    static PassRefPtr<Structure> createStructure(JSValuePtr proto) 
+    static PassRefPtr<Structure> createStructure(JSValue proto) 
     { 
         return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); 
     }
@@ -111,9 +111,9 @@ static const HashTable JSXPathExpressionPrototypeTable =
 
 const ClassInfo JSXPathExpressionPrototype::s_info = { "XPathExpressionPrototype", 0, &JSXPathExpressionPrototypeTable, 0 };
 
-JSObject* JSXPathExpressionPrototype::self(ExecState* exec)
+JSObject* JSXPathExpressionPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
 {
-    return getDOMPrototype<JSXPathExpression>(exec);
+    return getDOMPrototype<JSXPathExpression>(exec, globalObject);
 }
 
 bool JSXPathExpressionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
@@ -132,12 +132,11 @@ JSXPathExpression::JSXPathExpression(PassRefPtr<Structure> structure, PassRefPtr
 JSXPathExpression::~JSXPathExpression()
 {
     forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get());
-
 }
 
-JSObject* JSXPathExpression::createPrototype(ExecState* exec)
+JSObject* JSXPathExpression::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
 {
-    return new (exec) JSXPathExpressionPrototype(JSXPathExpressionPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype()));
+    return new (exec) JSXPathExpressionPrototype(JSXPathExpressionPrototype::createStructure(globalObject->objectPrototype()));
 }
 
 bool JSXPathExpression::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
@@ -145,39 +144,40 @@ bool JSXPathExpression::getOwnPropertySlot(ExecState* exec, const Identifier& pr
     return getStaticValueSlot<JSXPathExpression, Base>(exec, &JSXPathExpressionTable, this, propertyName, slot);
 }
 
-JSValuePtr jsXPathExpressionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot)
+JSValue jsXPathExpressionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
     return static_cast<JSXPathExpression*>(asObject(slot.slotBase()))->getConstructor(exec);
 }
-JSValuePtr JSXPathExpression::getConstructor(ExecState* exec)
+JSValue JSXPathExpression::getConstructor(ExecState* exec)
 {
     return getDOMConstructor<JSXPathExpressionConstructor>(exec);
 }
 
-JSValuePtr jsXPathExpressionPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args)
+JSValue JSC_HOST_CALL jsXPathExpressionPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue->isObject(&JSXPathExpression::s_info))
+    UNUSED_PARAM(args);
+    if (!thisValue.isObject(&JSXPathExpression::s_info))
         return throwError(exec, TypeError);
     JSXPathExpression* castedThisObj = static_cast<JSXPathExpression*>(asObject(thisValue));
     XPathExpression* imp = static_cast<XPathExpression*>(castedThisObj->impl());
     ExceptionCode ec = 0;
-    Node* contextNode = toNode(args.at(exec, 0));
-    unsigned short type = args.at(exec, 1)->toInt32(exec);
-    XPathResult* inResult = toXPathResult(args.at(exec, 2));
+    Node* contextNode = toNode(args.at(0));
+    unsigned short type = args.at(1).toInt32(exec);
+    XPathResult* inResult = toXPathResult(args.at(2));
 
 
-    JSC::JSValuePtr result = toJS(exec, WTF::getPtr(imp->evaluate(contextNode, type, inResult, ec)));
+    JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(contextNode, type, inResult, ec)));
     setDOMException(exec, ec);
     return result;
 }
 
-JSC::JSValuePtr toJS(JSC::ExecState* exec, XPathExpression* object)
+JSC::JSValue toJS(JSC::ExecState* exec, XPathExpression* object)
 {
     return getDOMObjectWrapper<JSXPathExpression>(exec, object);
 }
-XPathExpression* toXPathExpression(JSC::JSValuePtr value)
+XPathExpression* toXPathExpression(JSC::JSValue value)
 {
-    return value->isObject(&JSXPathExpression::s_info) ? static_cast<JSXPathExpression*>(asObject(value))->impl() : 0;
+    return value.isObject(&JSXPathExpression::s_info) ? static_cast<JSXPathExpression*>(asObject(value))->impl() : 0;
 }
 
 }