[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_css.cpp
kjs_css.h kjs_dom.cpp kjs_dom.h kjs_html.cpp kjs_html.h
kjs_navigator.cpp kjs_window.cpp kjs_window.h
Anders
andersca at opensource.apple.com
Tue Dec 13 13:29:32 PST 2005
andersca 05/12/13 13:29:32
Modified: . ChangeLog
khtml/ecma kjs_css.cpp kjs_css.h kjs_dom.cpp kjs_dom.h
kjs_html.cpp kjs_html.h kjs_navigator.cpp
kjs_window.cpp kjs_window.h
Log:
2005-12-13 Anders Carlsson <andersca at mac.com>
Reviewed by Darin.
* khtml/ecma/kjs_css.cpp:
(KJS::DOMCSSStyleDeclaration::indexGetter):
(KJS::DOMCSSStyleDeclaration::cssPropertyGetter):
(KJS::DOMStyleSheetList::indexGetter):
(KJS::DOMStyleSheetList::nameGetter):
(KJS::DOMMediaList::indexGetter):
(KJS::DOMCSSRuleList::indexGetter):
(KJS::DOMCSSValueList::indexGetter):
* khtml/ecma/kjs_css.h:
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNodeList::indexGetter):
(KJS::DOMNodeList::nameGetter):
(KJS::DOMElement::attributeGetter):
(KJS::DOMNamedNodeMap::lengthGetter):
(KJS::DOMNamedNodeMap::indexGetter):
(KJS::DOMNamedNodeMap::nameGetter):
(KJS::DOMNamedNodesCollection::lengthGetter):
(KJS::DOMNamedNodesCollection::indexGetter):
* khtml/ecma/kjs_dom.h:
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLDocument::namedItemGetter):
(KJS::HTMLElement::formIndexGetter):
(KJS::HTMLElement::formNameGetter):
(KJS::HTMLElement::selectIndexGetter):
(KJS::HTMLElement::framesetNameGetter):
(KJS::HTMLElement::frameWindowPropertyGetter):
(KJS::HTMLElement::runtimeObjectGetter):
(KJS::HTMLElement::runtimeObjectPropertyGetter):
(KJS::HTMLCollection::lengthGetter):
(KJS::HTMLCollection::indexGetter):
(KJS::HTMLCollection::nameGetter):
(KJS::HTMLSelectCollection::selectedIndexGetter):
* khtml/ecma/kjs_html.h:
* khtml/ecma/kjs_navigator.cpp:
(KJS::Plugins::indexGetter):
(KJS::Plugins::nameGetter):
(KJS::MimeTypes::indexGetter):
(KJS::MimeTypes::nameGetter):
(KJS::Plugin::indexGetter):
(KJS::Plugin::nameGetter):
* khtml/ecma/kjs_window.cpp:
(KJS::Window::childFrameGetter):
(KJS::Window::namedFrameGetter):
(KJS::Window::indexGetter):
(KJS::Window::namedItemGetter):
(KJS::FrameArray::indexGetter):
(KJS::FrameArray::nameGetter):
* khtml/ecma/kjs_window.h:
Update for changes to PropertySlot::GetValueFunc.
Revision Changes Path
1.522 +54 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- ChangeLog 13 Dec 2005 21:25:07 -0000 1.521
+++ ChangeLog 13 Dec 2005 21:29:23 -0000 1.522
@@ -1,3 +1,57 @@
+2005-12-13 Anders Carlsson <andersca at mac.com>
+
+ Reviewed by Darin.
+
+ * khtml/ecma/kjs_css.cpp:
+ (KJS::DOMCSSStyleDeclaration::indexGetter):
+ (KJS::DOMCSSStyleDeclaration::cssPropertyGetter):
+ (KJS::DOMStyleSheetList::indexGetter):
+ (KJS::DOMStyleSheetList::nameGetter):
+ (KJS::DOMMediaList::indexGetter):
+ (KJS::DOMCSSRuleList::indexGetter):
+ (KJS::DOMCSSValueList::indexGetter):
+ * khtml/ecma/kjs_css.h:
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNodeList::indexGetter):
+ (KJS::DOMNodeList::nameGetter):
+ (KJS::DOMElement::attributeGetter):
+ (KJS::DOMNamedNodeMap::lengthGetter):
+ (KJS::DOMNamedNodeMap::indexGetter):
+ (KJS::DOMNamedNodeMap::nameGetter):
+ (KJS::DOMNamedNodesCollection::lengthGetter):
+ (KJS::DOMNamedNodesCollection::indexGetter):
+ * khtml/ecma/kjs_dom.h:
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::HTMLDocument::namedItemGetter):
+ (KJS::HTMLElement::formIndexGetter):
+ (KJS::HTMLElement::formNameGetter):
+ (KJS::HTMLElement::selectIndexGetter):
+ (KJS::HTMLElement::framesetNameGetter):
+ (KJS::HTMLElement::frameWindowPropertyGetter):
+ (KJS::HTMLElement::runtimeObjectGetter):
+ (KJS::HTMLElement::runtimeObjectPropertyGetter):
+ (KJS::HTMLCollection::lengthGetter):
+ (KJS::HTMLCollection::indexGetter):
+ (KJS::HTMLCollection::nameGetter):
+ (KJS::HTMLSelectCollection::selectedIndexGetter):
+ * khtml/ecma/kjs_html.h:
+ * khtml/ecma/kjs_navigator.cpp:
+ (KJS::Plugins::indexGetter):
+ (KJS::Plugins::nameGetter):
+ (KJS::MimeTypes::indexGetter):
+ (KJS::MimeTypes::nameGetter):
+ (KJS::Plugin::indexGetter):
+ (KJS::Plugin::nameGetter):
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::Window::childFrameGetter):
+ (KJS::Window::namedFrameGetter):
+ (KJS::Window::indexGetter):
+ (KJS::Window::namedItemGetter):
+ (KJS::FrameArray::indexGetter):
+ (KJS::FrameArray::nameGetter):
+ * khtml/ecma/kjs_window.h:
+ Update for changes to PropertySlot::GetValueFunc.
+
2005-12-13 Eric Seidel <eseidel at apple.com>
Reviewed by darin.
1.44 +7 -7 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kjs_css.cpp 11 Dec 2005 02:06:04 -0000 1.43
+++ kjs_css.cpp 13 Dec 2005 21:29:28 -0000 1.44
@@ -138,13 +138,13 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-JSValue *DOMCSSStyleDeclaration::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMCSSStyleDeclaration::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMCSSStyleDeclaration *thisObj = static_cast<DOMCSSStyleDeclaration *>(slot.slotBase());
return jsStringOrNull(thisObj->m_impl->item(slot.index()));
}
-JSValue *DOMCSSStyleDeclaration::cssPropertyGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMCSSStyleDeclaration::cssPropertyGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMCSSStyleDeclaration *thisObj = static_cast<DOMCSSStyleDeclaration *>(slot.slotBase());
@@ -380,13 +380,13 @@
}
}
-JSValue *DOMStyleSheetList::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMStyleSheetList::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMStyleSheetList *thisObj = static_cast<DOMStyleSheetList *>(slot.slotBase());
return getDOMStyleSheet(exec, thisObj->m_impl->item(slot.index()));
}
-JSValue *DOMStyleSheetList::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMStyleSheetList::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMStyleSheetList *thisObj = static_cast<DOMStyleSheetList *>(slot.slotBase());
ElementImpl *element = thisObj->m_doc->getElementById(propertyName.domString());
@@ -501,7 +501,7 @@
}
}
-JSValue *DOMMediaList::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMMediaList::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMMediaList *thisObj = static_cast<DOMMediaList *>(slot.slotBase());
return jsStringOrNull(thisObj->m_impl->item(slot.index()));
@@ -658,7 +658,7 @@
}
}
-JSValue *DOMCSSRuleList::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMCSSRuleList::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMCSSRuleList *thisObj = static_cast<DOMCSSRuleList *>(slot.slotBase());
return getDOMCSSRule(exec, thisObj->m_impl->item(slot.index()));
@@ -1192,7 +1192,7 @@
return jsNumber(static_cast<CSSValueListImpl *>(impl())->length());
}
-JSValue *DOMCSSValueList::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMCSSValueList::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMCSSValueList *thisObj = static_cast<DOMCSSValueList *>(slot.slotBase());
return getDOMCSSValue(exec, static_cast<CSSValueListImpl *>(thisObj->impl())->item(slot.index()));
1.24 +7 -7 WebCore/khtml/ecma/kjs_css.h
Index: kjs_css.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kjs_css.h 11 Dec 2005 02:06:05 -0000 1.23
+++ kjs_css.h 13 Dec 2005 21:29:28 -0000 1.24
@@ -60,8 +60,8 @@
GetPropertyPriority, GetPropertyShorthand, IsPropertyImplicit, SetProperty, Item };
DOM::CSSStyleDeclarationImpl *impl() const { return m_impl.get(); }
private:
- static JSValue *indexGetter(ExecState *, const Identifier&, const PropertySlot&);
- static JSValue *cssPropertyGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *indexGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
+ static JSValue *cssPropertyGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
RefPtr<DOM::CSSStyleDeclarationImpl> m_impl;
};
@@ -103,8 +103,8 @@
DOM::StyleSheetListImpl *impl() const { return m_impl.get(); }
enum { Item, Length };
private:
- static JSValue *indexGetter(ExecState *, const Identifier&, const PropertySlot&);
- static JSValue *nameGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *indexGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
+ static JSValue *nameGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
RefPtr<DOM::StyleSheetListImpl> m_impl;
RefPtr<DOM::DocumentImpl> m_doc;
@@ -127,7 +127,7 @@
Item, DeleteMedium, AppendMedium };
DOM::MediaListImpl *impl() const { return m_impl.get(); }
private:
- static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
RefPtr<DOM::MediaListImpl> m_impl;
};
@@ -157,7 +157,7 @@
enum { Item, Length };
DOM::CSSRuleListImpl *impl() const { return m_impl.get(); }
private:
- static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
RefPtr<DOM::CSSRuleListImpl> m_impl;
};
@@ -269,7 +269,7 @@
static const ClassInfo info;
enum { Length, Item };
private:
- static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
};
class DOMRGBColor : public DOMObject {
1.119 +8 -8 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kjs_dom.cpp 11 Dec 2005 02:06:05 -0000 1.118
+++ kjs_dom.cpp 13 Dec 2005 21:29:28 -0000 1.119
@@ -743,13 +743,13 @@
return jsNumber(m_impl->length());
}
-JSValue *DOMNodeList::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNodeList::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNodeList *thisObj = static_cast<DOMNodeList *>(slot.slotBase());
return getDOMNode(exec, thisObj->m_impl->item(slot.index()));
}
-JSValue *DOMNodeList::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNodeList::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNodeList *thisObj = static_cast<DOMNodeList *>(slot.slotBase());
return getDOMNode(exec, thisObj->m_impl->itemById(propertyName.domString()));
@@ -1190,7 +1190,7 @@
}
}
-JSValue *DOMElement::attributeGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMElement::attributeGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMElement *thisObj = static_cast<DOMElement *>(slot.slotBase());
@@ -1452,19 +1452,19 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-JSValue *DOMNamedNodeMap::lengthGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNamedNodeMap::lengthGetter(ExecState* exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNamedNodeMap *thisObj = static_cast<DOMNamedNodeMap *>(slot.slotBase());
return jsNumber(thisObj->m_impl->length());
}
-JSValue *DOMNamedNodeMap::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNamedNodeMap::indexGetter(ExecState* exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNamedNodeMap *thisObj = static_cast<DOMNamedNodeMap *>(slot.slotBase());
return getDOMNode(exec, thisObj->m_impl->item(slot.index()));
}
-JSValue *DOMNamedNodeMap::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNamedNodeMap::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNamedNodeMap *thisObj = static_cast<DOMNamedNodeMap *>(slot.slotBase());
return getDOMNode(exec, thisObj->m_impl->getNamedItem(propertyName.domString()));
@@ -1865,13 +1865,13 @@
{
}
-JSValue *DOMNamedNodesCollection::lengthGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNamedNodesCollection::lengthGetter(ExecState* exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNamedNodesCollection *thisObj = static_cast<DOMNamedNodesCollection *>(slot.slotBase());
return jsNumber(thisObj->m_nodes.count());
}
-JSValue *DOMNamedNodesCollection::indexGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *DOMNamedNodesCollection::indexGetter(ExecState* exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNamedNodesCollection *thisObj = static_cast<DOMNamedNodesCollection *>(slot.slotBase());
return getDOMNode(exec, thisObj->m_nodes[slot.index()].get());
1.63 +8 -8 WebCore/khtml/ecma/kjs_dom.h
Index: kjs_dom.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kjs_dom.h 11 Dec 2005 02:06:05 -0000 1.62
+++ kjs_dom.h 13 Dec 2005 21:29:29 -0000 1.63
@@ -106,8 +106,8 @@
virtual JSValue *toPrimitive(ExecState *exec, Type preferred = UndefinedType) const;
private:
- static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *nameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *nameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
RefPtr<DOM::NodeListImpl> m_impl;
};
@@ -173,7 +173,7 @@
// Constructor for inherited classes; doesn't set up a prototype.
DOMElement(DOM::ElementImpl *e);
private:
- static JSValue *attributeGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *attributeGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
};
DOM::ElementImpl *toElement(JSValue *); // returns 0 if passed-in value is not a DOMElement object
@@ -219,9 +219,9 @@
GetNamedItemNS, SetNamedItemNS, RemoveNamedItemNS };
DOM::NamedNodeMapImpl *impl() const { return m_impl.get(); }
private:
- static JSValue *lengthGetter(ExecState* exec, const Identifier&, const PropertySlot& slot);
- static JSValue *indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot);
- static JSValue *nameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *lengthGetter(ExecState* exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState* exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *nameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
RefPtr<DOM::NamedNodeMapImpl> m_impl;
};
@@ -298,8 +298,8 @@
DOMNamedNodesCollection(ExecState *exec, const QValueList< RefPtr<DOM::NodeImpl> >& nodes );
virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
private:
- static JSValue *lengthGetter(ExecState* exec, const Identifier&, const PropertySlot& slot);
- static JSValue *indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *lengthGetter(ExecState* exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState* exec, JSObject *, const Identifier&, const PropertySlot& slot);
QValueList< RefPtr<DOM::NodeImpl> > m_nodes;
};
1.154 +12 -12 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kjs_html.cpp 11 Dec 2005 02:06:05 -0000 1.153
+++ kjs_html.cpp 13 Dec 2005 21:29:29 -0000 1.154
@@ -263,7 +263,7 @@
{
}
-JSValue *HTMLDocument::namedItemGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLDocument::namedItemGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLDocument *thisObj = static_cast<HTMLDocument *>(slot.slotBase());
HTMLDocumentImpl &doc = *static_cast<HTMLDocumentImpl *>(thisObj->impl());
@@ -1259,7 +1259,7 @@
{
}
-JSValue *HTMLElement::formIndexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::formIndexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLFormElementImpl *form = static_cast<HTMLFormElementImpl *>(thisObj->impl());
@@ -1267,7 +1267,7 @@
return getDOMNode(exec, form->elements()->item(slot.index()));
}
-JSValue *HTMLElement::formNameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::formNameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLFormElementImpl *form = static_cast<HTMLFormElementImpl *>(thisObj->impl());
@@ -1275,7 +1275,7 @@
return HTMLCollection(exec, form->elements().get()).getNamedItems(exec, propertyName);
}
-JSValue *HTMLElement::selectIndexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::selectIndexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLSelectElementImpl *select = static_cast<HTMLSelectElementImpl *>(thisObj->impl());
@@ -1283,7 +1283,7 @@
return getDOMNode(exec, select->optionsHTMLCollection()->item(slot.index()));
}
-JSValue *HTMLElement::framesetNameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::framesetNameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLElementImpl *element = static_cast<HTMLElementImpl *>(thisObj->impl());
@@ -1296,7 +1296,7 @@
return jsUndefined();
}
-JSValue *HTMLElement::frameWindowPropertyGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::frameWindowPropertyGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
@@ -1307,7 +1307,7 @@
return jsUndefined();
}
-JSValue *HTMLElement::runtimeObjectGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::runtimeObjectGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLElementImpl *element = static_cast<HTMLElementImpl *>(thisObj->impl());
@@ -1315,7 +1315,7 @@
return getRuntimeObject(exec, element);
}
-JSValue *HTMLElement::runtimeObjectPropertyGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLElement::runtimeObjectPropertyGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLElementImpl *element = static_cast<HTMLElementImpl *>(thisObj->impl());
@@ -3320,19 +3320,19 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-JSValue *HTMLCollection::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLCollection::lengthGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLCollection *thisObj = static_cast<HTMLCollection *>(slot.slotBase());
return jsNumber(thisObj->m_impl->length());
}
-JSValue *HTMLCollection::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLCollection::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLCollection *thisObj = static_cast<HTMLCollection *>(slot.slotBase());
return getDOMNode(exec, thisObj->m_impl->item(slot.index()));
}
-JSValue *HTMLCollection::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLCollection::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLCollection *thisObj = static_cast<HTMLCollection *>(slot.slotBase());
return thisObj->getNamedItems(exec, propertyName);
@@ -3452,7 +3452,7 @@
{
}
-JSValue *HTMLSelectCollection::selectedIndexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *HTMLSelectCollection::selectedIndexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
HTMLSelectCollection *thisObj = static_cast<HTMLSelectCollection *>(slot.slotBase());
return jsNumber(thisObj->m_element->selectedIndex());
1.64 +12 -12 WebCore/khtml/ecma/kjs_html.h
Index: kjs_html.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kjs_html.h 11 Dec 2005 02:06:06 -0000 1.63
+++ kjs_html.h 13 Dec 2005 21:29:29 -0000 1.64
@@ -56,7 +56,7 @@
Write, WriteLn, GetElementsByName, CaptureEvents, ReleaseEvents,
BgColor, FgColor, AlinkColor, LinkColor, VlinkColor, LastModified, Height, Width, Dir, DesignMode };
private:
- static JSValue *namedItemGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *namedItemGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
};
class HTMLElement : public DOMElement {
@@ -285,13 +285,13 @@
ElementClassName, ElementInnerText, ElementDocument, ElementChildren, ElementContentEditable,
ElementIsContentEditable, ElementOuterHTML, ElementOuterText};
private:
- static JSValue *formIndexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *formNameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *selectIndexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *framesetNameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *frameWindowPropertyGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *runtimeObjectGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *runtimeObjectPropertyGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *formIndexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *formNameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *selectIndexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *framesetNameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *frameWindowPropertyGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *runtimeObjectGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *runtimeObjectPropertyGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
};
DOM::HTMLElementImpl *toHTMLElement(JSValue *); // returns 0 if passed-in value is not a HTMLElement object
@@ -314,9 +314,9 @@
protected:
RefPtr<DOM::HTMLCollectionImpl> m_impl;
private:
- static JSValue *lengthGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *nameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *lengthGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *nameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
};
class HTMLSelectCollection : public HTMLCollection {
@@ -325,7 +325,7 @@
virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
private:
- static JSValue *selectedIndexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *selectedIndexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
RefPtr<DOM::HTMLSelectElementImpl> m_element;
};
1.40 +12 -12 WebCore/khtml/ecma/kjs_navigator.cpp
Index: kjs_navigator.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_navigator.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kjs_navigator.cpp 11 Dec 2005 02:06:06 -0000 1.39
+++ kjs_navigator.cpp 13 Dec 2005 21:29:29 -0000 1.40
@@ -79,8 +79,8 @@
static const ClassInfo info;
enum { Length, Refresh };
private:
- static JSValue *indexGetter(ExecState *, const Identifier&, const PropertySlot&);
- static JSValue *nameGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *indexGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
+ static JSValue *nameGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
};
class MimeTypes : public PluginBase {
@@ -92,8 +92,8 @@
static const ClassInfo info;
enum { Length };
private:
- static JSValue *indexGetter(ExecState *, const Identifier&, const PropertySlot&);
- static JSValue *nameGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *indexGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
+ static JSValue *nameGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
};
class Plugin : public PluginBase {
@@ -105,8 +105,8 @@
static const ClassInfo info;
enum { Name, Filename, Description, Length };
private:
- static JSValue *indexGetter(ExecState *, const Identifier&, const PropertySlot&);
- static JSValue *nameGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *indexGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
+ static JSValue *nameGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
PluginInfo *m_info;
};
@@ -337,12 +337,12 @@
return jsNumber(plugins->count());
}
-JSValue *Plugins::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Plugins::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
return new Plugin(exec, plugins->at(slot.index()));
}
-JSValue *Plugins::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Plugins::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
for (PluginInfo *pl = plugins->first(); pl; pl = plugins->next()) {
if (pl->name == propertyName.qstring()) {
@@ -396,12 +396,12 @@
return jsNumber(plugins->count());
}
-JSValue *MimeTypes::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *MimeTypes::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
return new MimeType(exec, mimes->at(slot.index()));
}
-JSValue *MimeTypes::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *MimeTypes::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
for (MimeClassInfo *m = mimes->first(); m; m = mimes->next()) {
if (m->type == propertyName.qstring())
@@ -466,13 +466,13 @@
}
}
-JSValue *Plugin::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Plugin::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
Plugin *thisObj = static_cast<Plugin *>(slot.slotBase());
return new MimeType(exec, thisObj->m_info->mimes.at(slot.index()));
}
-JSValue *Plugin::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Plugin::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
Plugin *thisObj = static_cast<Plugin *>(slot.slotBase());
for (MimeClassInfo *m = thisObj->m_info->mimes.first(); m; m = thisObj->m_info->mimes.next()) {
1.198 +8 -8 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- kjs_window.cpp 11 Dec 2005 09:26:10 -0000 1.197
+++ kjs_window.cpp 13 Dec 2005 21:29:30 -0000 1.198
@@ -123,8 +123,8 @@
virtual UString toString(ExecState *exec) const;
enum { Length, Location };
private:
- static JSValue *indexGetter(ExecState *, const Identifier&, const PropertySlot&);
- static JSValue *nameGetter(ExecState *, const Identifier&, const PropertySlot&);
+ static JSValue *indexGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
+ static JSValue *nameGetter(ExecState *, JSObject *, const Identifier&, const PropertySlot&);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -913,19 +913,19 @@
return jsUndefined();
}
-JSValue *Window::childFrameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Window::childFrameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
Window *thisObj = static_cast<Window *>(slot.slotBase());
return retrieve(thisObj->m_part->childFrameNamed(propertyName.qstring()));
}
-JSValue *Window::namedFrameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Window::namedFrameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
Window *thisObj = static_cast<Window *>(slot.slotBase());
return retrieve(thisObj->m_part->findFrame(propertyName.qstring()));
}
-JSValue *Window::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Window::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
Window *thisObj = static_cast<Window *>(slot.slotBase());
@@ -936,7 +936,7 @@
return retrieve(static_cast<KHTMLPart*>(frame));
}
-JSValue *Window::namedItemGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *Window::namedItemGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
Window *thisObj = static_cast<Window *>(slot.slotBase());
DocumentImpl *doc = thisObj->m_part->xmlDocImpl();
@@ -2027,7 +2027,7 @@
}
}
-JSValue *FrameArray::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *FrameArray::indexGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
FrameArray *thisObj = static_cast<FrameArray *>(slot.slotBase());
KParts::ReadOnlyPart *frame = thisObj->part->frames().at(slot.index());
@@ -2040,7 +2040,7 @@
return jsUndefined();
}
-JSValue *FrameArray::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue *FrameArray::nameGetter(ExecState *exec, JSObject *originalObject, const Identifier& propertyName, const PropertySlot& slot)
{
FrameArray *thisObj = static_cast<FrameArray *>(slot.slotBase());
KParts::ReadOnlyPart *frame = thisObj->part->findFrame(propertyName.qstring());
1.61 +4 -4 WebCore/khtml/ecma/kjs_window.h
Index: kjs_window.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kjs_window.h 11 Dec 2005 02:06:08 -0000 1.60
+++ kjs_window.h 13 Dec 2005 21:29:30 -0000 1.61
@@ -195,10 +195,10 @@
JSValue *getListener(ExecState *exec, const DOM::AtomicString &eventType) const;
void setListener(ExecState *exec, const DOM::AtomicString &eventType, JSValue *func);
private:
- static JSValue *childFrameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *namedFrameGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
- static JSValue *namedItemGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+ static JSValue *childFrameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *namedFrameGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
+ static JSValue *namedItemGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot& slot);
void updateLayout() const;
More information about the webkit-changes
mailing list