Modified: trunk/Source/WebCore/ChangeLog (99775 => 99776)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 23:55:37 UTC (rev 99775)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 23:55:47 UTC (rev 99776)
@@ -1,3 +1,12 @@
+2011-11-09 Kentaro Hara <hara...@chromium.org>
+
+ Unreviewed, rebaseline run-bindings-tests results.
+
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ (WebCore::JSTestNamedConstructorConstructor::getOwnPropertyDescriptor):
+ (WebCore::JSTestNamedConstructor::getOwnPropertyDescriptor):
+ * bindings/scripts/test/JS/JSTestNamedConstructor.h:
+
2011-11-09 Alexandre Elias <ael...@google.com>
[chromium] Add draw-time scale delta to compositor thread
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (99775 => 99776)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2011-11-09 23:55:37 UTC (rev 99775)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2011-11-09 23:55:47 UTC (rev 99776)
@@ -88,9 +88,9 @@
return getStaticValueSlot<JSTestNamedConstructorConstructor, JSDOMWrapper>(exec, &JSTestNamedConstructorConstructorTable, static_cast<JSTestNamedConstructorConstructor*>(cell), propertyName, slot);
}
-bool JSTestNamedConstructorConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+bool JSTestNamedConstructorConstructor::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
{
- return getStaticValueDescriptor<JSTestNamedConstructorConstructor, JSDOMWrapper>(exec, &JSTestNamedConstructorConstructorTable, this, propertyName, descriptor);
+ return getStaticValueDescriptor<JSTestNamedConstructorConstructor, JSDOMWrapper>(exec, &JSTestNamedConstructorConstructorTable, static_cast<JSTestNamedConstructorConstructor*>(object), propertyName, descriptor);
}
/* Hash table for prototype */
@@ -145,10 +145,11 @@
return getStaticValueSlot<JSTestNamedConstructor, Base>(exec, &JSTestNamedConstructorTable, thisObject, propertyName, slot);
}
-bool JSTestNamedConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+bool JSTestNamedConstructor::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
{
- ASSERT_GC_OBJECT_INHERITS(this, &s_info);
- return getStaticValueDescriptor<JSTestNamedConstructor, Base>(exec, &JSTestNamedConstructorTable, this, propertyName, descriptor);
+ JSTestNamedConstructor* thisObject = static_cast<JSTestNamedConstructor*>(object);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
+ return getStaticValueDescriptor<JSTestNamedConstructor, Base>(exec, &JSTestNamedConstructorTable, thisObject, propertyName, descriptor);
}
JSValue jsTestNamedConstructorConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h (99775 => 99776)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h 2011-11-09 23:55:37 UTC (rev 99775)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h 2011-11-09 23:55:47 UTC (rev 99776)
@@ -41,7 +41,7 @@
static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
- virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);
+ static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);
static const JSC::ClassInfo s_info;
static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
@@ -117,7 +117,7 @@
}
static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
- virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
+ static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
static const JSC::ClassInfo s_info;
static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
{
