[webkit-changes] cvs commit: WebCore/khtml/ecma domparser.cpp
kjs_binding.cpp kjs_binding.h kjs_css.cpp kjs_css.h
kjs_dom.cpp kjs_dom.h kjs_events.cpp kjs_events.h
kjs_html.cpp kjs_html.h kjs_navigator.cpp kjs_range.cpp
kjs_range.h kjs_traversal.cpp kjs_traversal.h kjs_views.cpp
kjs_views.h kjs_window.cpp xmlhttprequest.cpp
xmlhttprequest.h xmlserializer.cpp
Darin
darin at opensource.apple.com
Tue Jul 19 12:52:53 PDT 2005
darin 05/07/19 12:52:52
Modified: . ChangeLog
kjs lookup.h
. ChangeLog
khtml/ecma domparser.cpp kjs_binding.cpp kjs_binding.h
kjs_css.cpp kjs_css.h kjs_dom.cpp kjs_dom.h
kjs_events.cpp kjs_events.h kjs_html.cpp kjs_html.h
kjs_navigator.cpp kjs_range.cpp kjs_range.h
kjs_traversal.cpp kjs_traversal.h kjs_views.cpp
kjs_views.h kjs_window.cpp xmlhttprequest.cpp
xmlhttprequest.h xmlserializer.cpp
Log:
JavaScriptCore:
Reviewed by Geoff Garen.
- eliminated try wrappers for get/put/call since we don't use C++ exceptions any more
* kjs/lookup.h: Changed tryCall in IMPLEMENT_PROTOFUNC here to call. It doesn't make
sense for this macro to use the name tryCall anyway, since that's specific to how
WebCore used this, so this is good anyway. On the other hand, it might be a problem
for KDOM or KSVG, in which case we'll need another macro for them, since JavaScriptCore
should presumably not have the C++ exception support.
WebCore:
Reviewed by Geoff Garen.
Test cases added: None. Structural change only.
- eliminated try wrappers for get/put/call since we don't use C++ exceptions any more
* khtml/ecma/kjs_binding.cpp: Removed DOMObject::get, DOMObject::set, DOMFunction::get,
and DOMFunction::call.
* khtml/ecma/kjs_binding.h: Removed get, set, tryGet, trySet, call, tryCall from DOMObject
and DOMFunction. Removed DOMObjectLookupGet, DOMObjectLookupGetValue, and DOMObjectLookupPut.
We can just do things the normal way now.
The rest of the changes are just renames and removal of a couple stray tryCall wrappers.
tryGet -> get
tryPut -> put
tryCall -> call
putValue -> putValueProperty
DOMObjectLookupGet -> lookupGet
DOMObjectLookupGetValue -> lookupGetValue
DOMObjectLookupPut -> lookupPut
* khtml/ecma/domparser.cpp:
(KJS::DOMParserProtoFunc::call):
* khtml/ecma/kjs_css.cpp:
(KJS::DOMCSSStyleDeclaration::get):
(KJS::DOMCSSStyleDeclaration::put):
(KJS::DOMCSSStyleDeclarationProtoFunc::call):
(KJS::DOMStyleSheet::get):
(KJS::DOMStyleSheet::put):
(KJS::DOMStyleSheetList::get):
(KJS::DOMStyleSheetListFunc::call):
(KJS::DOMMediaList::get):
(KJS::DOMMediaList::put):
(KJS::KJS::DOMMediaListProtoFunc::call):
(KJS::DOMCSSStyleSheet::get):
(KJS::DOMCSSStyleSheetProtoFunc::call):
(KJS::DOMCSSRuleList::get):
(KJS::DOMCSSRuleListFunc::call):
(KJS::DOMCSSRule::get):
(KJS::DOMCSSRule::put):
(KJS::DOMCSSRule::putValueProperty):
(KJS::DOMCSSRuleFunc::call):
(KJS::CSSRuleConstructor::get):
(KJS::DOMCSSValue::get):
(KJS::DOMCSSValue::put):
(KJS::CSSValueConstructor::get):
(KJS::DOMCSSPrimitiveValue::get):
(KJS::DOMCSSPrimitiveValueProtoFunc::call):
(KJS::CSSPrimitiveValueConstructor::get):
(KJS::DOMCSSValueList::get):
(KJS::DOMCSSValueListFunc::call):
(KJS::DOMRGBColor::get):
(KJS::DOMRect::get):
(KJS::DOMCounter::get):
* khtml/ecma/kjs_css.h:
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNode::get):
(KJS::DOMNode::put):
(KJS::DOMNode::putValueProperty):
(KJS::DOMNodeProtoFunc::call):
(KJS::DOMNodeList::get):
(KJS::DOMNodeList::call):
(KJS::DOMNodeListFunc::call):
(KJS::DOMAttr::get):
(KJS::DOMAttr::put):
(KJS::DOMAttr::putValueProperty):
(KJS::DOMDocument::get):
(KJS::DOMDocument::put):
(KJS::DOMDocument::putValueProperty):
(KJS::DOMDocumentProtoFunc::call):
(KJS::DOMElement::get):
(KJS::DOMElementProtoFunc::call):
(KJS::DOMDOMImplementationProtoFunc::call):
(KJS::DOMDocumentType::get):
(KJS::DOMNamedNodeMap::get):
(KJS::DOMNamedNodeMapProtoFunc::call):
(KJS::DOMProcessingInstruction::get):
(KJS::DOMProcessingInstruction::put):
(KJS::DOMNotation::get):
(KJS::DOMEntity::get):
(KJS::NodeConstructor::get):
(KJS::DOMExceptionConstructor::get):
(KJS::DOMNamedNodesCollection::get):
(KJS::DOMCharacterData::get):
(KJS::DOMCharacterData::put):
(KJS::DOMCharacterDataProtoFunc::call):
(KJS::DOMText::get):
(KJS::DOMTextProtoFunc::call):
* khtml/ecma/kjs_dom.h:
* khtml/ecma/kjs_events.cpp:
(KJS::EventConstructor::get):
(KJS::DOMEvent::get):
(KJS::DOMEvent::put):
(KJS::DOMEvent::putValueProperty):
(KJS::DOMEventProtoFunc::call):
(KJS::EventExceptionConstructor::get):
(KJS::DOMUIEvent::get):
(KJS::DOMUIEventProtoFunc::call):
(KJS::DOMMouseEvent::get):
(KJS::DOMMouseEventProtoFunc::call):
(KJS::DOMKeyboardEvent::get):
(KJS::DOMKeyboardEventProtoFunc::call):
(KJS::MutationEventConstructor::get):
(KJS::DOMMutationEvent::get):
(KJS::DOMMutationEventProtoFunc::call):
(KJS::DOMWheelEvent::get):
(KJS::DOMWheelEventProtoFunc::call):
(KJS::Clipboard::get):
(KJS::Clipboard::put):
(KJS::Clipboard::putValueProperty):
(KJS::ClipboardProtoFunc::call):
* khtml/ecma/kjs_events.h:
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::HTMLDocFunction::call):
(KJS::HTMLDocument::get):
(KJS::KJS::HTMLDocument::put):
(KJS::KJS::HTMLDocument::putValueProperty):
(KJS::KJS::HTMLElement::get):
(KJS::KJS::HTMLElementFunction::call):
(KJS::KJS::HTMLElement::put):
(KJS::HTMLElement::putValueProperty):
(KJS::KJS::HTMLCollection::get):
(KJS::KJS::HTMLCollection::call):
(KJS::KJS::HTMLCollectionProtoFunc::call):
(KJS::KJS::HTMLSelectCollection::get):
(KJS::KJS::HTMLSelectCollection::put):
(KJS::Image::get):
(KJS::Image::put):
(KJS::Image::putValueProperty):
(KJS::KJS::Context2DFunction::call):
(KJS::Context2D::get):
(KJS::Context2D::put):
(KJS::Context2D::putValueProperty):
(KJS::GradientFunction::call):
(KJS::Gradient::get):
(KJS::Gradient::put):
(KJS::Gradient::putValueProperty):
(KJS::ImagePattern::get):
(KJS::ImagePattern::put):
(KJS::ImagePattern::putValueProperty):
* khtml/ecma/kjs_html.h:
* khtml/ecma/kjs_navigator.cpp:
(KJS::PluginsFunc::call):
(KJS::NavigatorFunc::call):
* khtml/ecma/kjs_range.cpp:
(KJS::DOMRange::get):
(KJS::DOMRangeProtoFunc::call):
(KJS::RangeConstructor::get):
* khtml/ecma/kjs_range.h:
* khtml/ecma/kjs_traversal.cpp:
(KJS::DOMNodeIterator::get):
(KJS::DOMNodeIteratorProtoFunc::call):
(KJS::NodeFilterConstructor::get):
(KJS::DOMNodeFilterProtoFunc::call):
(KJS::DOMTreeWalker::get):
(KJS::DOMTreeWalker::put):
(KJS::DOMTreeWalkerProtoFunc::call):
* khtml/ecma/kjs_traversal.h:
* khtml/ecma/kjs_views.cpp:
(KJS::DOMAbstractView::get):
(KJS::DOMAbstractViewFunc::call):
* khtml/ecma/kjs_views.h:
* khtml/ecma/kjs_window.cpp:
(KJS::WindowFunc::call):
(KJS::LocationFunc::call):
(KJS::SelectionFunc::call):
(KJS::HistoryFunc::call):
(KJS::KonquerorFunc::call):
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequest::get):
(KJS::XMLHttpRequest::put):
(KJS::XMLHttpRequest::putValueProperty):
(KJS::XMLHttpRequestProtoFunc::call):
* khtml/ecma/xmlhttprequest.h:
* khtml/ecma/xmlserializer.cpp:
(KJS::XMLSerializerProtoFunc::call):
Revision Changes Path
1.753 +12 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -r1.752 -r1.753
--- ChangeLog 18 Jul 2005 17:40:53 -0000 1.752
+++ ChangeLog 19 Jul 2005 19:52:44 -0000 1.753
@@ -1,3 +1,15 @@
+2005-07-19 Darin Adler <darin at apple.com>
+
+ Reviewed by Geoff Garen.
+
+ - eliminated try wrappers for get/put/call since we don't use C++ exceptions any more
+
+ * kjs/lookup.h: Changed tryCall in IMPLEMENT_PROTOFUNC here to call. It doesn't make
+ sense for this macro to use the name tryCall anyway, since that's specific to how
+ WebCore used this, so this is good anyway. On the other hand, it might be a problem
+ for KDOM or KSVG, in which case we'll need another macro for them, since JavaScriptCore
+ should presumably not have the C++ exception support.
+
2005-07-18 Geoffrey Garen <ggaren at apple.com>
-fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4008
1.13 +5 -6 JavaScriptCore/kjs/lookup.h
Index: lookup.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/lookup.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lookup.h 14 Jul 2005 18:27:02 -0000 1.12
+++ lookup.h 19 Jul 2005 19:52:44 -0000 1.13
@@ -328,13 +328,12 @@
#define IMPLEMENT_PROTOFUNC(ClassFunc) \
class ClassFunc : public DOMFunction { \
public: \
- ClassFunc(ExecState *exec, int i, int len) \
- : DOMFunction( /*proto? */ ), id(i) { \
- Value protect(this); \
- put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum); \
+ ClassFunc(ExecState *exec, int i, int len) : id(i) \
+ { \
+ put(exec, lengthPropertyName, Number(len), DontDelete|ReadOnly|DontEnum); \
} \
- /** You need to implement that one */ \
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List &args); \
+ /* Macro user needs to implement the call function. */ \
+ virtual Value call(ExecState *exec, Object &thisObj, const List &args); \
private: \
int id; \
};
1.4441 +180 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4440
retrieving revision 1.4441
diff -u -r1.4440 -r1.4441
--- ChangeLog 19 Jul 2005 18:43:19 -0000 1.4440
+++ ChangeLog 19 Jul 2005 19:52:45 -0000 1.4441
@@ -1,5 +1,185 @@
2005-07-19 Darin Adler <darin at apple.com>
+ Reviewed by Geoff Garen.
+
+ Test cases added: None. Structural change only.
+
+ - eliminated try wrappers for get/put/call since we don't use C++ exceptions any more
+
+ * khtml/ecma/kjs_binding.cpp: Removed DOMObject::get, DOMObject::set, DOMFunction::get,
+ and DOMFunction::call.
+ * khtml/ecma/kjs_binding.h: Removed get, set, tryGet, trySet, call, tryCall from DOMObject
+ and DOMFunction. Removed DOMObjectLookupGet, DOMObjectLookupGetValue, and DOMObjectLookupPut.
+ We can just do things the normal way now.
+
+ The rest of the changes are just renames and removal of a couple stray tryCall wrappers.
+
+ tryGet -> get
+ tryPut -> put
+ tryCall -> call
+ putValue -> putValueProperty
+ DOMObjectLookupGet -> lookupGet
+ DOMObjectLookupGetValue -> lookupGetValue
+ DOMObjectLookupPut -> lookupPut
+
+ * khtml/ecma/domparser.cpp:
+ (KJS::DOMParserProtoFunc::call):
+ * khtml/ecma/kjs_css.cpp:
+ (KJS::DOMCSSStyleDeclaration::get):
+ (KJS::DOMCSSStyleDeclaration::put):
+ (KJS::DOMCSSStyleDeclarationProtoFunc::call):
+ (KJS::DOMStyleSheet::get):
+ (KJS::DOMStyleSheet::put):
+ (KJS::DOMStyleSheetList::get):
+ (KJS::DOMStyleSheetListFunc::call):
+ (KJS::DOMMediaList::get):
+ (KJS::DOMMediaList::put):
+ (KJS::KJS::DOMMediaListProtoFunc::call):
+ (KJS::DOMCSSStyleSheet::get):
+ (KJS::DOMCSSStyleSheetProtoFunc::call):
+ (KJS::DOMCSSRuleList::get):
+ (KJS::DOMCSSRuleListFunc::call):
+ (KJS::DOMCSSRule::get):
+ (KJS::DOMCSSRule::put):
+ (KJS::DOMCSSRule::putValueProperty):
+ (KJS::DOMCSSRuleFunc::call):
+ (KJS::CSSRuleConstructor::get):
+ (KJS::DOMCSSValue::get):
+ (KJS::DOMCSSValue::put):
+ (KJS::CSSValueConstructor::get):
+ (KJS::DOMCSSPrimitiveValue::get):
+ (KJS::DOMCSSPrimitiveValueProtoFunc::call):
+ (KJS::CSSPrimitiveValueConstructor::get):
+ (KJS::DOMCSSValueList::get):
+ (KJS::DOMCSSValueListFunc::call):
+ (KJS::DOMRGBColor::get):
+ (KJS::DOMRect::get):
+ (KJS::DOMCounter::get):
+ * khtml/ecma/kjs_css.h:
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNode::get):
+ (KJS::DOMNode::put):
+ (KJS::DOMNode::putValueProperty):
+ (KJS::DOMNodeProtoFunc::call):
+ (KJS::DOMNodeList::get):
+ (KJS::DOMNodeList::call):
+ (KJS::DOMNodeListFunc::call):
+ (KJS::DOMAttr::get):
+ (KJS::DOMAttr::put):
+ (KJS::DOMAttr::putValueProperty):
+ (KJS::DOMDocument::get):
+ (KJS::DOMDocument::put):
+ (KJS::DOMDocument::putValueProperty):
+ (KJS::DOMDocumentProtoFunc::call):
+ (KJS::DOMElement::get):
+ (KJS::DOMElementProtoFunc::call):
+ (KJS::DOMDOMImplementationProtoFunc::call):
+ (KJS::DOMDocumentType::get):
+ (KJS::DOMNamedNodeMap::get):
+ (KJS::DOMNamedNodeMapProtoFunc::call):
+ (KJS::DOMProcessingInstruction::get):
+ (KJS::DOMProcessingInstruction::put):
+ (KJS::DOMNotation::get):
+ (KJS::DOMEntity::get):
+ (KJS::NodeConstructor::get):
+ (KJS::DOMExceptionConstructor::get):
+ (KJS::DOMNamedNodesCollection::get):
+ (KJS::DOMCharacterData::get):
+ (KJS::DOMCharacterData::put):
+ (KJS::DOMCharacterDataProtoFunc::call):
+ (KJS::DOMText::get):
+ (KJS::DOMTextProtoFunc::call):
+ * khtml/ecma/kjs_dom.h:
+ * khtml/ecma/kjs_events.cpp:
+ (KJS::EventConstructor::get):
+ (KJS::DOMEvent::get):
+ (KJS::DOMEvent::put):
+ (KJS::DOMEvent::putValueProperty):
+ (KJS::DOMEventProtoFunc::call):
+ (KJS::EventExceptionConstructor::get):
+ (KJS::DOMUIEvent::get):
+ (KJS::DOMUIEventProtoFunc::call):
+ (KJS::DOMMouseEvent::get):
+ (KJS::DOMMouseEventProtoFunc::call):
+ (KJS::DOMKeyboardEvent::get):
+ (KJS::DOMKeyboardEventProtoFunc::call):
+ (KJS::MutationEventConstructor::get):
+ (KJS::DOMMutationEvent::get):
+ (KJS::DOMMutationEventProtoFunc::call):
+ (KJS::DOMWheelEvent::get):
+ (KJS::DOMWheelEventProtoFunc::call):
+ (KJS::Clipboard::get):
+ (KJS::Clipboard::put):
+ (KJS::Clipboard::putValueProperty):
+ (KJS::ClipboardProtoFunc::call):
+ * khtml/ecma/kjs_events.h:
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::KJS::HTMLDocFunction::call):
+ (KJS::HTMLDocument::get):
+ (KJS::KJS::HTMLDocument::put):
+ (KJS::KJS::HTMLDocument::putValueProperty):
+ (KJS::KJS::HTMLElement::get):
+ (KJS::KJS::HTMLElementFunction::call):
+ (KJS::KJS::HTMLElement::put):
+ (KJS::HTMLElement::putValueProperty):
+ (KJS::KJS::HTMLCollection::get):
+ (KJS::KJS::HTMLCollection::call):
+ (KJS::KJS::HTMLCollectionProtoFunc::call):
+ (KJS::KJS::HTMLSelectCollection::get):
+ (KJS::KJS::HTMLSelectCollection::put):
+ (KJS::Image::get):
+ (KJS::Image::put):
+ (KJS::Image::putValueProperty):
+ (KJS::KJS::Context2DFunction::call):
+ (KJS::Context2D::get):
+ (KJS::Context2D::put):
+ (KJS::Context2D::putValueProperty):
+ (KJS::GradientFunction::call):
+ (KJS::Gradient::get):
+ (KJS::Gradient::put):
+ (KJS::Gradient::putValueProperty):
+ (KJS::ImagePattern::get):
+ (KJS::ImagePattern::put):
+ (KJS::ImagePattern::putValueProperty):
+ * khtml/ecma/kjs_html.h:
+ * khtml/ecma/kjs_navigator.cpp:
+ (KJS::PluginsFunc::call):
+ (KJS::NavigatorFunc::call):
+ * khtml/ecma/kjs_range.cpp:
+ (KJS::DOMRange::get):
+ (KJS::DOMRangeProtoFunc::call):
+ (KJS::RangeConstructor::get):
+ * khtml/ecma/kjs_range.h:
+ * khtml/ecma/kjs_traversal.cpp:
+ (KJS::DOMNodeIterator::get):
+ (KJS::DOMNodeIteratorProtoFunc::call):
+ (KJS::NodeFilterConstructor::get):
+ (KJS::DOMNodeFilterProtoFunc::call):
+ (KJS::DOMTreeWalker::get):
+ (KJS::DOMTreeWalker::put):
+ (KJS::DOMTreeWalkerProtoFunc::call):
+ * khtml/ecma/kjs_traversal.h:
+ * khtml/ecma/kjs_views.cpp:
+ (KJS::DOMAbstractView::get):
+ (KJS::DOMAbstractViewFunc::call):
+ * khtml/ecma/kjs_views.h:
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::WindowFunc::call):
+ (KJS::LocationFunc::call):
+ (KJS::SelectionFunc::call):
+ (KJS::HistoryFunc::call):
+ (KJS::KonquerorFunc::call):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::get):
+ (KJS::XMLHttpRequest::put):
+ (KJS::XMLHttpRequest::putValueProperty):
+ (KJS::XMLHttpRequestProtoFunc::call):
+ * khtml/ecma/xmlhttprequest.h:
+ * khtml/ecma/xmlserializer.cpp:
+ (KJS::XMLSerializerProtoFunc::call):
+
+2005-07-19 Darin Adler <darin at apple.com>
+
Reviewed by Dave Hyatt.
- fixed broken bi-di layout tests: the "dir" attribute was broken
1.2 +1 -1 WebCore/khtml/ecma/domparser.cpp
Index: domparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/domparser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domparser.cpp 8 Jun 2005 09:16:42 -0000 1.1
+++ domparser.cpp 19 Jul 2005 19:52:48 -0000 1.2
@@ -67,7 +67,7 @@
}
-Value DOMParserProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMParserProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&DOMParser::info)) {
Object err = Error::create(exec,TypeError);
1.34 +0 -29 WebCore/khtml/ecma/kjs_binding.cpp
Index: kjs_binding.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_binding.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kjs_binding.cpp 14 Jul 2005 04:48:44 -0000 1.33
+++ kjs_binding.cpp 19 Jul 2005 19:52:48 -0000 1.34
@@ -46,40 +46,11 @@
namespace KJS {
-/* TODO:
- * The catch all (...) clauses below shouldn't be necessary.
- * But they helped to view for example www.faz.net in an stable manner.
- * Those unknown exceptions should be treated as severe bugs and be fixed.
- *
- * these may be CSS exceptions - need to check - pmk
- */
-
-Value DOMObject::get(ExecState *exec, const Identifier &p) const
-{
- return tryGet(exec,p);
-}
-
-void DOMObject::put(ExecState *exec, const Identifier &propertyName,
- const Value &value, int attr)
-{
- tryPut(exec, propertyName, value, attr);
-}
-
UString DOMObject::toString(ExecState *) const
{
return "[object " + className() + "]";
}
-Value DOMFunction::get(ExecState *exec, const Identifier &propertyName) const
-{
- return tryGet(exec, propertyName);
-}
-
-Value DOMFunction::call(ExecState *exec, Object &thisObj, const List &args)
-{
- return tryCall(exec, thisObj, args);
-}
-
typedef HashMap<void *, DOMObject *> DOMObjectMap;
typedef HashMap<NodeImpl *, DOMNode *, PointerHash<NodeImpl *> > NodeMap;
typedef HashMap<DocumentImpl *, NodeMap *, PointerHash<DocumentImpl *> > NodePerDocMap;
1.30 +6 -88 WebCore/khtml/ecma/kjs_binding.h
Index: kjs_binding.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_binding.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kjs_binding.h 14 Jul 2005 04:48:44 -0000 1.29
+++ kjs_binding.h 19 Jul 2005 19:52:48 -0000 1.30
@@ -42,43 +42,23 @@
namespace KJS {
/**
- * Base class for all objects in this binding - get() and put() run
- * tryGet() and tryPut() respectively, and catch exceptions if they
- * occur.
+ * Base class for all objects in this binding.
*/
class DOMObject : public ObjectImp {
- public:
+ protected:
DOMObject() : ObjectImp() {}
- virtual Value get(ExecState *exec, const Identifier &propertyName) const;
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const
- { return ObjectImp::get(exec, propertyName); }
-
- virtual void put(ExecState *exec, const Identifier &propertyName,
- const Value &value, int attr = None);
- virtual void tryPut(ExecState *exec, const Identifier &propertyName,
- const Value& value, int attr = None)
- { ObjectImp::put(exec,propertyName,value,attr); }
-
+ public:
virtual UString toString(ExecState *exec) const;
};
/**
- * Base class for all functions in this binding - get() and call() run
- * tryGet() and tryCall() respectively, and catch exceptions if they
- * occur.
+ * Base class for all functions in this binding.
*/
class DOMFunction : public ObjectImp {
+ protected:
+ DOMFunction() : ObjectImp() {}
public:
- DOMFunction() : ObjectImp( /* proto? */ ) {}
- virtual Value get(ExecState *exec, const Identifier &propertyName) const;
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const
- { return ObjectImp::get(exec, propertyName); }
-
virtual bool implementsCall() const { return true; }
- virtual Value call(ExecState *exec, Object &thisObj, const List &args);
-
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List&args)
- { return ObjectImp::call(exec, thisObj, args); }
virtual bool toBoolean(ExecState *) const { return true; }
virtual Value toPrimitive(ExecState *exec, Type) const { return String(toString(exec)); }
virtual UString toString(ExecState *) const { return UString("[function]"); }
@@ -180,71 +160,9 @@
/**
* Convert a KJS value into a QVariant
- * Deprecated: Use variant instead.
*/
QVariant ValueToVariant(ExecState* exec, const Value& val);
- /**
- * We need a modified version of lookupGet because
- * we call tryGet instead of get, in DOMObjects.
- */
- template <class FuncImp, class ThisImp, class ParentImp>
- inline Value DOMObjectLookupGet(ExecState *exec, const Identifier &propertyName,
- const HashTable* table, const ThisImp* thisObj)
- {
- const HashEntry* entry = Lookup::findEntry(table, propertyName);
-
- if (!entry) // not found, forward to parent
- return thisObj->ParentImp::tryGet(exec, propertyName);
-
- if (entry->attr & Function)
- return lookupOrCreateFunction<FuncImp>(exec, propertyName, thisObj, entry->value, entry->params, entry->attr);
- return thisObj->getValueProperty(exec, entry->value);
- }
-
- /**
- * Simplified version of DOMObjectLookupGet in case there are no
- * functions, only "values".
- */
- template <class ThisImp, class ParentImp>
- inline Value DOMObjectLookupGetValue(ExecState *exec, const Identifier &propertyName,
- const HashTable* table, const ThisImp* thisObj)
- {
- const HashEntry* entry = Lookup::findEntry(table, propertyName);
-
- if (!entry) // not found, forward to parent
- return thisObj->ParentImp::tryGet(exec, propertyName);
-
- if (entry->attr & Function)
- fprintf(stderr, "Function bit set! Shouldn't happen in lookupValue!\n" );
- return thisObj->getValueProperty(exec, entry->value);
- }
-
- /**
- * We need a modified version of lookupPut because
- * we call tryPut instead of put, in DOMObjects.
- */
- template <class ThisImp, class ParentImp>
- inline void DOMObjectLookupPut(ExecState *exec, const Identifier &propertyName,
- const Value& value, int attr,
- const HashTable* table, ThisImp* thisObj)
- {
- const HashEntry* entry = Lookup::findEntry(table, propertyName);
-
- if (!entry) // not found: forward to parent
- thisObj->ParentImp::tryPut(exec, propertyName, value, attr);
- else if (entry->attr & Function) // function: put as override property
- thisObj->ObjectImp::put(exec, propertyName, value, attr);
- else if (entry->attr & ReadOnly) // readonly! Can't put!
-#ifdef KJS_VERBOSE
- fprintf(stderr,"Attempt to change value of readonly property '%s'\n",propertyName.ascii());
-#else
- ; // do nothing
-#endif
- else
- thisObj->putValue(exec, entry->value, value, attr);
- }
-
} // namespace
#endif
1.30 +58 -58 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kjs_css.cpp 18 Jul 2005 21:52:18 -0000 1.29
+++ kjs_css.cpp 19 Jul 2005 19:52:48 -0000 1.30
@@ -143,10 +143,10 @@
return ObjectImp::hasOwnProperty(exec, p);
}
-Value DOMCSSStyleDeclaration::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMCSSStyleDeclaration::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMCSSStyleDeclaration::tryGet " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMCSSStyleDeclaration::get " << propertyName.qstring() << endl;
#endif
const HashEntry* entry = Lookup::findEntry(&DOMCSSStyleDeclarationTable, propertyName);
CSSStyleDeclarationImpl &styleDecl = *m_impl;
@@ -193,14 +193,14 @@
return String("");
}
- return DOMObject::tryGet(exec, propertyName);
+ return DOMObject::get(exec, propertyName);
}
-void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr )
+void DOMCSSStyleDeclaration::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr )
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMCSSStyleDeclaration::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMCSSStyleDeclaration::put " << propertyName.qstring() << endl;
#endif
DOMExceptionTranslator exception(exec);
CSSStyleDeclarationImpl &styleDecl = *m_impl;
@@ -229,12 +229,12 @@
styleDecl.setProperty(prop, DOMString(propvalue), "", ignoreException);
}
} else {
- DOMObject::tryPut(exec, propertyName, value, attr);
+ DOMObject::put(exec, propertyName, value, attr);
}
}
}
-Value DOMCSSStyleDeclarationProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCSSStyleDeclarationProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCSSStyleDeclaration::info)) {
Object err = Error::create(exec,TypeError);
@@ -290,9 +290,9 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMStyleSheet::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMStyleSheet::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<DOMStyleSheet,DOMObject>(exec,propertyName,&DOMStyleSheetTable,this);
+ return lookupGetValue<DOMStyleSheet,DOMObject>(exec,propertyName,&DOMStyleSheetTable,this);
}
Value DOMStyleSheet::getValueProperty(ExecState *exec, int token) const
@@ -317,13 +317,13 @@
return Value();
}
-void DOMStyleSheet::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMStyleSheet::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
if (propertyName == "disabled") {
m_impl->setDisabled(value.toBoolean(exec));
}
else
- DOMObject::tryPut(exec, propertyName, value, attr);
+ DOMObject::put(exec, propertyName, value, attr);
}
ValueImp *getDOMStyleSheet(ExecState *exec, StyleSheetImpl *ss)
@@ -361,10 +361,10 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMStyleSheetList::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMStyleSheetList::get(ExecState *exec, const Identifier &p) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMStyleSheetList::tryGet " << p.qstring() << endl;
+ kdDebug(6070) << "DOMStyleSheetList::get " << p.qstring() << endl;
#endif
StyleSheetListImpl &styleSheetList = *m_impl;
if (p == lengthPropertyName)
@@ -408,7 +408,7 @@
if (element && element->hasTagName(HTMLTags::style()))
return getDOMStyleSheet(exec, static_cast<HTMLStyleElementImpl *>(element)->sheet());
- return DOMObject::tryGet(exec, p);
+ return DOMObject::get(exec, p);
}
ValueImp *getDOMStyleSheetList(ExecState *exec, StyleSheetListImpl *ssl, DocumentImpl *doc)
@@ -427,7 +427,7 @@
}
}
-Value DOMStyleSheetListFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMStyleSheetListFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMStyleSheetList::info)) {
Object err = Error::create(exec,TypeError);
@@ -470,7 +470,7 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMMediaList::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMMediaList::get(ExecState *exec, const Identifier &p) const
{
MediaListImpl &mediaList = *m_impl;
if (p == "mediaText")
@@ -483,16 +483,16 @@
if (ok)
return getStringOrNull(mediaList.item(u));
- return DOMObject::tryGet(exec, p);
+ return DOMObject::get(exec, p);
}
-void DOMMediaList::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMMediaList::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
MediaListImpl &mediaList = *m_impl;
if (propertyName == "mediaText")
mediaList.setMediaText(value.toString(exec).string());
else
- DOMObject::tryPut(exec, propertyName, value, attr);
+ DOMObject::put(exec, propertyName, value, attr);
}
ValueImp *getDOMMediaList(ExecState *exec, MediaListImpl *ml)
@@ -500,7 +500,7 @@
return cacheDOMObject<MediaListImpl, DOMMediaList>(exec, ml);
}
-Value KJS::DOMMediaListProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value KJS::DOMMediaListProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMMediaList::info)) {
Object err = Error::create(exec,TypeError);
@@ -554,17 +554,17 @@
{
}
-Value DOMCSSStyleSheet::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCSSStyleSheet::get(ExecState *exec, const Identifier &p) const
{
CSSStyleSheetImpl &cssStyleSheet = *static_cast<CSSStyleSheetImpl *>(impl());
if (p == "ownerRule")
return getDOMCSSRule(exec,cssStyleSheet.ownerRule());
else if (p == "cssRules" || p == "rules" /* MSIE extension */)
return getDOMCSSRuleList(exec,cssStyleSheet.cssRules());
- return DOMStyleSheet::tryGet(exec,p);
+ return DOMStyleSheet::get(exec,p);
}
-Value DOMCSSStyleSheetProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCSSStyleSheetProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCSSStyleSheet::info)) {
Object err = Error::create(exec,TypeError);
@@ -607,7 +607,7 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMCSSRuleList::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCSSRuleList::get(ExecState *exec, const Identifier &p) const
{
CSSRuleListImpl &cssRuleList = *m_impl;
if (p == lengthPropertyName)
@@ -620,10 +620,10 @@
if (ok)
return getDOMCSSRule(exec, cssRuleList.item(u));
- return DOMObject::tryGet(exec, p);
+ return DOMObject::get(exec, p);
}
-Value DOMCSSRuleListFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCSSRuleListFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCSSRuleList::info)) {
Object err = Error::create(exec,TypeError);
@@ -715,10 +715,10 @@
encoding DOMCSSRule::Charset_Encoding DontDelete
@end
*/
-Value DOMCSSRule::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMCSSRule::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMCSSRule::tryGet " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMCSSRule::get " << propertyName.qstring() << endl;
#endif
const HashEntry *entry = Lookup::findEntry(classInfo()->propHashTable, propertyName);
if (entry) {
@@ -728,7 +728,7 @@
}
// Base CSSRule stuff or parent class forward, as usual
- return DOMObjectLookupGet<DOMCSSRuleFunc, DOMCSSRule, DOMObject>(exec, propertyName, &DOMCSSRuleTable, this);
+ return lookupGet<DOMCSSRuleFunc, DOMCSSRule, DOMObject>(exec, propertyName, &DOMCSSRuleTable, this);
}
Value DOMCSSRule::getValueProperty(ExecState *exec, int token) const
@@ -784,7 +784,7 @@
return Undefined();
}
-void DOMCSSRule::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMCSSRule::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
const HashTable* table = classInfo()->propHashTable; // get the right hashtable
const HashEntry* entry = Lookup::findEntry(table, propertyName);
@@ -794,16 +794,16 @@
ObjectImp::put(exec, propertyName, value, attr);
return;
}
- else if ((entry->attr & ReadOnly) == 0) // let DOMObjectLookupPut print the warning if not
+ else if ((entry->attr & ReadOnly) == 0) // let lookupPut print the warning if not
{
- putValue(exec, entry->value, value, attr);
+ putValueProperty(exec, entry->value, value, attr);
return;
}
}
- DOMObjectLookupPut<DOMCSSRule, DOMObject>(exec, propertyName, value, attr, &DOMCSSRuleTable, this);
+ lookupPut<DOMCSSRule, DOMObject>(exec, propertyName, value, attr, &DOMCSSRuleTable, this);
}
-void DOMCSSRule::putValue(ExecState *exec, int token, const Value& value, int)
+void DOMCSSRule::putValueProperty(ExecState *exec, int token, const Value& value, int)
{
switch (token) {
// for DOM::CSSRule::STYLE_RULE:
@@ -822,11 +822,11 @@
return;
default:
- kdWarning() << "DOMCSSRule::putValue unhandled token " << token << endl;
+ kdWarning() << "DOMCSSRule::putValueProperty unhandled token " << token << endl;
}
}
-Value DOMCSSRuleFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCSSRuleFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCSSRule::info)) {
Object err = Error::create(exec,TypeError);
@@ -866,9 +866,9 @@
@end
*/
-Value CSSRuleConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value CSSRuleConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<CSSRuleConstructor,DOMObject>(exec,p,&CSSRuleConstructorTable,this);
+ return lookupGetValue<CSSRuleConstructor,DOMObject>(exec,p,&CSSRuleConstructorTable,this);
}
Value CSSRuleConstructor::getValueProperty(ExecState *, int token) const
@@ -912,23 +912,23 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMCSSValue::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCSSValue::get(ExecState *exec, const Identifier &p) const
{
CSSValueImpl &cssValue = *m_impl;
if (p == "cssText")
return getStringOrNull(cssValue.cssText());
else if (p == "cssValueType");
return Number(cssValue.cssValueType());
- return DOMObject::tryGet(exec,p);
+ return DOMObject::get(exec,p);
}
-void DOMCSSValue::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMCSSValue::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
CSSValueImpl &cssValue = *m_impl;
if (propertyName == "cssText")
cssValue.setCssText(value.toString(exec).string());
else
- DOMObject::tryPut(exec, propertyName, value, attr);
+ DOMObject::put(exec, propertyName, value, attr);
}
ValueImp *getDOMCSSValue(ExecState *exec, CSSValueImpl *v)
@@ -962,9 +962,9 @@
CSS_CUSTOM CSSValueConstructor::CSS_CUSTOM DontDelete|ReadOnly
@end
*/
-Value CSSValueConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value CSSValueConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<CSSValueConstructor,DOMObject>(exec,p,&CSSValueConstructorTable,this);
+ return lookupGetValue<CSSValueConstructor,DOMObject>(exec,p,&CSSValueConstructorTable,this);
}
Value CSSValueConstructor::getValueProperty(ExecState *, int token) const
@@ -1014,14 +1014,14 @@
setPrototype(DOMCSSPrimitiveValueProto::self(exec));
}
-Value DOMCSSPrimitiveValue::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCSSPrimitiveValue::get(ExecState *exec, const Identifier &p) const
{
if (p == "primitiveType")
return Number(static_cast<CSSPrimitiveValueImpl *>(impl())->primitiveType());
- return DOMObject::tryGet(exec,p);
+ return DOMObject::get(exec,p);
}
-Value DOMCSSPrimitiveValueProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCSSPrimitiveValueProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCSSPrimitiveValue::info)) {
Object err = Error::create(exec,TypeError);
@@ -1087,9 +1087,9 @@
@end
*/
-Value CSSPrimitiveValueConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value CSSPrimitiveValueConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<CSSPrimitiveValueConstructor,CSSValueConstructor>(exec,p,&CSSPrimitiveValueConstructorTable,this);
+ return lookupGetValue<CSSPrimitiveValueConstructor,CSSValueConstructor>(exec,p,&CSSPrimitiveValueConstructorTable,this);
}
Value CSSPrimitiveValueConstructor::getValueProperty(ExecState *, int token) const
@@ -1120,7 +1120,7 @@
{
}
-Value DOMCSSValueList::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCSSValueList::get(ExecState *exec, const Identifier &p) const
{
CSSValueListImpl &valueList = *static_cast<CSSValueListImpl *>(impl());
@@ -1134,10 +1134,10 @@
if (ok)
return getDOMCSSValue(exec,valueList.item(u));
- return DOMCSSValue::tryGet(exec,p);
+ return DOMCSSValue::get(exec,p);
}
-Value DOMCSSValueListFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCSSValueListFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCSSValue::info)) {
Object err = Error::create(exec,TypeError);
@@ -1169,9 +1169,9 @@
//rgbColors.remove(rgbColor.handle());
}
-Value DOMRGBColor::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMRGBColor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMRGBColor,DOMObject>(exec, p,
+ return lookupGetValue<DOMRGBColor,DOMObject>(exec, p,
&DOMRGBColorTable,
this);
}
@@ -1215,9 +1215,9 @@
ScriptInterpreter::forgetDOMObject(m_rect.get());
}
-Value DOMRect::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMRect::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMRect,DOMObject>(exec, p,
+ return lookupGetValue<DOMRect,DOMObject>(exec, p,
&DOMRectTable, this);
}
@@ -1259,9 +1259,9 @@
ScriptInterpreter::forgetDOMObject(m_counter.get());
}
-Value DOMCounter::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCounter::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMCounter,DOMObject>(exec, p,
+ return lookupGetValue<DOMCounter,DOMObject>(exec, p,
&DOMCounterTable, this);
}
1.16 +22 -22 WebCore/khtml/ecma/kjs_css.h
Index: kjs_css.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kjs_css.h 3 Jul 2005 10:47:55 -0000 1.15
+++ kjs_css.h 19 Jul 2005 19:52:48 -0000 1.16
@@ -49,8 +49,8 @@
public:
DOMCSSStyleDeclaration(ExecState *exec, DOM::CSSStyleDeclarationImpl *s);
virtual ~DOMCSSStyleDeclaration();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
virtual const ClassInfo *classInfo() const { return &info; }
static const ClassInfo info;
@@ -68,9 +68,9 @@
public:
DOMStyleSheet(ExecState *, DOM::StyleSheetImpl *ss) : m_impl(ss) { }
virtual ~DOMStyleSheet();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
virtual bool toBoolean(ExecState *) const { return true; }
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -90,7 +90,7 @@
DOMStyleSheetList(ExecState *, DOM::StyleSheetListImpl *ssl, DOM::DocumentImpl *doc)
: m_impl(ssl), m_doc(doc) { }
virtual ~DOMStyleSheetList();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
virtual bool toBoolean(ExecState* ) const { return true; }
@@ -109,8 +109,8 @@
public:
DOMMediaList(ExecState *, DOM::MediaListImpl *ml);
virtual ~DOMMediaList();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
virtual const ClassInfo* classInfo() const { return &info; }
virtual bool toBoolean(ExecState* ) const { return true; }
static const ClassInfo info;
@@ -127,7 +127,7 @@
public:
DOMCSSStyleSheet(ExecState *exec, DOM::CSSStyleSheetImpl *ss);
virtual ~DOMCSSStyleSheet();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -139,7 +139,7 @@
public:
DOMCSSRuleList(ExecState *, DOM::CSSRuleListImpl *rl) : m_impl(rl) { }
virtual ~DOMCSSRuleList();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -155,10 +155,10 @@
public:
DOMCSSRule(ExecState *, DOM::CSSRuleImpl *r) : m_impl(r) { }
virtual ~DOMCSSRule();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int attr);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int attr);
virtual const ClassInfo* classInfo() const;
static const ClassInfo info;
static const ClassInfo style_info, media_info, fontface_info, page_info, import_info, charset_info;
@@ -178,7 +178,7 @@
class CSSRuleConstructor : public DOMObject {
public:
CSSRuleConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -192,8 +192,8 @@
public:
DOMCSSValue(ExecState *, DOM::CSSValueImpl *v) : m_impl(v) { }
virtual ~DOMCSSValue();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { CssText, CssValueType };
@@ -211,7 +211,7 @@
class CSSValueConstructor : public DOMObject {
public:
CSSValueConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -224,7 +224,7 @@
class DOMCSSPrimitiveValue : public DOMCSSValue {
public:
DOMCSSPrimitiveValue(ExecState *exec, DOM::CSSPrimitiveValueImpl *v);
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -236,7 +236,7 @@
class CSSPrimitiveValueConstructor : public CSSValueConstructor {
public:
CSSPrimitiveValueConstructor(ExecState *exec) : CSSValueConstructor(exec) { }
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -248,7 +248,7 @@
class DOMCSSValueList : public DOMCSSValue {
public:
DOMCSSValueList(ExecState *exec, DOM::CSSValueListImpl *l);
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -259,7 +259,7 @@
public:
DOMRGBColor(unsigned color) : m_color(color) { }
~DOMRGBColor();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -275,7 +275,7 @@
public:
DOMRect(ExecState *, DOM::RectImpl *r) : m_rect(r) { }
~DOMRect();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -291,7 +291,7 @@
public:
DOMCounter(ExecState *, DOM::CounterImpl *c) : m_counter(c) { }
~DOMCounter();
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
1.80 +65 -80 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kjs_dom.cpp 18 Jul 2005 21:52:18 -0000 1.79
+++ kjs_dom.cpp 19 Jul 2005 19:52:49 -0000 1.80
@@ -87,7 +87,7 @@
friend class DOMNodeList;
public:
DOMNodeListFunc(ExecState *exec, int id, int len);
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List &);
+ virtual Value call(ExecState *exec, Object &thisObj, const List &);
enum { Item };
private:
int id;
@@ -271,12 +271,12 @@
scrollHeight DOMNode::ScrollHeight DontDelete|ReadOnly
@end
*/
-Value DOMNode::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMNode::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMNode::tryGet " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMNode::get " << propertyName.qstring() << endl;
#endif
- return DOMObjectLookupGetValue<DOMNode, DOMObject>(exec, propertyName, &DOMNodeTable, this);
+ return lookupGetValue<DOMNode, DOMObject>(exec, propertyName, &DOMNodeTable, this);
}
Value DOMNode::getValueProperty(ExecState *exec, int token) const
@@ -443,16 +443,16 @@
return Value();
}
-void DOMNode::tryPut(ExecState *exec, const Identifier& propertyName, const Value& value, int attr)
+void DOMNode::put(ExecState *exec, const Identifier& propertyName, const Value& value, int attr)
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMNode::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMNode::put " << propertyName.qstring() << endl;
#endif
- DOMObjectLookupPut<DOMNode,DOMObject>(exec, propertyName, value, attr,
+ lookupPut<DOMNode,DOMObject>(exec, propertyName, value, attr,
&DOMNodeTable, this );
}
-void DOMNode::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
DOMExceptionTranslator exception(exec);
NodeImpl &node = *m_impl;
@@ -602,7 +602,7 @@
break;
}
default:
- kdWarning() << "DOMNode::putValue unhandled token " << token << endl;
+ kdWarning() << "DOMNode::putValueProperty unhandled token " << token << endl;
}
}
@@ -640,7 +640,7 @@
{
}
-Value DOMNodeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMNodeProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&DOMNode::info)) {
Object err = Error::create(exec,TypeError);
@@ -733,10 +733,10 @@
return ObjectImp::hasOwnProperty(exec, p);
}
-Value DOMNodeList::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMNodeList::get(ExecState *exec, const Identifier &p) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMNodeList::tryGet " << p.ascii() << endl;
+ kdDebug(6070) << "DOMNodeList::get " << p.ascii() << endl;
#endif
Value result;
@@ -769,22 +769,7 @@
}
// Need to support both get and call, so that list[0] and list(0) work.
-Value DOMNodeList::call(ExecState *exec, Object &thisObj, const List &args)
-{
- // This code duplication is necessary, DOMNodeList isn't a DOMFunction
- Value val;
- try {
- val = tryCall(exec, thisObj, args);
- }
- // pity there's no way to distinguish between these in JS code
- catch (...) {
- Object err = Error::create(exec, GeneralError, "Exception from DOMNodeList");
- exec->setException(err);
- }
- return val;
-}
-
-Value DOMNodeList::tryCall(ExecState *exec, Object &, const List &args)
+Value DOMNodeList::call(ExecState *exec, Object &, const List &args)
{
// Do not use thisObj here. See HTMLCollection.
UString s = args[0].toString(exec);
@@ -793,7 +778,7 @@
if (ok)
return getDOMNode(exec, m_impl->item(u));
- kdWarning() << "KJS::DOMNodeList::tryCall " << s.qstring() << " not implemented" << endl;
+ kdWarning() << "KJS::DOMNodeList::call " << s.qstring() << " not implemented" << endl;
return Undefined();
}
@@ -805,7 +790,7 @@
}
// Not a prototype class currently, but should probably be converted to one
-Value DOMNodeListFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMNodeListFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMNodeList::info)) {
Object err = Error::create(exec,TypeError);
@@ -838,12 +823,12 @@
{
}
-Value DOMAttr::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMAttr::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMAttr::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMAttr::put " << propertyName.qstring() << endl;
#endif
- return DOMObjectLookupGetValue<DOMAttr,DOMNode>(exec, propertyName,
+ return lookupGetValue<DOMAttr,DOMNode>(exec, propertyName,
&DOMAttrTable, this );
}
@@ -863,16 +848,16 @@
return Value(); // not reached
}
-void DOMAttr::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMAttr::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMAttr::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMAttr::put " << propertyName.qstring() << endl;
#endif
- DOMObjectLookupPut<DOMAttr,DOMNode>(exec, propertyName, value, attr,
+ lookupPut<DOMAttr,DOMNode>(exec, propertyName, value, attr,
&DOMAttrTable, this );
}
-void DOMAttr::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void DOMAttr::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
DOMExceptionTranslator exception(exec);
switch (token) {
@@ -880,7 +865,7 @@
static_cast<AttrImpl *>(impl())->setValue(value.toString(exec).string(), exception);
return;
default:
- kdWarning() << "DOMAttr::putValue unhandled token " << token << endl;
+ kdWarning() << "DOMAttr::putValueProperty unhandled token " << token << endl;
}
}
@@ -958,12 +943,12 @@
ScriptInterpreter::forgetDOMObject(static_cast<DocumentImpl *>(m_impl.get()));
}
-Value DOMDocument::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMDocument::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMDocument::tryGet " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMDocument::get " << propertyName.qstring() << endl;
#endif
- return DOMObjectLookupGetValue<DOMDocument, DOMNode>(
+ return lookupGetValue<DOMDocument, DOMNode>(
exec, propertyName, &DOMDocumentTable, this);
}
@@ -1002,15 +987,15 @@
}
}
-void DOMDocument::tryPut(ExecState *exec, const Identifier& propertyName, const Value& value, int attr)
+void DOMDocument::put(ExecState *exec, const Identifier& propertyName, const Value& value, int attr)
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMDocument::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMDocument::put " << propertyName.qstring() << endl;
#endif
- DOMObjectLookupPut<DOMDocument,DOMNode>(exec, propertyName, value, attr, &DOMDocumentTable, this );
+ lookupPut<DOMDocument,DOMNode>(exec, propertyName, value, attr, &DOMDocumentTable, this );
}
-void DOMDocument::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void DOMDocument::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
DocumentImpl &doc = *static_cast<DocumentImpl *>(impl());
switch (token) {
@@ -1021,7 +1006,7 @@
}
}
-Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMDocumentProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMNode::info)) {
Object err = Error::create(exec,TypeError);
@@ -1174,10 +1159,10 @@
{
}
-Value DOMElement::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMElement::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMElement::tryGet " << propertyName.qstring() << endl;
+ kdDebug(6070) << "DOMElement::get " << propertyName.qstring() << endl;
#endif
ElementImpl &element = *static_cast<ElementImpl *>(impl());
@@ -1190,7 +1175,7 @@
case Style:
return getDOMCSSStyleDeclaration(exec,element.style());
default:
- kdWarning() << "Unhandled token in DOMElement::tryGet : " << entry->value << endl;
+ kdWarning() << "Unhandled token in DOMElement::get : " << entry->value << endl;
break;
}
}
@@ -1199,7 +1184,7 @@
// the listener object (function).
ValueImp *proto = prototype().imp();
if (DOMNode::hasOwnProperty(exec, propertyName) || (proto->dispatchType() == ObjectType && static_cast<ObjectImp *>(proto)->hasProperty(exec, propertyName)))
- return DOMNode::tryGet(exec, propertyName);
+ return DOMNode::get(exec, propertyName);
DOM::DOMString attr = element.getAttribute( propertyName.string() );
// Give access to attributes
@@ -1209,7 +1194,7 @@
return Undefined();
}
-Value DOMElementProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMElementProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMNode::info)) { // node should be enough here, given the cast
Object err = Error::create(exec,TypeError);
@@ -1315,7 +1300,7 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMDOMImplementationProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMDOMImplementation::info)) {
Object err = Error::create(exec,TypeError);
@@ -1363,9 +1348,9 @@
DOMDocumentType::DOMDocumentType(ExecState *exec, DocumentTypeImpl *dt)
: DOMNode( /*### no proto yet*/exec, dt ) { }
-Value DOMDocumentType::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMDocumentType::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<DOMDocumentType, DOMNode>(exec, propertyName, &DOMDocumentTypeTable, this);
+ return lookupGetValue<DOMDocumentType, DOMNode>(exec, propertyName, &DOMDocumentTypeTable, this);
}
Value DOMDocumentType::getValueProperty(ExecState *exec, int token) const
@@ -1437,7 +1422,7 @@
return DOMObject::hasOwnProperty(exec, p);
}
-Value DOMNamedNodeMap::tryGet(ExecState* exec, const Identifier &p) const
+Value DOMNamedNodeMap::get(ExecState* exec, const Identifier &p) const
{
NamedNodeMapImpl &map = *m_impl;
if (p == lengthPropertyName)
@@ -1450,10 +1435,10 @@
return getDOMNode(exec,map.item(idx));
// Anything else (including functions, defined in the prototype)
- return DOMObject::tryGet(exec, p);
+ return DOMObject::get(exec, p);
}
-Value DOMNamedNodeMapProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMNamedNodeMapProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMNamedNodeMap::info)) {
Object err = Error::create(exec,TypeError);
@@ -1502,9 +1487,9 @@
{
}
-Value DOMProcessingInstruction::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMProcessingInstruction::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<DOMProcessingInstruction, DOMNode>(exec, propertyName, &DOMProcessingInstructionTable, this);
+ return lookupGetValue<DOMProcessingInstruction, DOMNode>(exec, propertyName, &DOMProcessingInstructionTable, this);
}
Value DOMProcessingInstruction::getValueProperty(ExecState *exec, int token) const
@@ -1523,7 +1508,7 @@
}
}
-void DOMProcessingInstruction::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMProcessingInstruction::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
ProcessingInstructionImpl *pi = static_cast<ProcessingInstructionImpl *>(impl());
DOMExceptionTranslator exception(exec);
@@ -1531,7 +1516,7 @@
if (propertyName == "data")
pi->setData(value.toString(exec).string(), exception);
else
- DOMNode::tryPut(exec, propertyName, value, attr);
+ DOMNode::put(exec, propertyName, value, attr);
}
// -------------------------------------------------------------------------
@@ -1550,9 +1535,9 @@
{
}
-Value DOMNotation::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMNotation::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<DOMNotation, DOMNode>(exec, propertyName, &DOMNotationTable, this);
+ return lookupGetValue<DOMNotation, DOMNode>(exec, propertyName, &DOMNotationTable, this);
}
Value DOMNotation::getValueProperty(ExecState *, int token) const
@@ -1585,9 +1570,9 @@
{
}
-Value DOMEntity::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMEntity::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<DOMEntity, DOMNode>(exec, propertyName, &DOMEntityTable, this);
+ return lookupGetValue<DOMEntity, DOMNode>(exec, propertyName, &DOMEntityTable, this);
}
Value DOMEntity::getValueProperty(ExecState *, int token) const
@@ -1759,9 +1744,9 @@
NOTATION_NODE DOM::Node::NOTATION_NODE DontDelete|ReadOnly
@end
*/
-Value NodeConstructor::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value NodeConstructor::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<NodeConstructor, DOMObject>(exec, propertyName, &NodeConstructorTable, this);
+ return lookupGetValue<NodeConstructor, DOMObject>(exec, propertyName, &NodeConstructorTable, this);
}
Value NodeConstructor::getValueProperty(ExecState *, int token) const
@@ -1830,9 +1815,9 @@
@end
*/
-Value DOMExceptionConstructor::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMExceptionConstructor::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<DOMExceptionConstructor, DOMObject>(exec, propertyName, &DOMExceptionConstructorTable, this);
+ return lookupGetValue<DOMExceptionConstructor, DOMObject>(exec, propertyName, &DOMExceptionConstructorTable, this);
}
Value DOMExceptionConstructor::getValueProperty(ExecState *, int token) const
@@ -1893,7 +1878,7 @@
{
}
-Value DOMNamedNodesCollection::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value DOMNamedNodesCollection::get(ExecState *exec, const Identifier &propertyName) const
{
if (propertyName == lengthPropertyName)
return Number(m_nodes.count());
@@ -1926,7 +1911,7 @@
}
}
- return DOMObject::tryGet(exec,propertyName);
+ return DOMObject::get(exec,propertyName);
}
// -------------------------------------------------------------------------
@@ -1961,12 +1946,12 @@
{
}
-Value DOMCharacterData::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMCharacterData::get(ExecState *exec, const Identifier &p) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070)<<"DOMCharacterData::tryGet "<<p.string().string()<<endl;
+ kdDebug(6070)<<"DOMCharacterData::get "<<p.string().string()<<endl;
#endif
- return DOMObjectLookupGetValue<DOMCharacterData,DOMNode>(exec,p,&DOMCharacterDataTable,this);
+ return lookupGetValue<DOMCharacterData,DOMNode>(exec,p,&DOMCharacterDataTable,this);
}
Value DOMCharacterData::getValueProperty(ExecState *, int token) const
@@ -1983,16 +1968,16 @@
}
}
-void DOMCharacterData::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void DOMCharacterData::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
DOMExceptionTranslator exception(exec);
if (propertyName == "data")
static_cast<CharacterDataImpl *>(impl())->setData(value.toString(exec).string(), exception);
else
- DOMNode::tryPut(exec, propertyName,value,attr);
+ DOMNode::put(exec, propertyName,value,attr);
}
-Value DOMCharacterDataProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMCharacterDataProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMCharacterData::info)) {
Object err = Error::create(exec,TypeError);
@@ -2055,15 +2040,15 @@
setPrototype(DOMTextProto::self(exec));
}
-Value DOMText::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMText::get(ExecState *exec, const Identifier &p) const
{
if (p == "")
return Undefined(); // ### TODO
else
- return DOMCharacterData::tryGet(exec, p);
+ return DOMCharacterData::get(exec, p);
}
-Value DOMTextProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMTextProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMText::info)) {
Object err = Error::create(exec,TypeError);
1.43 +23 -24 WebCore/khtml/ecma/kjs_dom.h
Index: kjs_dom.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kjs_dom.h 3 Jul 2005 10:47:56 -0000 1.42
+++ kjs_dom.h 19 Jul 2005 19:52:49 -0000 1.43
@@ -49,11 +49,11 @@
DOMNode(ExecState *exec, DOM::NodeImpl *n);
virtual ~DOMNode();
virtual bool toBoolean(ExecState *) const;
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
virtual void mark();
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int attr);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int attr);
DOM::NodeImpl *impl() const { return m_impl.get(); }
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -92,9 +92,8 @@
DOMNodeList(ExecState *, DOM::NodeListImpl *l) : m_impl(l) { }
~DOMNodeList();
virtual bool hasOwnProperty(ExecState *exec, const Identifier &p) const;
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual Value call(ExecState *exec, Object &thisObj, const List&args);
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List&args);
virtual bool implementsCall() const { return true; }
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -112,10 +111,10 @@
public:
DOMDocument(ExecState *exec, DOM::DocumentImpl *d);
~DOMDocument();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int attr);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int attr);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { DocType, Implementation, DocumentElement,
@@ -138,10 +137,10 @@
class DOMAttr : public DOMNode {
public:
DOMAttr(ExecState *exec, DOM::AttrImpl *a);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
Value getValueProperty(ExecState *exec, int token) const;
- void putValue(ExecState *exec, int token, const Value& value, int attr);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int attr);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { Name, Specified, ValueProperty, OwnerElement };
@@ -152,7 +151,7 @@
class DOMElement : public DOMNode {
public:
DOMElement(ExecState *exec, DOM::ElementImpl *e);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -187,7 +186,7 @@
class DOMDocumentType : public DOMNode {
public:
DOMDocumentType(ExecState *exec, DOM::DocumentTypeImpl *dt);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -202,7 +201,7 @@
DOMNamedNodeMap(ExecState *, DOM::NamedNodeMapImpl *m);
~DOMNamedNodeMap();
virtual bool hasOwnProperty(ExecState *exec, const Identifier &p) const;
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
virtual bool toBoolean(ExecState *) const { return true; }
@@ -217,9 +216,9 @@
class DOMProcessingInstruction : public DOMNode {
public:
DOMProcessingInstruction(ExecState *exec, DOM::ProcessingInstructionImpl *pi);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { Target, Data, Sheet };
@@ -228,7 +227,7 @@
class DOMNotation : public DOMNode {
public:
DOMNotation(ExecState *exec, DOM::NotationImpl *n);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -239,7 +238,7 @@
class DOMEntity : public DOMNode {
public:
DOMEntity(ExecState *exec, DOM::EntityImpl *e);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -251,7 +250,7 @@
class NodeConstructor : public DOMObject {
public:
NodeConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -262,7 +261,7 @@
class DOMExceptionConstructor : public DOMObject {
public:
DOMExceptionConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -284,7 +283,7 @@
class DOMNamedNodesCollection : public DOMObject {
public:
DOMNamedNodesCollection(ExecState *exec, const QValueList< khtml::SharedPtr<DOM::NodeImpl> >& nodes );
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
private:
QValueList< khtml::SharedPtr<DOM::NodeImpl> > m_nodes;
};
@@ -292,9 +291,9 @@
class DOMCharacterData : public DOMNode {
public:
DOMCharacterData(ExecState *exec, DOM::CharacterDataImpl *d);
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
DOM::CharacterDataImpl *toData() const;
@@ -308,7 +307,7 @@
class DOMText : public DOMCharacterData {
public:
DOMText(ExecState *exec, DOM::TextImpl *t);
- virtual Value tryGet(ExecState *exec,const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec,const Identifier &propertyName) const;
Value getValueProperty(ExecState *, int token) const;
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
1.51 +37 -37 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kjs_events.cpp 31 May 2005 05:48:41 -0000 1.50
+++ kjs_events.cpp 19 Jul 2005 19:52:49 -0000 1.51
@@ -351,9 +351,9 @@
@end
*/
-Value EventConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value EventConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<EventConstructor, DOMObject>(exec,p,&EventConstructorTable,this);
+ return lookupGetValue<EventConstructor, DOMObject>(exec,p,&EventConstructorTable,this);
}
Value EventConstructor::getValueProperty(ExecState *, int token) const
@@ -414,12 +414,12 @@
clipboard->mark();
}
-Value DOMEvent::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMEvent::get(ExecState *exec, const Identifier &p) const
{
#ifdef KJS_VERBOSE
- kdDebug() << "KJS::DOMEvent::tryGet " << p.qstring() << endl;
+ kdDebug() << "KJS::DOMEvent::get " << p.qstring() << endl;
#endif
- return DOMObjectLookupGetValue<DOMEvent,DOMObject>(exec, p, &DOMEventTable, this );
+ return lookupGetValue<DOMEvent,DOMObject>(exec, p, &DOMEventTable, this );
}
Value DOMEvent::getValueProperty(ExecState *exec, int token) const
@@ -475,14 +475,14 @@
}
}
-void DOMEvent::tryPut(ExecState *exec, const Identifier &propertyName,
+void DOMEvent::put(ExecState *exec, const Identifier &propertyName,
const Value& value, int attr)
{
- DOMObjectLookupPut<DOMEvent, DOMObject>(exec, propertyName, value, attr,
+ lookupPut<DOMEvent, DOMObject>(exec, propertyName, value, attr,
&DOMEventTable, this);
}
-void DOMEvent::putValue(ExecState *exec, int token, const Value& value, int)
+void DOMEvent::putValueProperty(ExecState *exec, int token, const Value& value, int)
{
EventImpl &event = *m_impl;
switch (token) {
@@ -497,7 +497,7 @@
}
}
-Value DOMEventProtoFunc::tryCall(ExecState *exec, Object & thisObj, const List &args)
+Value DOMEventProtoFunc::call(ExecState *exec, Object & thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMEvent::info)) {
Object err = Error::create(exec,TypeError);
@@ -565,9 +565,9 @@
UNSPECIFIED_EVENT_TYPE_ERR DOM::EventException::UNSPECIFIED_EVENT_TYPE_ERR DontDelete|ReadOnly
@end
*/
-Value EventExceptionConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value EventExceptionConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<EventExceptionConstructor, DOMObject>(exec,p,&EventExceptionConstructorTable,this);
+ return lookupGetValue<EventExceptionConstructor, DOMObject>(exec,p,&EventExceptionConstructorTable,this);
}
Value EventExceptionConstructor::getValueProperty(ExecState *, int token) const
@@ -614,9 +614,9 @@
{
}
-Value DOMUIEvent::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMUIEvent::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMUIEvent,DOMEvent>(exec,p,&DOMUIEventTable,this);
+ return lookupGetValue<DOMUIEvent,DOMEvent>(exec,p,&DOMUIEventTable,this);
}
Value DOMUIEvent::getValueProperty(ExecState *exec, int token) const
@@ -647,7 +647,7 @@
}
}
-Value DOMUIEventProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMUIEventProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMUIEvent::info)) {
Object err = Error::create(exec,TypeError);
@@ -708,12 +708,12 @@
{
}
-Value DOMMouseEvent::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMMouseEvent::get(ExecState *exec, const Identifier &p) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMMouseEvent::tryGet " << p.qstring() << endl;
+ kdDebug(6070) << "DOMMouseEvent::get " << p.qstring() << endl;
#endif
- return DOMObjectLookupGetValue<DOMMouseEvent,DOMUIEvent>(exec,p,&DOMMouseEventTable,this);
+ return lookupGetValue<DOMMouseEvent,DOMUIEvent>(exec,p,&DOMMouseEventTable,this);
}
static QPoint offsetFromTarget(const MouseRelatedEventImpl *e)
@@ -792,7 +792,7 @@
}
}
-Value DOMMouseEventProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMMouseEventProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMMouseEvent::info)) {
Object err = Error::create(exec,TypeError);
@@ -859,12 +859,12 @@
return &info;
}
-Value DOMKeyboardEvent::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMKeyboardEvent::get(ExecState *exec, const Identifier &p) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMKeyboardEvent::tryGet " << p.qstring() << endl;
+ kdDebug(6070) << "DOMKeyboardEvent::get " << p.qstring() << endl;
#endif
- return DOMObjectLookupGetValue<DOMKeyboardEvent, DOMUIEvent>(exec, p, &DOMKeyboardEventTable, this);
+ return lookupGetValue<DOMKeyboardEvent, DOMUIEvent>(exec, p, &DOMKeyboardEventTable, this);
}
Value DOMKeyboardEvent::getValueProperty(ExecState *exec, int token) const
@@ -891,7 +891,7 @@
}
}
-Value DOMKeyboardEventProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMKeyboardEventProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&DOMKeyboardEvent::info)) {
Object err = Error::create(exec,TypeError);
@@ -927,9 +927,9 @@
REMOVAL DOM::MutationEvent::REMOVAL DontDelete|ReadOnly
@end
*/
-Value MutationEventConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value MutationEventConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<MutationEventConstructor,DOMObject>(exec,p,&MutationEventConstructorTable,this);
+ return lookupGetValue<MutationEventConstructor,DOMObject>(exec,p,&MutationEventConstructorTable,this);
}
Value MutationEventConstructor::getValueProperty(ExecState *, int token) const
@@ -972,9 +972,9 @@
{
}
-Value DOMMutationEvent::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMMutationEvent::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMMutationEvent,DOMEvent>(exec,p,&DOMMutationEventTable,this);
+ return lookupGetValue<DOMMutationEvent,DOMEvent>(exec,p,&DOMMutationEventTable,this);
}
Value DOMMutationEvent::getValueProperty(ExecState *exec, int token) const
@@ -997,7 +997,7 @@
}
}
-Value DOMMutationEventProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMMutationEventProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMMutationEvent::info)) {
Object err = Error::create(exec,TypeError);
@@ -1051,9 +1051,9 @@
{
}
-Value DOMWheelEvent::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMWheelEvent::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMWheelEvent,DOMEvent>(exec, p, &DOMWheelEventTable, this);
+ return lookupGetValue<DOMWheelEvent,DOMEvent>(exec, p, &DOMWheelEventTable, this);
}
Value DOMWheelEvent::getValueProperty(ExecState *exec, int token) const
@@ -1088,7 +1088,7 @@
return Undefined();
}
-Value DOMWheelEventProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMWheelEventProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&DOMWheelEvent::info)) {
Object error = Error::create(exec,TypeError);
@@ -1144,9 +1144,9 @@
}
}
-Value Clipboard::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value Clipboard::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<Clipboard,DOMObject>(exec, propertyName, &ClipboardTable, this);
+ return lookupGetValue<Clipboard,DOMObject>(exec, propertyName, &ClipboardTable, this);
}
Value Clipboard::getValueProperty(ExecState *exec, int token) const
@@ -1177,12 +1177,12 @@
}
}
-void Clipboard::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void Clipboard::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
- DOMObjectLookupPut<Clipboard,DOMObject>(exec, propertyName, value, attr, &ClipboardTable, this );
+ lookupPut<Clipboard,DOMObject>(exec, propertyName, value, attr, &ClipboardTable, this );
}
-void Clipboard::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void Clipboard::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
switch (token) {
case DropEffect:
@@ -1196,11 +1196,11 @@
clipboard->setEffectAllowed(value.toString(exec).string());
break;
default:
- kdWarning() << "Clipboard::putValue unhandled token " << token << endl;
+ kdWarning() << "Clipboard::putValueProperty unhandled token " << token << endl;
}
}
-Value ClipboardProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value ClipboardProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::Clipboard::info)) {
Object err = Error::create(exec,TypeError);
1.27 +14 -14 WebCore/khtml/ecma/kjs_events.h
Index: kjs_events.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kjs_events.h 12 May 2005 17:11:21 -0000 1.26
+++ kjs_events.h 19 Jul 2005 19:52:49 -0000 1.27
@@ -99,7 +99,7 @@
class EventConstructor : public DOMObject {
public:
EventConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -112,11 +112,11 @@
public:
DOMEvent(ExecState *exec, DOM::EventImpl *e);
~DOMEvent();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName,
+ virtual void put(ExecState *exec, const Identifier &propertyName,
const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
enum { Type, Target, CurrentTarget, EventPhase, Bubbles,
@@ -137,7 +137,7 @@
class EventExceptionConstructor : public DOMObject {
public:
EventExceptionConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -150,7 +150,7 @@
public:
DOMUIEvent(ExecState *exec, DOM::UIEventImpl *ue);
~DOMUIEvent();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -162,7 +162,7 @@
public:
DOMMouseEvent(ExecState *exec, DOM::MouseEventImpl *me);
~DOMMouseEvent();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
virtual void mark();
// no put - all read-only
@@ -178,7 +178,7 @@
public:
DOMKeyboardEvent(ExecState *exec, DOM::KeyboardEventImpl *ke);
~DOMKeyboardEvent();
- virtual Value tryGet(ExecState *exec, const Identifier &p) const;
+ virtual Value get(ExecState *exec, const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const;
@@ -190,7 +190,7 @@
class MutationEventConstructor : public DOMObject {
public:
MutationEventConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -203,7 +203,7 @@
public:
DOMMutationEvent(ExecState *exec, DOM::MutationEventImpl *me);
~DOMMutationEvent();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -215,7 +215,7 @@
class DOMWheelEvent : public DOMUIEvent {
public:
DOMWheelEvent(ExecState *, DOM::WheelEventImpl *);
- virtual Value tryGet(ExecState *, const Identifier &p) const;
+ virtual Value get(ExecState *, const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -229,10 +229,10 @@
public:
Clipboard(ExecState *exec, DOM::ClipboardImpl *ds);
~Clipboard();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
virtual bool toBoolean(ExecState *) const { return true; }
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
1.125 +53 -68 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kjs_html.cpp 18 Jul 2005 21:52:18 -0000 1.124
+++ kjs_html.cpp 19 Jul 2005 19:52:49 -0000 1.125
@@ -142,14 +142,14 @@
class HTMLElementFunction : public DOMFunction {
public:
HTMLElementFunction(ExecState *exec, int i, int len);
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List&args);
+ virtual Value call(ExecState *exec, Object &thisObj, const List&args);
private:
int id;
};
IMPLEMENT_PROTOFUNC(HTMLDocFunction)
-Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value KJS::HTMLDocFunction::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&HTMLDocument::info)) {
Object err = Error::create(exec,TypeError);
@@ -278,10 +278,10 @@
return DOMDocument::hasOwnProperty(exec, p) || doc->haveNamedImageOrForm(p.qstring());
}
-Value HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value HTMLDocument::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "KJS::HTMLDocument::tryGet " << propertyName.qstring() << endl;
+ kdDebug(6070) << "KJS::HTMLDocument::get " << propertyName.qstring() << endl;
#endif
HTMLDocumentImpl &doc = *static_cast<HTMLDocumentImpl *>(impl());
HTMLElementImpl *body = doc.body();
@@ -392,9 +392,9 @@
ValueImp *proto = prototype().imp();
if (DOMDocument::hasOwnProperty(exec, propertyName) || (proto->dispatchType() == ObjectType && static_cast<ObjectImp *>(proto)->hasProperty(exec, propertyName)))
- return DOMDocument::tryGet(exec, propertyName);
+ return DOMDocument::get(exec, propertyName);
- //kdDebug(6070) << "KJS::HTMLDocument::tryGet " << propertyName.qstring() << " not found, returning element" << endl;
+ //kdDebug(6070) << "KJS::HTMLDocument::get " << propertyName.qstring() << " not found, returning element" << endl;
// image and form elements with the name p will be looked up last
// Look for named applets.
@@ -415,15 +415,15 @@
return HTMLCollection(exec, doc.nameableItems().get()).getNamedItems(exec, propertyName); // Get all the items with the same name
}
-void KJS::HTMLDocument::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void KJS::HTMLDocument::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "KJS::HTMLDocument::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "KJS::HTMLDocument::put " << propertyName.qstring() << endl;
#endif
- DOMObjectLookupPut<HTMLDocument, DOMDocument>( exec, propertyName, value, attr, &HTMLDocumentTable, this );
+ lookupPut<HTMLDocument, DOMDocument>( exec, propertyName, value, attr, &HTMLDocumentTable, this );
}
-void KJS::HTMLDocument::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
DOMExceptionTranslator exception(exec);
HTMLDocumentImpl &doc = *static_cast<HTMLDocumentImpl *>(impl());
@@ -517,7 +517,7 @@
break;
}
default:
- kdWarning() << "HTMLDocument::putValue unhandled token " << token << endl;
+ kdWarning() << "HTMLDocument::putValueProperty unhandled token " << token << endl;
}
}
@@ -1277,7 +1277,7 @@
{
}
-Value KJS::HTMLElement::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value KJS::HTMLElement::get(ExecState *exec, const Identifier &propertyName) const
{
HTMLElementImpl &element = *static_cast<HTMLElementImpl *>(impl());
#ifdef KJS_VERBOSE
@@ -1351,7 +1351,7 @@
}
// Base HTMLElement stuff or parent class forward, as usual
- return DOMObjectLookupGet<KJS::HTMLElementFunction, KJS::HTMLElement, DOMElement>(exec, propertyName, &HTMLElementTable, this);
+ return lookupGet<KJS::HTMLElementFunction, KJS::HTMLElement, DOMElement>(exec, propertyName, &HTMLElementTable, this);
}
bool KJS::HTMLElement::implementsCall() const
@@ -2314,7 +2314,7 @@
put(exec,lengthPropertyName,Number(len),DontDelete|ReadOnly|DontEnum);
}
-Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value KJS::HTMLElementFunction::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::HTMLElement::info)) {
Object err = Error::create(exec,TypeError);
@@ -2510,7 +2510,7 @@
return Undefined();
}
-void KJS::HTMLElement::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void KJS::HTMLElement::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
#ifdef KJS_VERBOSE
DOM::DOMString str = value.isA(NullType) ? DOM::DOMString() : value.toString(exec).string();
@@ -2553,13 +2553,13 @@
ObjectImp::put(exec, propertyName, value, attr);
return;
}
- else if ((entry->attr & ReadOnly) == 0) { // let DOMObjectLookupPut print the warning if not
- putValue(exec, entry->value, value, attr);
+ else if (!(entry->attr & ReadOnly)) { // let lookupPut print the warning if read-only
+ putValueProperty(exec, entry->value, value, attr);
return;
}
}
- DOMObjectLookupPut<KJS::HTMLElement, DOMElement>(exec, propertyName, value, attr, &HTMLElementTable, this);
+ lookupPut<KJS::HTMLElement, DOMElement>(exec, propertyName, value, attr, &HTMLElementTable, this);
}
void HTMLElement::htmlSetter(ExecState *exec, int token, const Value& value, const DOM::DOMString& str)
@@ -3219,7 +3219,7 @@
// FIXME: Find out what WinIE supports and implement it.
}
-void HTMLElement::putValue(ExecState *exec, int token, const Value& value, int)
+void HTMLElement::putValueProperty(ExecState *exec, int token, const Value& value, int)
{
DOMExceptionTranslator exception(exec);
DOM::DOMString str = value.isA(NullType) ? DOM::DOMString() : value.toString(exec).string();
@@ -3322,10 +3322,10 @@
return DOMObject::hasOwnProperty(exec, p);
}
-Value KJS::HTMLCollection::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value KJS::HTMLCollection::get(ExecState *exec, const Identifier &propertyName) const
{
#ifdef KJS_VERBOSE
- kdDebug() << "KJS::HTMLCollection::tryGet " << propertyName.ascii() << endl;
+ kdDebug() << "KJS::HTMLCollection::get " << propertyName.ascii() << endl;
#endif
HTMLCollectionImpl &collection = *m_impl;
if (propertyName == lengthPropertyName)
@@ -3357,29 +3357,14 @@
// HTMLCollections are strange objects, they support both get and call,
// so that document.forms.item(0) and document.forms(0) both work.
-Value KJS::HTMLCollection::call(ExecState *exec, Object &thisObj, const List &args)
-{
- // This code duplication is necessary, HTMLCollection isn't a DOMFunction
- Value val;
- try {
- val = tryCall(exec, thisObj, args);
- }
- // pity there's no way to distinguish between these in JS code
- catch (...) {
- Object err = Error::create(exec, GeneralError, "Exception from HTMLCollection");
- exec->setException(err);
- }
- return val;
-}
-
-Value KJS::HTMLCollection::tryCall(ExecState *exec, Object &, const List &args)
+Value KJS::HTMLCollection::call(ExecState *exec, Object &, const List &args)
{
// Do not use thisObj here. It can be the HTMLDocument, in the document.forms(i) case.
/*if( thisObj.imp() != this )
{
- kdWarning() << "thisObj.imp() != this in HTMLCollection::tryCall" << endl;
- KJS::printInfo(exec,"KJS::HTMLCollection::tryCall thisObj",thisObj,-1);
- KJS::printInfo(exec,"KJS::HTMLCollection::tryCall this",Value(this),-1);
+ kdWarning() << "thisObj.imp() != this in HTMLCollection::call" << endl;
+ KJS::printInfo(exec,"KJS::HTMLCollection::call thisObj",thisObj,-1);
+ KJS::printInfo(exec,"KJS::HTMLCollection::call this",Value(this),-1);
}*/
HTMLCollectionImpl &collection = *m_impl;
@@ -3437,7 +3422,7 @@
return Value(new DOMNamedNodesCollection(exec,namedItems));
}
-Value KJS::HTMLCollectionProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value KJS::HTMLCollectionProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::HTMLCollection::info)) {
Object err = Error::create(exec,TypeError);
@@ -3465,18 +3450,18 @@
{
}
-Value KJS::HTMLSelectCollection::tryGet(ExecState *exec, const Identifier &p) const
+Value KJS::HTMLSelectCollection::get(ExecState *exec, const Identifier &p) const
{
if (p == "selectedIndex")
return Number(m_element->selectedIndex());
- return HTMLCollection::tryGet(exec, p);
+ return HTMLCollection::get(exec, p);
}
-void KJS::HTMLSelectCollection::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int)
+void KJS::HTMLSelectCollection::put(ExecState *exec, const Identifier &propertyName, const Value& value, int)
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "KJS::HTMLSelectCollection::tryPut " << propertyName.qstring() << endl;
+ kdDebug(6070) << "KJS::HTMLSelectCollection::put " << propertyName.qstring() << endl;
#endif
if ( propertyName == "selectedIndex" ) {
m_element->setSelectedIndex( value.toInt32( exec ) );
@@ -3639,9 +3624,9 @@
@end
*/
-Value Image::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value Image::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<Image,DOMObject>(exec, propertyName, &ImageTable, this);
+ return lookupGetValue<Image,DOMObject>(exec, propertyName, &ImageTable, this);
}
Value Image::getValueProperty(ExecState *, int token) const
@@ -3685,12 +3670,12 @@
}
}
-void Image::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void Image::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
- DOMObjectLookupPut<Image,DOMObject>(exec, propertyName, value, attr, &ImageTable, this );
+ lookupPut<Image,DOMObject>(exec, propertyName, value, attr, &ImageTable, this );
}
-void Image::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void Image::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
switch(token) {
case Src:
@@ -3715,7 +3700,7 @@
height = value.toInt32(exec);
break;
default:
- kdWarning() << "HTMLDocument::putValue unhandled token " << token << endl;
+ kdWarning() << "HTMLDocument::putValueProperty unhandled token " << token << endl;
}
}
@@ -3770,7 +3755,7 @@
#define BITS_PER_COMPONENT 8
#define BYTES_PER_ROW(width,bitsPerComponent,numComponents) ((width * bitsPerComponent * numComponents + 7)/8)
-Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value KJS::Context2DFunction::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&Context2D::info)) {
Object err = Error::create(exec,TypeError);
@@ -4652,7 +4637,7 @@
@end
*/
-Value Context2D::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value Context2D::get(ExecState *exec, const Identifier &propertyName) const
{
const HashTable* table = classInfo()->propHashTable; // get the right hashtable
const HashEntry* entry = Lookup::findEntry(table, propertyName);
@@ -4662,7 +4647,7 @@
return getValueProperty(exec, entry->value);
}
- return DOMObjectLookupGetValue<Context2D,DOMObject>(exec, propertyName, &Context2DTable, this);
+ return lookupGetValue<Context2D,DOMObject>(exec, propertyName, &Context2DTable, this);
}
Value Context2D::getValueProperty(ExecState *, int token) const
@@ -4723,9 +4708,9 @@
return Undefined();
}
-void Context2D::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void Context2D::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
- DOMObjectLookupPut<Context2D,DOMObject>(exec, propertyName, value, attr, &Context2DTable, this );
+ lookupPut<Context2D,DOMObject>(exec, propertyName, value, attr, &Context2DTable, this );
}
CGContextRef Context2D::drawingContext()
@@ -4786,7 +4771,7 @@
CFRelease (colorRef);
}
-void Context2D::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void Context2D::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
CGContextRef context = drawingContext();
if (!context)
@@ -5083,7 +5068,7 @@
IMPLEMENT_PROTOFUNC(GradientFunction)
-Value GradientFunction::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value GradientFunction::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&Gradient::info)) {
Object err = Error::create(exec,TypeError);
@@ -5200,7 +5185,7 @@
commonInit();
}
-Value Gradient::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value Gradient::get(ExecState *exec, const Identifier &propertyName) const
{
const HashTable* table = classInfo()->propHashTable; // get the right hashtable
const HashEntry* entry = Lookup::findEntry(table, propertyName);
@@ -5210,7 +5195,7 @@
return getValueProperty(exec, entry->value);
}
- return DOMObjectLookupGetValue<Gradient,DOMObject>(exec, propertyName, &GradientTable, this);
+ return lookupGetValue<Gradient,DOMObject>(exec, propertyName, &GradientTable, this);
}
Value Gradient::getValueProperty(ExecState *, int token) const
@@ -5218,12 +5203,12 @@
return Undefined();
}
-void Gradient::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void Gradient::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
- DOMObjectLookupPut<Gradient,DOMObject>(exec, propertyName, value, attr, &GradientTable, this );
+ lookupPut<Gradient,DOMObject>(exec, propertyName, value, attr, &GradientTable, this );
}
-void Gradient::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void Gradient::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
}
@@ -5399,7 +5384,7 @@
}
}
-Value ImagePattern::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value ImagePattern::get(ExecState *exec, const Identifier &propertyName) const
{
const HashTable* table = classInfo()->propHashTable; // get the right hashtable
const HashEntry* entry = Lookup::findEntry(table, propertyName);
@@ -5409,7 +5394,7 @@
return getValueProperty(exec, entry->value);
}
- return DOMObjectLookupGetValue<ImagePattern,DOMObject>(exec, propertyName, &ImagePatternTable, this);
+ return lookupGetValue<ImagePattern,DOMObject>(exec, propertyName, &ImagePatternTable, this);
}
Value ImagePattern::getValueProperty(ExecState *, int token) const
@@ -5417,12 +5402,12 @@
return Undefined();
}
-void ImagePattern::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void ImagePattern::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
- DOMObjectLookupPut<ImagePattern,DOMObject>(exec, propertyName, value, attr, &ImagePatternTable, this );
+ lookupPut<ImagePattern,DOMObject>(exec, propertyName, value, attr, &ImagePatternTable, this );
}
-void ImagePattern::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void ImagePattern::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
}
1.51 +21 -22 WebCore/khtml/ecma/kjs_html.h
Index: kjs_html.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kjs_html.h 9 Jul 2005 20:19:05 -0000 1.50
+++ kjs_html.h 19 Jul 2005 19:52:49 -0000 1.51
@@ -47,9 +47,9 @@
class HTMLDocument : public DOMDocument {
public:
HTMLDocument(ExecState *exec, DOM::HTMLDocumentImpl *d);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -62,10 +62,10 @@
class HTMLElement : public DOMElement {
public:
HTMLElement(ExecState *exec, DOM::HTMLElementImpl *e);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int);
virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
virtual UString toString(ExecState *exec) const;
virtual void pushEventHandlerScope(ExecState *exec, ScopeChain &scope) const;
@@ -295,9 +295,8 @@
public:
HTMLCollection(ExecState *exec, DOM::HTMLCollectionImpl *c);
~HTMLCollection();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual Value call(ExecState *exec, Object &thisObj, const List&args);
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List&args);
virtual bool implementsCall() const { return true; }
virtual bool toBoolean(ExecState *) const { return true; }
virtual bool hasOwnProperty(ExecState *exec, const Identifier &p) const;
@@ -313,8 +312,8 @@
class HTMLSelectCollection : public HTMLCollection {
public:
HTMLSelectCollection(ExecState *exec, DOM::HTMLCollectionImpl *c, DOM::HTMLSelectElementImpl *e);
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
private:
khtml::SharedPtr<DOM::HTMLSelectElementImpl> m_element;
};
@@ -345,10 +344,10 @@
public:
Image(DOM::DocumentImpl *d, bool ws, int w, bool hs, int h);
~Image();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
void notifyFinished(khtml::CachedObject *);
virtual bool toBoolean(ExecState *) const { return true; }
virtual const ClassInfo* classInfo() const { return &info; }
@@ -375,10 +374,10 @@
public:
Context2D(DOM::HTMLElementImpl *e);
~Context2D();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
virtual bool toBoolean(ExecState *) const { return true; }
virtual void mark();
virtual const ClassInfo* classInfo() const { return &info; }
@@ -461,10 +460,10 @@
Gradient(float x0, float y0, float x1, float y1);
Gradient(float x0, float y0, float r0, float x1, float y1, float r1);
~Gradient();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
virtual bool toBoolean(ExecState *) const { return true; }
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
@@ -508,10 +507,10 @@
public:
ImagePattern(Image *i, int type);
~ImagePattern();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
virtual bool toBoolean(ExecState *) const { return true; }
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
1.29 +2 -2 WebCore/khtml/ecma/kjs_navigator.cpp
Index: kjs_navigator.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_navigator.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kjs_navigator.cpp 12 May 2005 17:11:21 -0000 1.28
+++ kjs_navigator.cpp 19 Jul 2005 19:52:49 -0000 1.29
@@ -456,14 +456,14 @@
}
-Value PluginsFunc::tryCall(ExecState *exec, Object &, const List &args)
+Value PluginsFunc::call(ExecState *exec, Object &, const List &args)
{
PluginBase(exec).refresh(args[0].toBoolean(exec));
return Undefined();
}
-Value NavigatorFunc::tryCall(ExecState *exec, Object &thisObj, const List &)
+Value NavigatorFunc::call(ExecState *exec, Object &thisObj, const List &)
{
if (!thisObj.inherits(&KJS::Navigator::info)) {
Object err = Error::create(exec,TypeError);
1.11 +5 -5 WebCore/khtml/ecma/kjs_range.cpp
Index: kjs_range.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_range.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kjs_range.cpp 12 May 2005 17:11:21 -0000 1.10
+++ kjs_range.cpp 19 Jul 2005 19:52:49 -0000 1.11
@@ -83,9 +83,9 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMRange::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMRange::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMRange, DOMObject>(exec, p, &DOMRangeTable, this);
+ return lookupGetValue<DOMRange, DOMObject>(exec, p, &DOMRangeTable, this);
}
Value DOMRange::getValueProperty(ExecState *exec, int token) const
@@ -111,7 +111,7 @@
}
}
-Value DOMRangeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMRangeProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMRange::info)) {
Object err = Error::create(exec,TypeError);
@@ -204,9 +204,9 @@
END_TO_START DOM::Range::END_TO_START DontDelete|ReadOnly
@end
*/
-Value RangeConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value RangeConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<RangeConstructor,DOMObject>(exec, p, &RangeConstructorTable, this);
+ return lookupGetValue<RangeConstructor,DOMObject>(exec, p, &RangeConstructorTable, this);
}
Value RangeConstructor::getValueProperty(ExecState *, int token) const
1.6 +2 -2 WebCore/khtml/ecma/kjs_range.h
Index: kjs_range.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_range.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kjs_range.h 12 May 2005 17:11:21 -0000 1.5
+++ kjs_range.h 19 Jul 2005 19:52:49 -0000 1.6
@@ -33,7 +33,7 @@
public:
DOMRange(ExecState *exec, DOM::RangeImpl *r);
~DOMRange();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -54,7 +54,7 @@
class RangeConstructor : public DOMObject {
public:
RangeConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
1.12 +10 -10 WebCore/khtml/ecma/kjs_traversal.cpp
Index: kjs_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kjs_traversal.cpp 16 May 2005 19:19:38 -0000 1.11
+++ kjs_traversal.cpp 19 Jul 2005 19:52:49 -0000 1.12
@@ -68,9 +68,9 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMNodeIterator::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMNodeIterator::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMNodeIterator,DOMObject>(exec,p,&DOMNodeIteratorTable,this);
+ return lookupGetValue<DOMNodeIterator,DOMObject>(exec,p,&DOMNodeIteratorTable,this);
}
Value DOMNodeIterator::getValueProperty(ExecState *exec, int token) const
@@ -95,7 +95,7 @@
}
}
-Value DOMNodeIteratorProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &)
+Value DOMNodeIteratorProtoFunc::call(ExecState *exec, Object &thisObj, const List &)
{
if (!thisObj.inherits(&KJS::DOMNodeIterator::info)) {
Object err = Error::create(exec,TypeError);
@@ -145,9 +145,9 @@
SHOW_NOTATION DOM::NodeFilter::SHOW_NOTATION DontDelete|ReadOnly
@end
*/
-Value NodeFilterConstructor::tryGet(ExecState *exec, const Identifier &p) const
+Value NodeFilterConstructor::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<NodeFilterConstructor,DOMObject>(exec,p,&NodeFilterConstructorTable,this);
+ return lookupGetValue<NodeFilterConstructor,DOMObject>(exec,p,&NodeFilterConstructorTable,this);
}
Value NodeFilterConstructor::getValueProperty(ExecState *, int token) const
@@ -184,7 +184,7 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMNodeFilterProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMNodeFilterProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&KJS::DOMNodeFilter::info)) {
Object err = Error::create(exec,TypeError);
@@ -247,9 +247,9 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMTreeWalker::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMTreeWalker::get(ExecState *exec, const Identifier &p) const
{
- return DOMObjectLookupGetValue<DOMTreeWalker,DOMObject>(exec,p,&DOMTreeWalkerTable,this);
+ return lookupGetValue<DOMTreeWalker,DOMObject>(exec,p,&DOMTreeWalkerTable,this);
}
Value DOMTreeWalker::getValueProperty(ExecState *exec, int token) const
@@ -272,7 +272,7 @@
}
}
-void DOMTreeWalker::tryPut(ExecState *exec, const Identifier &propertyName,
+void DOMTreeWalker::put(ExecState *exec, const Identifier &propertyName,
const Value& value, int attr)
{
if (propertyName == "currentNode") {
@@ -283,7 +283,7 @@
ObjectImp::put(exec, propertyName, value, attr);
}
-Value DOMTreeWalkerProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &)
+Value DOMTreeWalkerProtoFunc::call(ExecState *exec, Object &thisObj, const List &)
{
if (!thisObj.inherits(&KJS::DOMTreeWalker::info)) {
Object err = Error::create(exec,TypeError);
1.7 +4 -4 WebCore/khtml/ecma/kjs_traversal.h
Index: kjs_traversal.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kjs_traversal.h 12 May 2005 17:11:21 -0000 1.6
+++ kjs_traversal.h 19 Jul 2005 19:52:49 -0000 1.7
@@ -36,7 +36,7 @@
public:
DOMNodeIterator(ExecState *exec, DOM::NodeIteratorImpl *ni);
~DOMNodeIterator();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -52,7 +52,7 @@
class NodeFilterConstructor : public DOMObject {
public:
NodeFilterConstructor(ExecState *) { }
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *exec, int token) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
@@ -76,9 +76,9 @@
public:
DOMTreeWalker(ExecState *exec, DOM::TreeWalkerImpl *tw);
~DOMTreeWalker();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName,
+ virtual void put(ExecState *exec, const Identifier &propertyName,
const Value& value, int attr = None);
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
1.6 +3 -3 WebCore/khtml/ecma/kjs_views.cpp
Index: kjs_views.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_views.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kjs_views.cpp 12 May 2005 17:11:21 -0000 1.5
+++ kjs_views.cpp 19 Jul 2005 19:52:49 -0000 1.6
@@ -54,16 +54,16 @@
ScriptInterpreter::forgetDOMObject(m_impl.get());
}
-Value DOMAbstractView::tryGet(ExecState *exec, const Identifier &p) const
+Value DOMAbstractView::get(ExecState *exec, const Identifier &p) const
{
if (p == "document")
return getDOMNode(exec, m_impl->document());
else if (p == "getComputedStyle")
return lookupOrCreateFunction<DOMAbstractViewFunc>(exec,p,this,DOMAbstractView::GetComputedStyle,2,DontDelete|Function);
- return DOMObject::tryGet(exec, p);
+ return DOMObject::get(exec, p);
}
-Value DOMAbstractViewFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value DOMAbstractViewFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&DOMAbstractView::info)) {
Object err = Error::create(exec,TypeError);
1.5 +1 -1 WebCore/khtml/ecma/kjs_views.h
Index: kjs_views.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_views.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kjs_views.h 12 May 2005 17:11:21 -0000 1.4
+++ kjs_views.h 19 Jul 2005 19:52:49 -0000 1.5
@@ -33,7 +33,7 @@
public:
DOMAbstractView(ExecState *, DOM::AbstractViewImpl *av) : m_impl(av) { }
~DOMAbstractView();
- virtual Value tryGet(ExecState *exec,const Identifier &p) const;
+ virtual Value get(ExecState *exec,const Identifier &p) const;
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
1.165 +6 -6 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kjs_window.cpp 16 Jul 2005 06:17:31 -0000 1.164
+++ kjs_window.cpp 19 Jul 2005 19:52:49 -0000 1.165
@@ -126,7 +126,7 @@
public:
KonquerorFunc(const Konqueror* k, const char* name)
: DOMFunction(), konqueror(k), m_name(name) { }
- virtual Value tryCall(ExecState *exec, Object &thisObj, const List &args);
+ virtual Value call(ExecState *exec, Object &thisObj, const List &args);
private:
const Konqueror* konqueror;
@@ -1572,7 +1572,7 @@
//kdDebug(6070) << "Window " << this << " (part=" << m_part << ")::setCurrentEvent m_evt=" << evt << endl;
}
-Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&Window::info)) {
Object err = Error::create(exec,TypeError);
@@ -2518,7 +2518,7 @@
return m_part->url().prettyURL();
}
-Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value LocationFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&Location::info)) {
Object err = Error::create(exec,TypeError);
@@ -2706,7 +2706,7 @@
return UString(m_part->selection().toRange()->toString(exception));
}
-Value SelectionFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value SelectionFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&Selection::info)) {
Object err = Error::create(exec,TypeError);
@@ -2892,7 +2892,7 @@
return "[object History]";
}
-Value HistoryFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value HistoryFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&History::info)) {
Object err = Error::create(exec,TypeError);
@@ -2960,7 +2960,7 @@
return /*Function*/( new KonquerorFunc(this, p.qstring().latin1() ) );
}
-Value KonquerorFunc::tryCall(ExecState *exec, Object &, const List &args)
+Value KonquerorFunc::call(ExecState *exec, Object &, const List &args)
{
KParts::BrowserExtension *ext = konqueror->part->browserExtension();
1.32 +7 -7 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xmlhttprequest.cpp 1 Jun 2005 22:23:58 -0000 1.31
+++ xmlhttprequest.cpp 19 Jul 2005 19:52:49 -0000 1.32
@@ -127,9 +127,9 @@
@end
*/
-Value XMLHttpRequest::tryGet(ExecState *exec, const Identifier &propertyName) const
+Value XMLHttpRequest::get(ExecState *exec, const Identifier &propertyName) const
{
- return DOMObjectLookupGetValue<XMLHttpRequest,DOMObject>(exec, propertyName, &XMLHttpRequestTable, this);
+ return lookupGetValue<XMLHttpRequest,DOMObject>(exec, propertyName, &XMLHttpRequestTable, this);
}
Value XMLHttpRequest::getValueProperty(ExecState *exec, int token) const
@@ -201,12 +201,12 @@
}
}
-void XMLHttpRequest::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+void XMLHttpRequest::put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
{
- DOMObjectLookupPut<XMLHttpRequest,DOMObject>(exec, propertyName, value, attr, &XMLHttpRequestTable, this );
+ lookupPut<XMLHttpRequest,DOMObject>(exec, propertyName, value, attr, &XMLHttpRequestTable, this );
}
-void XMLHttpRequest::putValue(ExecState *exec, int token, const Value& value, int /*attr*/)
+void XMLHttpRequest::putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/)
{
switch(token) {
case Onreadystatechange:
@@ -218,7 +218,7 @@
if (onLoadListener) onLoadListener->ref();
break;
default:
- kdWarning() << "HTMLDocument::putValue unhandled token " << token << endl;
+ kdWarning() << "HTMLDocument::putValueProperty unhandled token " << token << endl;
}
}
@@ -652,7 +652,7 @@
QPtrDictIterator<XMLHttpRequest>(*requests).current()->abort();
}
-Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value XMLHttpRequestProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&XMLHttpRequest::info)) {
Object err = Error::create(exec,TypeError);
1.15 +3 -3 WebCore/khtml/ecma/xmlhttprequest.h
Index: xmlhttprequest.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xmlhttprequest.h 14 Jul 2005 04:48:44 -0000 1.14
+++ xmlhttprequest.h 19 Jul 2005 19:52:49 -0000 1.15
@@ -65,10 +65,10 @@
public:
XMLHttpRequest(ExecState *, DOM::DocumentImpl *d);
~XMLHttpRequest();
- virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const;
- virtual void tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
- void putValue(ExecState *exec, int token, const Value& value, int /*attr*/);
+ virtual void put(ExecState *exec, const Identifier &propertyName, const Value& value, int attr = None);
+ void putValueProperty(ExecState *exec, int token, const Value& value, int /*attr*/);
virtual bool toBoolean(ExecState *) const { return true; }
virtual void mark();
1.4 +1 -1 WebCore/khtml/ecma/xmlserializer.cpp
Index: xmlserializer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlserializer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlserializer.cpp 12 May 2005 17:11:21 -0000 1.3
+++ xmlserializer.cpp 19 Jul 2005 19:52:49 -0000 1.4
@@ -70,7 +70,7 @@
setPrototype(XMLSerializerProto::self(exec));
}
-Value XMLSerializerProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
+Value XMLSerializerProtoFunc::call(ExecState *exec, Object &thisObj, const List &args)
{
if (!thisObj.inherits(&XMLSerializer::info)) {
Object err = Error::create(exec,TypeError);
More information about the webkit-changes
mailing list