Commit 8a10db98 authored by mhahnenberg@apple.com's avatar mhahnenberg@apple.com

Rename static deleteProperty to deletePropertyByIndex

https://bugs.webkit.org/show_bug.cgi?id=70257

Reviewed by Geoffrey Garen.

Source/JavaScriptCore: 

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):

Source/WebCore: 

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:

Source/WebKit2: 

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@98002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 956312c2
......@@ -188,7 +188,7 @@ private:
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);
......
......@@ -325,11 +325,11 @@ bool JSCallbackObject<Parent>::deleteProperty(JSCell* cell, ExecState* exec, con
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));
}
......
2011-10-20 Mark Hahnenberg <mhahnenberg@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 <fpizlo@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=70482
......@@ -330,10 +330,10 @@ void Arguments::put(JSCell* cell, ExecState* exec, const Identifier& propertyNam
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) {
......
......@@ -148,7 +148,7 @@ namespace JSC {
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*);
......
......@@ -528,10 +528,10 @@ bool JSArray::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& pr
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();
......
......@@ -177,7 +177,7 @@ namespace JSC {
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;
......
......@@ -135,10 +135,10 @@ bool JSCell::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& ide
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);
}
......
......@@ -98,7 +98,7 @@ namespace JSC {
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;
......
......@@ -107,10 +107,10 @@ bool JSNotAnObject::deleteProperty(JSCell*, ExecState* exec, const Identifier&)
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;
......
......@@ -83,7 +83,7 @@ namespace JSC {
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);
};
......
......@@ -292,10 +292,10 @@ bool JSObject::hasOwnProperty(ExecState* exec, const Identifier& propertyName) c
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));
}
......
......@@ -128,7 +128,7 @@ namespace JSC {
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;
......
......@@ -117,15 +117,15 @@ namespace JSC {
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)
......
2011-10-20 Mark Hahnenberg <mhahnenberg@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.carlson@apple.com>
Rename some Cue classes to TextTrack
......
......@@ -193,10 +193,10 @@ bool RuntimeArray::deleteProperty(JSCell*, ExecState*, const Identifier&)
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;
}
......
......@@ -63,7 +63,7 @@ public:
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(); }
......
2011-10-20 Mark Hahnenberg <mhahnenberg@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 <cgarcia@igalia.com>
[GTK] Remove WebKitWebLoaderClientPrivate
......
......@@ -368,10 +368,10 @@ bool JSNPObject::deleteProperty(JSCell* cell, ExecState* exec, const Identifier&
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)));
}
......
......@@ -92,7 +92,7 @@ private:
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment