[webkit-changes] cvs commit: WebCore/khtml/ecma XSLTProcessor.cpp
domparser.cpp kjs_css.cpp kjs_dom.cpp kjs_events.cpp
kjs_html.cpp kjs_navigator.cpp kjs_range.cpp
kjs_traversal.cpp kjs_views.cpp kjs_window.cpp
xmlhttprequest.cpp xmlserializer.cpp
Anders
andersca at opensource.apple.com
Thu Dec 22 13:10:57 PST 2005
andersca 05/12/22 13:10:57
Modified: . ChangeLog
khtml/ecma XSLTProcessor.cpp domparser.cpp kjs_css.cpp
kjs_dom.cpp kjs_events.cpp kjs_html.cpp
kjs_navigator.cpp kjs_range.cpp kjs_traversal.cpp
kjs_views.cpp kjs_window.cpp xmlhttprequest.cpp
xmlserializer.cpp
Log:
2005-12-22 Anders Carlsson <andersca at mac.com>
Reviewed by Eric.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6196
Would like to be able to define prototypes in headers
* khtml/ecma/XSLTProcessor.cpp:
* khtml/ecma/domparser.cpp:
* khtml/ecma/kjs_css.cpp:
* khtml/ecma/kjs_dom.cpp:
* khtml/ecma/kjs_events.cpp:
* khtml/ecma/kjs_html.cpp:
* khtml/ecma/kjs_range.cpp:
* khtml/ecma/kjs_traversal.cpp:
* khtml/ecma/kjs_views.cpp:
* khtml/ecma/xmlhttprequest.cpp:
* khtml/ecma/xmlserializer.cpp:
Update for changes to JSC.
Revision Changes Path
1.27 +20 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 22 Dec 2005 16:53:52 -0000 1.26
+++ ChangeLog 22 Dec 2005 21:10:50 -0000 1.27
@@ -1,3 +1,23 @@
+2005-12-22 Anders Carlsson <andersca at mac.com>
+
+ Reviewed by Eric.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6196
+ Would like to be able to define prototypes in headers
+
+ * khtml/ecma/XSLTProcessor.cpp:
+ * khtml/ecma/domparser.cpp:
+ * khtml/ecma/kjs_css.cpp:
+ * khtml/ecma/kjs_dom.cpp:
+ * khtml/ecma/kjs_events.cpp:
+ * khtml/ecma/kjs_html.cpp:
+ * khtml/ecma/kjs_range.cpp:
+ * khtml/ecma/kjs_traversal.cpp:
+ * khtml/ecma/kjs_views.cpp:
+ * khtml/ecma/xmlhttprequest.cpp:
+ * khtml/ecma/xmlserializer.cpp:
+ Update for changes to JSC.
+
2005-12-22 Darin Adler <darin at apple.com>
Reviewed by Eric.
1.6 +3 -3 WebCore/khtml/ecma/XSLTProcessor.cpp
Index: XSLTProcessor.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/XSLTProcessor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTProcessor.cpp 20 Dec 2005 08:49:47 -0000 1.5
+++ XSLTProcessor.cpp 22 Dec 2005 21:10:50 -0000 1.6
@@ -54,9 +54,9 @@
@end
*/
-DEFINE_PROTOTYPE("XSLTProcessor", XSLTProcessorProto)
-IMPLEMENT_PROTOFUNC(XSLTProcessorProtoFunc)
-IMPLEMENT_PROTOTYPE(XSLTProcessorProto, XSLTProcessorProtoFunc)
+KJS_DEFINE_PROTOTYPE(XSLTProcessorProto)
+KJS_IMPLEMENT_PROTOFUNC(XSLTProcessorProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("XSLTProcessor", XSLTProcessorProto, XSLTProcessorProtoFunc)
XSLTProcessor::XSLTProcessor(ExecState *exec) : m_impl(new XSLTProcessorImpl())
{
1.12 +3 -3 WebCore/khtml/ecma/domparser.cpp
Index: domparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/domparser.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- domparser.cpp 16 Dec 2005 07:51:12 -0000 1.11
+++ domparser.cpp 22 Dec 2005 21:10:50 -0000 1.12
@@ -36,9 +36,9 @@
*/
namespace KJS {
-DEFINE_PROTOTYPE("DOMParser",DOMParserProto)
-IMPLEMENT_PROTOFUNC(DOMParserProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMParserProto,DOMParserProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMParserProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMParserProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMParser",DOMParserProto,DOMParserProtoFunc)
DOMParserConstructorImp::DOMParserConstructorImp(ExecState *, DOM::DocumentImpl *d)
: doc(d)
1.45 +16 -16 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kjs_css.cpp 13 Dec 2005 21:29:28 -0000 1.44
+++ kjs_css.cpp 22 Dec 2005 21:10:50 -0000 1.45
@@ -121,9 +121,9 @@
parentRule DOMCSSStyleDeclaration::ParentRule DontDelete|ReadOnly
@end
*/
-DEFINE_PROTOTYPE("DOMCSSStyleDeclaration", DOMCSSStyleDeclarationProto)
-IMPLEMENT_PROTOFUNC(DOMCSSStyleDeclarationProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMCSSStyleDeclarationProto, DOMCSSStyleDeclarationProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMCSSStyleDeclarationProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMCSSStyleDeclarationProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMCSSStyleDeclaration", DOMCSSStyleDeclarationProto, DOMCSSStyleDeclarationProtoFunc)
const ClassInfo DOMCSSStyleDeclaration::info = { "CSSStyleDeclaration", 0, &DOMCSSStyleDeclarationTable, 0 };
@@ -362,7 +362,7 @@
item DOMStyleSheetList::Item DontDelete|Function 1
@end
*/
-IMPLEMENT_PROTOFUNC(DOMStyleSheetListFunc) // not really a proto, but doesn't matter
+KJS_IMPLEMENT_PROTOFUNC(DOMStyleSheetListFunc) // not really a proto, but doesn't matter
DOMStyleSheetList::~DOMStyleSheetList()
{
@@ -473,9 +473,9 @@
appendMedium DOMMediaList::AppendMedium DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("DOMMediaList", DOMMediaListProto)
-IMPLEMENT_PROTOFUNC(DOMMediaListProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMMediaListProto, DOMMediaListProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMMediaListProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMMediaListProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMMediaList", DOMMediaListProto, DOMMediaListProtoFunc)
DOMMediaList::DOMMediaList(ExecState *exec, MediaListImpl *ml)
: m_impl(ml)
@@ -576,9 +576,9 @@
addRule DOMCSSStyleSheet::AddRule DontDelete|Function 2
@end
*/
-DEFINE_PROTOTYPE("DOMCSSStyleSheet",DOMCSSStyleSheetProto)
-IMPLEMENT_PROTOFUNC(DOMCSSStyleSheetProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMCSSStyleSheetProto,DOMCSSStyleSheetProtoFunc) // warning, use _WITH_PARENT if DOMStyleSheet gets a proto
+KJS_DEFINE_PROTOTYPE(DOMCSSStyleSheetProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMCSSStyleSheetProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMCSSStyleSheet",DOMCSSStyleSheetProto,DOMCSSStyleSheetProtoFunc) // warning, use _WITH_PARENT if DOMStyleSheet gets a proto
DOMCSSStyleSheet::DOMCSSStyleSheet(ExecState *exec, CSSStyleSheetImpl *ss)
: DOMStyleSheet(ss)
@@ -640,7 +640,7 @@
item DOMCSSRuleList::Item DontDelete|Function 1
@end
*/
-IMPLEMENT_PROTOFUNC(DOMCSSRuleListFunc) // not really a proto, but doesn't matter
+KJS_IMPLEMENT_PROTOFUNC(DOMCSSRuleListFunc) // not really a proto, but doesn't matter
DOMCSSRuleList::~DOMCSSRuleList()
{
@@ -708,7 +708,7 @@
// -------------------------------------------------------------------------
-IMPLEMENT_PROTOFUNC(DOMCSSRuleFunc) // Not a proto, but doesn't matter
+KJS_IMPLEMENT_PROTOFUNC(DOMCSSRuleFunc) // Not a proto, but doesn't matter
DOMCSSRule::~DOMCSSRule()
{
@@ -1069,9 +1069,9 @@
getRGBColorValue DOMCSSPrimitiveValue::GetRGBColorValue DontDelete|Function 0
@end
*/
-DEFINE_PROTOTYPE("DOMCSSPrimitiveValue",DOMCSSPrimitiveValueProto)
-IMPLEMENT_PROTOFUNC(DOMCSSPrimitiveValueProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMCSSPrimitiveValueProto,DOMCSSPrimitiveValueProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMCSSPrimitiveValueProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMCSSPrimitiveValueProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMCSSPrimitiveValue",DOMCSSPrimitiveValueProto,DOMCSSPrimitiveValueProtoFunc)
DOMCSSPrimitiveValue::DOMCSSPrimitiveValue(ExecState *exec, CSSPrimitiveValueImpl *v)
: DOMCSSValue(v)
@@ -1179,7 +1179,7 @@
item DOMCSSValueList::Item DontDelete|Function 1
@end
*/
-IMPLEMENT_PROTOFUNC(DOMCSSValueListFunc) // not really a proto, but doesn't matter
+KJS_IMPLEMENT_PROTOFUNC(DOMCSSValueListFunc) // not really a proto, but doesn't matter
DOMCSSValueList::DOMCSSValueList(ExecState *exec, CSSValueListImpl *v)
: DOMCSSValue(exec, v)
1.121 +22 -22 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kjs_dom.cpp 16 Dec 2005 08:08:12 -0000 1.120
+++ kjs_dom.cpp 22 Dec 2005 21:10:51 -0000 1.121
@@ -112,9 +112,9 @@
item DOMNode::Item DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("DOMNode",DOMNodeProto)
-IMPLEMENT_PROTOFUNC(DOMNodeProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMNodeProto,DOMNodeProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMNodeProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMNodeProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMNode",DOMNodeProto,DOMNodeProtoFunc)
const ClassInfo DOMNode::info = { "Node", 0, &DOMNodeTable, 0 };
@@ -720,7 +720,7 @@
@end
*/
-IMPLEMENT_PROTOFUNC(DOMNodeListFunc)
+KJS_IMPLEMENT_PROTOFUNC(DOMNodeListFunc)
const ClassInfo DOMNodeList::info = { "NodeList", 0, &DOMNodeListTable, 0 };
@@ -909,9 +909,9 @@
queryCommandValue DOMDocument::QueryCommandValue DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("DOMDocument", DOMDocumentProto)
-IMPLEMENT_PROTOFUNC(DOMDocumentProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMDocumentProto, DOMDocumentProtoFunc, DOMNodeProto)
+KJS_DEFINE_PROTOTYPE(DOMDocumentProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMDocumentProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMDocument", DOMDocumentProto, DOMDocumentProtoFunc, DOMNodeProto)
const ClassInfo DOMDocument::info = { "Document", &DOMNode::info, &DOMDocumentTable, 0 };
@@ -1154,9 +1154,9 @@
@end
*/
-DEFINE_PROTOTYPE("DOMElement",DOMElementProto)
-IMPLEMENT_PROTOFUNC(DOMElementProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMElementProto,DOMElementProtoFunc,DOMNodeProto)
+KJS_DEFINE_PROTOTYPE(DOMElementProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMElementProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMElement",DOMElementProto,DOMElementProtoFunc,DOMNodeProto)
const ClassInfo DOMElement::info = { "Element", &DOMNode::info, &DOMElementTable, 0 };
/* Source for DOMElementTable. Use "make hashtables" to regenerate.
@@ -1325,9 +1325,9 @@
createHTMLDocument DOMDOMImplementation::CreateHTMLDocument DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("DOMImplementation",DOMDOMImplementationProto)
-IMPLEMENT_PROTOFUNC(DOMDOMImplementationProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMDOMImplementationProto,DOMDOMImplementationProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMDOMImplementationProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMDOMImplementationProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMImplementation",DOMDOMImplementationProto,DOMDOMImplementationProtoFunc)
const ClassInfo DOMDOMImplementation::info = { "DOMImplementation", 0, 0, 0 };
@@ -1435,9 +1435,9 @@
removeNamedItemNS DOMNamedNodeMap::RemoveNamedItemNS DontDelete|Function 2
@end
*/
-DEFINE_PROTOTYPE("NamedNodeMap", DOMNamedNodeMapProto)
-IMPLEMENT_PROTOFUNC(DOMNamedNodeMapProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMNamedNodeMapProto,DOMNamedNodeMapProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMNamedNodeMapProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMNamedNodeMapProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("NamedNodeMap",DOMNamedNodeMapProto,DOMNamedNodeMapProtoFunc)
const ClassInfo DOMNamedNodeMap::info = { "NamedNodeMap", 0, 0, 0 };
@@ -1926,9 +1926,9 @@
replaceData DOMCharacterData::ReplaceData DontDelete|Function 2
@end
*/
-DEFINE_PROTOTYPE("DOMCharacterData",DOMCharacterDataProto)
-IMPLEMENT_PROTOFUNC(DOMCharacterDataProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMCharacterDataProto,DOMCharacterDataProtoFunc, DOMNodeProto)
+KJS_DEFINE_PROTOTYPE(DOMCharacterDataProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMCharacterDataProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMCharacterData",DOMCharacterDataProto,DOMCharacterDataProtoFunc, DOMNodeProto)
DOMCharacterData::DOMCharacterData(ExecState *exec, CharacterDataImpl *d)
: DOMNode(d)
@@ -2019,9 +2019,9 @@
splitText DOMText::SplitText DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("DOMText",DOMTextProto)
-IMPLEMENT_PROTOFUNC(DOMTextProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMTextProto,DOMTextProtoFunc,DOMCharacterDataProto)
+KJS_DEFINE_PROTOTYPE(DOMTextProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMTextProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMText",DOMTextProto,DOMTextProtoFunc,DOMCharacterDataProto)
DOMText::DOMText(ExecState *exec, TextImpl *t)
: DOMCharacterData(t)
1.80 +21 -21 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kjs_events.cpp 22 Dec 2005 04:06:45 -0000 1.79
+++ kjs_events.cpp 22 Dec 2005 21:10:51 -0000 1.80
@@ -371,9 +371,9 @@
initEvent DOMEvent::InitEvent DontDelete|Function 3
@end
*/
-DEFINE_PROTOTYPE("DOMEvent", DOMEventProto)
-IMPLEMENT_PROTOFUNC(DOMEventProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMEventProto, DOMEventProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMEventProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMEventProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMEvent", DOMEventProto, DOMEventProtoFunc)
DOMEvent::DOMEvent(ExecState *exec, EventImpl *e)
: m_impl(e), clipboard(0)
@@ -573,9 +573,9 @@
initUIEvent DOMUIEvent::InitUIEvent DontDelete|Function 5
@end
*/
-DEFINE_PROTOTYPE("DOMUIEvent",DOMUIEventProto)
-IMPLEMENT_PROTOFUNC(DOMUIEventProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMUIEventProto,DOMUIEventProtoFunc,DOMEventProto)
+KJS_DEFINE_PROTOTYPE(DOMUIEventProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMUIEventProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMUIEvent",DOMUIEventProto,DOMUIEventProtoFunc,DOMEventProto)
DOMUIEvent::DOMUIEvent(ExecState *exec, UIEventImpl *e)
: DOMEvent(exec, e)
@@ -660,9 +660,9 @@
initMouseEvent DOMMouseEvent::InitMouseEvent DontDelete|Function 15
@end
*/
-DEFINE_PROTOTYPE("DOMMouseEvent",DOMMouseEventProto)
-IMPLEMENT_PROTOFUNC(DOMMouseEventProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMMouseEventProto,DOMMouseEventProtoFunc,DOMUIEventProto)
+KJS_DEFINE_PROTOTYPE(DOMMouseEventProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMMouseEventProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMMouseEvent",DOMMouseEventProto,DOMMouseEventProtoFunc,DOMUIEventProto)
DOMMouseEvent::DOMMouseEvent(ExecState *exec, MouseEventImpl *e)
: DOMUIEvent(exec, e)
@@ -762,9 +762,9 @@
initKeyboardEvent DOMKeyboardEvent::InitKeyboardEvent DontDelete|Function 11
@end
*/
-DEFINE_PROTOTYPE("DOMKeyboardEvent", DOMKeyboardEventProto)
-IMPLEMENT_PROTOFUNC(DOMKeyboardEventProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMKeyboardEventProto, DOMKeyboardEventProtoFunc, DOMUIEventProto)
+KJS_DEFINE_PROTOTYPE(DOMKeyboardEventProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMKeyboardEventProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMKeyboardEvent", DOMKeyboardEventProto, DOMKeyboardEventProtoFunc, DOMUIEventProto)
DOMKeyboardEvent::DOMKeyboardEvent(ExecState *exec, KeyboardEventImpl *e)
: DOMUIEvent(exec, e)
@@ -865,9 +865,9 @@
initMutationEvent DOMMutationEvent::InitMutationEvent DontDelete|Function 8
@end
*/
-DEFINE_PROTOTYPE("DOMMutationEvent",DOMMutationEventProto)
-IMPLEMENT_PROTOFUNC(DOMMutationEventProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMMutationEventProto,DOMMutationEventProtoFunc,DOMEventProto)
+KJS_DEFINE_PROTOTYPE(DOMMutationEventProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMMutationEventProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMMutationEvent",DOMMutationEventProto,DOMMutationEventProtoFunc,DOMEventProto)
DOMMutationEvent::DOMMutationEvent(ExecState *exec, MutationEventImpl *e)
: DOMEvent(exec, e)
@@ -942,9 +942,9 @@
@begin DOMWheelEventProtoTable 1
@end
*/
-DEFINE_PROTOTYPE("DOMWheelEvent",DOMWheelEventProto)
-IMPLEMENT_PROTOFUNC(DOMWheelEventProtoFunc)
-IMPLEMENT_PROTOTYPE_WITH_PARENT(DOMWheelEventProto,DOMWheelEventProtoFunc,DOMEventProto)
+KJS_DEFINE_PROTOTYPE(DOMWheelEventProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMWheelEventProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT("DOMWheelEvent",DOMWheelEventProto,DOMWheelEventProtoFunc,DOMEventProto)
DOMWheelEvent::DOMWheelEvent(ExecState *exec, DOM::WheelEventImpl *e)
: DOMUIEvent(exec, e)
@@ -1015,9 +1015,9 @@
@end
*/
-DEFINE_PROTOTYPE("Clipboard", ClipboardProto)
-IMPLEMENT_PROTOFUNC(ClipboardProtoFunc)
-IMPLEMENT_PROTOTYPE(ClipboardProto, ClipboardProtoFunc)
+KJS_DEFINE_PROTOTYPE(ClipboardProto)
+KJS_IMPLEMENT_PROTOFUNC(ClipboardProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("Clipboard", ClipboardProto, ClipboardProtoFunc)
Clipboard::Clipboard(ExecState *exec, DOM::ClipboardImpl *cb)
: clipboard(cb)
1.158 +6 -6 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kjs_html.cpp 16 Dec 2005 08:08:12 -0000 1.157
+++ kjs_html.cpp 22 Dec 2005 21:10:51 -0000 1.158
@@ -148,7 +148,7 @@
int id;
};
-IMPLEMENT_PROTOFUNC(HTMLDocFunction)
+KJS_IMPLEMENT_PROTOFUNC(HTMLDocFunction)
JSValue *KJS::HTMLDocFunction::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
{
@@ -3296,9 +3296,9 @@
tags HTMLCollection::Tags DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("HTMLCollection", HTMLCollectionProto)
-IMPLEMENT_PROTOFUNC(HTMLCollectionProtoFunc)
-IMPLEMENT_PROTOTYPE(HTMLCollectionProto,HTMLCollectionProtoFunc)
+KJS_DEFINE_PROTOTYPE(HTMLCollectionProto)
+KJS_IMPLEMENT_PROTOFUNC(HTMLCollectionProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("HTMLCollection",HTMLCollectionProto,HTMLCollectionProtoFunc)
const ClassInfo HTMLCollection::info = { "HTMLCollection", 0, 0, 0 };
@@ -3741,7 +3741,7 @@
////////////////////// Context2D Object ////////////////////////
-IMPLEMENT_PROTOFUNC(Context2DFunction)
+KJS_IMPLEMENT_PROTOFUNC(Context2DFunction)
static bool isGradient(JSValue *value)
{
@@ -4969,7 +4969,7 @@
@end
*/
-IMPLEMENT_PROTOFUNC(GradientFunction)
+KJS_IMPLEMENT_PROTOFUNC(GradientFunction)
JSValue *GradientFunction::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
{
1.44 +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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kjs_navigator.cpp 16 Dec 2005 18:35:19 -0000 1.43
+++ kjs_navigator.cpp 22 Dec 2005 21:10:52 -0000 1.44
@@ -155,7 +155,7 @@
javaEnabled Navigator::JavaEnabled DontDelete|Function 0
@end
*/
-IMPLEMENT_PROTOFUNC(NavigatorFunc)
+KJS_IMPLEMENT_PROTOFUNC(NavigatorFunc)
Navigator::Navigator(ExecState *exec, KHTMLPart *p)
: JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()), m_part(p) { }
@@ -326,7 +326,7 @@
refresh Plugins::Refresh DontDelete|Function 0
@end
*/
-IMPLEMENT_PROTOFUNC(PluginsFunc)
+KJS_IMPLEMENT_PROTOFUNC(PluginsFunc)
JSValue *Plugins::getValueProperty(ExecState *exec, int token) const
{
1.20 +3 -3 WebCore/khtml/ecma/kjs_range.cpp
Index: kjs_range.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_range.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kjs_range.cpp 11 Dec 2005 02:06:07 -0000 1.19
+++ kjs_range.cpp 22 Dec 2005 21:10:52 -0000 1.20
@@ -69,9 +69,9 @@
createContextualFragment DOMRange::CreateContextualFragment DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("DOMRange",DOMRangeProto)
-IMPLEMENT_PROTOFUNC(DOMRangeProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMRangeProto,DOMRangeProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMRangeProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMRangeProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMRange",DOMRangeProto,DOMRangeProtoFunc)
DOMRange::DOMRange(ExecState *exec, RangeImpl *r)
: m_impl(r)
1.26 +9 -9 WebCore/khtml/ecma/kjs_traversal.cpp
Index: kjs_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kjs_traversal.cpp 14 Dec 2005 23:31:46 -0000 1.25
+++ kjs_traversal.cpp 22 Dec 2005 21:10:52 -0000 1.26
@@ -54,9 +54,9 @@
detach DOMNodeIterator::Detach DontDelete|Function 0
@end
*/
-DEFINE_PROTOTYPE("DOMNodeIterator",DOMNodeIteratorProto)
-IMPLEMENT_PROTOFUNC(DOMNodeIteratorProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMNodeIteratorProto,DOMNodeIteratorProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMNodeIteratorProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMNodeIteratorProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMNodeIterator",DOMNodeIteratorProto,DOMNodeIteratorProtoFunc)
DOMNodeIterator::DOMNodeIterator(ExecState *exec, NodeIteratorImpl *ni)
: m_impl(ni)
@@ -167,9 +167,9 @@
acceptNode DOMNodeFilter::AcceptNode DontDelete|Function 0
@end
*/
-DEFINE_PROTOTYPE("DOMNodeFilter",DOMNodeFilterProto)
-IMPLEMENT_PROTOFUNC(DOMNodeFilterProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMNodeFilterProto,DOMNodeFilterProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMNodeFilterProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMNodeFilterProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMNodeFilter",DOMNodeFilterProto,DOMNodeFilterProtoFunc)
DOMNodeFilter::DOMNodeFilter(ExecState *exec, NodeFilterImpl *nf)
: m_impl(nf)
@@ -227,9 +227,9 @@
nextNode DOMTreeWalker::NextNode DontDelete|Function 0
@end
*/
-DEFINE_PROTOTYPE("DOMTreeWalker",DOMTreeWalkerProto)
-IMPLEMENT_PROTOFUNC(DOMTreeWalkerProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMTreeWalkerProto,DOMTreeWalkerProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMTreeWalkerProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMTreeWalkerProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMTreeWalker",DOMTreeWalkerProto,DOMTreeWalkerProtoFunc)
DOMTreeWalker::DOMTreeWalker(ExecState *exec, TreeWalkerImpl *tw)
: m_impl(tw)
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kjs_views.cpp 11 Dec 2005 02:06:07 -0000 1.20
+++ kjs_views.cpp 22 Dec 2005 21:10:52 -0000 1.21
@@ -51,9 +51,9 @@
@end
*/
-DEFINE_PROTOTYPE("DOMAbstractView",DOMAbstractViewProto)
-IMPLEMENT_PROTOFUNC(DOMAbstractViewProtoFunc)
-IMPLEMENT_PROTOTYPE(DOMAbstractViewProto,DOMAbstractViewProtoFunc)
+KJS_DEFINE_PROTOTYPE(DOMAbstractViewProto)
+KJS_IMPLEMENT_PROTOFUNC(DOMAbstractViewProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("DOMAbstractView",DOMAbstractViewProto,DOMAbstractViewProtoFunc)
DOMAbstractView::DOMAbstractView(ExecState *exec, AbstractViewImpl *av)
: m_impl(av)
1.205 +4 -4 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- kjs_window.cpp 20 Dec 2005 17:05:51 -0000 1.204
+++ kjs_window.cpp 22 Dec 2005 21:10:52 -0000 1.205
@@ -307,7 +307,7 @@
showModalDialog Window::ShowModalDialog DontDelete|Function 1
@end
*/
-IMPLEMENT_PROTOFUNC(WindowFunc)
+KJS_IMPLEMENT_PROTOFUNC(WindowFunc)
Window::Window(KHTMLPart *p)
: JSObject(/*no proto*/)
@@ -2095,7 +2095,7 @@
reload Location::Reload DontDelete|Function 0
@end
*/
-IMPLEMENT_PROTOFUNC(LocationFunc)
+KJS_IMPLEMENT_PROTOFUNC(LocationFunc)
Location::Location(KHTMLPart *p) : m_part(p)
{
}
@@ -2305,7 +2305,7 @@
modify Selection::Modify DontDelete|Function 3
@end
*/
-IMPLEMENT_PROTOFUNC(SelectionFunc)
+KJS_IMPLEMENT_PROTOFUNC(SelectionFunc)
Selection::Selection(KHTMLPart *p) : m_part(p)
{
}
@@ -2496,7 +2496,7 @@
go History::Go DontDelete|Function 1
@end
*/
-IMPLEMENT_PROTOFUNC(HistoryFunc)
+KJS_IMPLEMENT_PROTOFUNC(HistoryFunc)
bool History::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
{
1.55 +3 -3 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xmlhttprequest.cpp 20 Dec 2005 08:49:47 -0000 1.54
+++ xmlhttprequest.cpp 22 Dec 2005 21:10:53 -0000 1.55
@@ -108,9 +108,9 @@
setRequestHeader XMLHttpRequest::SetRequestHeader DontDelete|Function 2
@end
*/
-DEFINE_PROTOTYPE("XMLHttpRequest",XMLHttpRequestProto)
-IMPLEMENT_PROTOFUNC(XMLHttpRequestProtoFunc)
-IMPLEMENT_PROTOTYPE(XMLHttpRequestProto,XMLHttpRequestProtoFunc)
+KJS_DEFINE_PROTOTYPE(XMLHttpRequestProto)
+KJS_IMPLEMENT_PROTOFUNC(XMLHttpRequestProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("XMLHttpRequest",XMLHttpRequestProto,XMLHttpRequestProtoFunc)
XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
{
1.12 +3 -3 WebCore/khtml/ecma/xmlserializer.cpp
Index: xmlserializer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlserializer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmlserializer.cpp 11 Dec 2005 02:06:08 -0000 1.11
+++ xmlserializer.cpp 22 Dec 2005 21:10:54 -0000 1.12
@@ -40,9 +40,9 @@
serializeToString XMLSerializer::SerializeToString DontDelete|Function 1
@end
*/
-DEFINE_PROTOTYPE("XMLSerializer",XMLSerializerProto)
-IMPLEMENT_PROTOFUNC(XMLSerializerProtoFunc)
-IMPLEMENT_PROTOTYPE(XMLSerializerProto,XMLSerializerProtoFunc)
+KJS_DEFINE_PROTOTYPE(XMLSerializerProto)
+KJS_IMPLEMENT_PROTOFUNC(XMLSerializerProtoFunc)
+KJS_IMPLEMENT_PROTOTYPE("XMLSerializer",XMLSerializerProto,XMLSerializerProtoFunc)
XMLSerializerConstructorImp::XMLSerializerConstructorImp(ExecState *)
: JSObject()
More information about the webkit-changes
mailing list