Diff
Modified: trunk/Source/_javascript_Core/API/JSCallbackObject.h (98001 => 98002)
--- trunk/Source/_javascript_Core/API/JSCallbackObject.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/API/JSCallbackObject.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -188,7 +188,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier&);
static bool deleteProperty(JSCell*, ExecState*, const Identifier&);
virtual bool deletePropertyVirtual(ExecState*, unsigned);
- static bool deleteProperty(JSCell*, ExecState*, unsigned);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned);
virtual bool hasInstance(ExecState* exec, JSValue value, JSValue proto);
Modified: trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h (98001 => 98002)
--- trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/API/JSCallbackObjectFunctions.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -325,11 +325,11 @@
template <class Parent>
bool JSCallbackObject<Parent>::deletePropertyVirtual(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(this, exec, propertyName);
+ return deletePropertyByIndex(this, exec, propertyName);
}
template <class Parent>
-bool JSCallbackObject<Parent>::deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
+bool JSCallbackObject<Parent>::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
{
return static_cast<JSCallbackObject*>(cell)->deletePropertyVirtual(exec, Identifier::from(exec, propertyName));
}
Modified: trunk/Source/_javascript_Core/ChangeLog (98001 => 98002)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-20 18:14:50 UTC (rev 98002)
@@ -1,3 +1,42 @@
+2011-10-20 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Rename static deleteProperty to deletePropertyByIndex
+ https://bugs.webkit.org/show_bug.cgi?id=70257
+
+ Reviewed by Geoffrey Garen.
+
+ Renaming versions of deleteProperty that use an unsigned as the property
+ name to "deletePropertyByIndex" in preparation for adding them to the
+ MethodTable, which requires unique names for each method.
+
+ * API/JSCallbackObject.h:
+ * API/JSCallbackObjectFunctions.h:
+ (JSC::::deletePropertyVirtual):
+ (JSC::::deletePropertyByIndex):
+ * runtime/Arguments.cpp:
+ (JSC::Arguments::deletePropertyVirtual):
+ (JSC::Arguments::deletePropertyByIndex):
+ * runtime/Arguments.h:
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::deletePropertyVirtual):
+ (JSC::JSArray::deletePropertyByIndex):
+ * runtime/JSArray.h:
+ * runtime/JSCell.cpp:
+ (JSC::JSCell::deletePropertyVirtual):
+ (JSC::JSCell::deletePropertyByIndex):
+ * runtime/JSCell.h:
+ * runtime/JSNotAnObject.cpp:
+ (JSC::JSNotAnObject::deletePropertyVirtual):
+ (JSC::JSNotAnObject::deletePropertyByIndex):
+ * runtime/JSNotAnObject.h:
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::deletePropertyVirtual):
+ (JSC::JSObject::deletePropertyByIndex):
+ * runtime/JSObject.h:
+ * runtime/RegExpMatchesArray.h:
+ (JSC::RegExpMatchesArray::deletePropertyVirtual):
+ (JSC::RegExpMatchesArray::deletePropertyByIndex):
+
2011-10-20 Filip Pizlo <fpi...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=70482
Modified: trunk/Source/_javascript_Core/runtime/Arguments.cpp (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/Arguments.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/Arguments.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -330,10 +330,10 @@
bool Arguments::deletePropertyVirtual(ExecState* exec, unsigned i)
{
- return deleteProperty(this, exec, i);
+ return deletePropertyByIndex(this, exec, i);
}
-bool Arguments::deleteProperty(JSCell* cell, ExecState* exec, unsigned i)
+bool Arguments::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned i)
{
Arguments* thisObject = static_cast<Arguments*>(cell);
if (i < thisObject->d->numArguments) {
Modified: trunk/Source/_javascript_Core/runtime/Arguments.h (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/Arguments.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/Arguments.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -148,7 +148,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier& propertyName);
static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
virtual bool deletePropertyVirtual(ExecState*, unsigned propertyName);
- static bool deleteProperty(JSCell*, ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
void createStrictModeCallerIfNecessary(ExecState*);
void createStrictModeCalleeIfNecessary(ExecState*);
Modified: trunk/Source/_javascript_Core/runtime/JSArray.cpp (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSArray.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSArray.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -528,10 +528,10 @@
bool JSArray::deletePropertyVirtual(ExecState* exec, unsigned i)
{
- return deleteProperty(this, exec, i);
+ return deletePropertyByIndex(this, exec, i);
}
-bool JSArray::deleteProperty(JSCell* cell, ExecState* exec, unsigned i)
+bool JSArray::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned i)
{
JSArray* thisObject = static_cast<JSArray*>(cell);
thisObject->checkConsistency();
Modified: trunk/Source/_javascript_Core/runtime/JSArray.h (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSArray.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSArray.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -177,7 +177,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier& propertyName);
static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
virtual bool deletePropertyVirtual(ExecState*, unsigned propertyName);
- static bool deleteProperty(JSCell*, ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
void* subclassData() const;
Modified: trunk/Source/_javascript_Core/runtime/JSCell.cpp (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSCell.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -135,10 +135,10 @@
bool JSCell::deletePropertyVirtual(ExecState* exec, unsigned identifier)
{
- return deleteProperty(this, exec, identifier);
+ return deletePropertyByIndex(this, exec, identifier);
}
-bool JSCell::deleteProperty(JSCell* cell, ExecState* exec, unsigned identifier)
+bool JSCell::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned identifier)
{
return cell->toObject(exec, exec->lexicalGlobalObject())->deletePropertyVirtual(exec, identifier);
}
Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSCell.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSCell.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -98,7 +98,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier& propertyName);
static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
virtual bool deletePropertyVirtual(ExecState*, unsigned propertyName);
- static bool deleteProperty(JSCell*, ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
virtual JSObject* toThisObject(ExecState*) const;
Modified: trunk/Source/_javascript_Core/runtime/JSNotAnObject.cpp (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSNotAnObject.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSNotAnObject.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -107,10 +107,10 @@
bool JSNotAnObject::deletePropertyVirtual(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(this, exec, propertyName);
+ return deletePropertyByIndex(this, exec, propertyName);
}
-bool JSNotAnObject::deleteProperty(JSCell*, ExecState* exec, unsigned)
+bool JSNotAnObject::deletePropertyByIndex(JSCell*, ExecState* exec, unsigned)
{
ASSERT_UNUSED(exec, exec->hadException());
return false;
Modified: trunk/Source/_javascript_Core/runtime/JSNotAnObject.h (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSNotAnObject.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSNotAnObject.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -83,7 +83,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier& propertyName);
static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
virtual bool deletePropertyVirtual(ExecState*, unsigned propertyName);
- static bool deleteProperty(JSCell*, ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
};
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -292,10 +292,10 @@
bool JSObject::deletePropertyVirtual(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(this, exec, propertyName);
+ return deletePropertyByIndex(this, exec, propertyName);
}
-bool JSObject::deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
+bool JSObject::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
{
return static_cast<JSObject*>(cell)->deletePropertyVirtual(exec, Identifier::from(exec, propertyName));
}
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -128,7 +128,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier& propertyName);
static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
virtual bool deletePropertyVirtual(ExecState*, unsigned propertyName);
- static bool deleteProperty(JSCell*, ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
Modified: trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h (98001 => 98002)
--- trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -117,15 +117,15 @@
virtual bool deletePropertyVirtual(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(this, exec, propertyName);
+ return deletePropertyByIndex(this, exec, propertyName);
}
- static bool deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
+ static bool deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
{
RegExpMatchesArray* thisObject = static_cast<RegExpMatchesArray*>(cell);
if (thisObject->subclassData())
thisObject->fillArrayInstance(exec);
- return JSArray::deleteProperty(thisObject, exec, propertyName);
+ return JSArray::deletePropertyByIndex(thisObject, exec, propertyName);
}
virtual void getOwnPropertyNames(ExecState* exec, PropertyNameArray& arr, EnumerationMode mode = ExcludeDontEnumProperties)
Modified: trunk/Source/WebCore/ChangeLog (98001 => 98002)
--- trunk/Source/WebCore/ChangeLog 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/WebCore/ChangeLog 2011-10-20 18:14:50 UTC (rev 98002)
@@ -1,3 +1,21 @@
+2011-10-20 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Rename static deleteProperty to deletePropertyByIndex
+ https://bugs.webkit.org/show_bug.cgi?id=70257
+
+ Reviewed by Geoffrey Garen.
+
+ No new tests.
+
+ Renaming versions of deleteProperty that use an unsigned as the property
+ name to "deletePropertyByIndex" in preparation for adding them to the
+ MethodTable, which requires unique names for each method.
+
+ * bridge/runtime_array.cpp:
+ (JSC::RuntimeArray::deletePropertyVirtual):
+ (JSC::RuntimeArray::deletePropertyByIndex):
+ * bridge/runtime_array.h:
+
2011-10-20 Eric Carlson <eric.carl...@apple.com>
Rename some Cue classes to TextTrack
Modified: trunk/Source/WebCore/bridge/runtime_array.cpp (98001 => 98002)
--- trunk/Source/WebCore/bridge/runtime_array.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/WebCore/bridge/runtime_array.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -193,10 +193,10 @@
bool RuntimeArray::deletePropertyVirtual(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(this, exec, propertyName);
+ return deletePropertyByIndex(this, exec, propertyName);
}
-bool RuntimeArray::deleteProperty(JSCell*, ExecState*, unsigned)
+bool RuntimeArray::deletePropertyByIndex(JSCell*, ExecState*, unsigned)
{
return false;
}
Modified: trunk/Source/WebCore/bridge/runtime_array.h (98001 => 98002)
--- trunk/Source/WebCore/bridge/runtime_array.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/WebCore/bridge/runtime_array.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -63,7 +63,7 @@
virtual bool deletePropertyVirtual(ExecState*, const Identifier &propertyName);
static bool deleteProperty(JSCell*, ExecState*, const Identifier &propertyName);
virtual bool deletePropertyVirtual(ExecState*, unsigned propertyName);
- static bool deleteProperty(JSCell*, ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
unsigned getLength() const { return getConcreteArray()->getLength(); }
Modified: trunk/Source/WebKit2/ChangeLog (98001 => 98002)
--- trunk/Source/WebKit2/ChangeLog 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-20 18:14:50 UTC (rev 98002)
@@ -1,3 +1,19 @@
+2011-10-20 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Rename static deleteProperty to deletePropertyByIndex
+ https://bugs.webkit.org/show_bug.cgi?id=70257
+
+ Reviewed by Geoffrey Garen.
+
+ Renaming versions of deleteProperty that use an unsigned as the property
+ name to "deletePropertyByIndex" in preparation for adding them to the
+ MethodTable, which requires unique names for each method.
+
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+ (WebKit::JSNPObject::deletePropertyVirtual):
+ (WebKit::JSNPObject::deletePropertyByIndex):
+ * WebProcess/Plugins/Netscape/JSNPObject.h:
+
2011-10-20 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Remove WebKitWebLoaderClientPrivate
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (98001 => 98002)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2011-10-20 18:14:50 UTC (rev 98002)
@@ -368,10 +368,10 @@
bool JSNPObject::deletePropertyVirtual(ExecState* exec, unsigned propertyName)
{
- return deleteProperty(this, exec, propertyName);
+ return deletePropertyByIndex(this, exec, propertyName);
}
-bool JSNPObject::deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
+bool JSNPObject::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
{
return static_cast<JSNPObject*>(cell)->deleteProperty(exec, static_cast<NPIdentifier>(IdentifierRep::get(propertyName)));
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h (98001 => 98002)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2011-10-20 18:12:08 UTC (rev 98001)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2011-10-20 18:14:50 UTC (rev 98002)
@@ -92,7 +92,7 @@
virtual bool deletePropertyVirtual(JSC::ExecState*, const JSC::Identifier& propertyName);
static bool deleteProperty(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName);
virtual bool deletePropertyVirtual(JSC::ExecState*, unsigned propertyName);
- static bool deleteProperty(JSC::JSCell*, JSC::ExecState*, unsigned propertyName);
+ static bool deletePropertyByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName);
bool deleteProperty(JSC::ExecState*, NPIdentifier propertyName);
