[webkit-changes] cvs commit: WebCore/kwq DOM.mm DOMHTML.mm
KWQAccObject.mm KWQKHTMLPart.cpp KWQKHTMLPart.mm WebCoreBridge.mm
Darin
darin at opensource.apple.com
Thu Aug 25 16:14:01 PDT 2005
darin 05/08/25 16:14:00
Modified: . ChangeLog
khtml khtml_part.cpp
khtml/ecma kjs_css.cpp kjs_dom.cpp kjs_html.cpp
khtml/editing apply_style_command.cpp
break_blockquote_command.cpp
composite_edit_command.cpp
delete_selection_command.cpp htmlediting.cpp
insert_line_break_command.cpp
insert_paragraph_separator_command.cpp markup.cpp
replace_selection_command.cpp visible_position.cpp
visible_text.cpp visible_units.cpp
khtml/html html_documentimpl.cpp html_elementimpl.cpp
html_formimpl.cpp html_inlineimpl.cpp
html_listimpl.cpp html_listimpl.h html_miscimpl.cpp
html_objectimpl.cpp html_tableimpl.cpp
htmlfactory.cpp htmlnames.cpp htmlnames.h
htmlparser.cpp htmltokenizer.cpp
khtml/misc decoder.cpp
khtml/rendering render_applet.cpp render_form.cpp
render_frames.cpp render_list.cpp render_table.cpp
render_theme.cpp
khtml/xml dom_nodeimpl.cpp dom_position.cpp
xml_tokenizer.cpp
kwq DOM.mm DOMHTML.mm KWQAccObject.mm KWQKHTMLPart.cpp
KWQKHTMLPart.mm WebCoreBridge.mm
Log:
Reviewed by John Sullivan.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4654
one more pass of HTMLNames refinement
* khtml/html/htmlnames.h: Used new "for each" macros so the lists of tags here can
be re-used in other files.
* khtml/html/htmlnames.cpp: (DOM::HTMLNames::init): Changed the name of the function
and used the macros defined in the header to avoid repeating the lists.
* khtml/khtml_part.cpp: (KHTMLPart::init): Update for function name change.
* khtml/html/html_elementimpl.cpp: (HTMLElementImpl::isRecognizedTagName): Use the
macro from htmlnames.h to avoid repeating the list of tags.
* khtml/ecma/kjs_css.cpp:
* khtml/ecma/kjs_dom.cpp:
* khtml/ecma/kjs_html.cpp:
* khtml/editing/apply_style_command.cpp:
* khtml/editing/break_blockquote_command.cpp:
* khtml/editing/composite_edit_command.cpp:
* khtml/editing/delete_selection_command.cpp:
* khtml/editing/htmlediting.cpp:
* khtml/editing/insert_line_break_command.cpp:
* khtml/editing/insert_paragraph_separator_command.cpp:
* khtml/editing/markup.cpp:
* khtml/editing/replace_selection_command.cpp:
* khtml/editing/visible_position.cpp:
* khtml/editing/visible_text.cpp:
* khtml/editing/visible_units.cpp:
* khtml/html/html_documentimpl.cpp:
* khtml/html/html_formimpl.cpp:
* khtml/html/html_inlineimpl.cpp:
* khtml/html/html_listimpl.cpp:
* khtml/html/html_listimpl.h:
* khtml/html/html_miscimpl.cpp:
* khtml/html/html_objectimpl.cpp:
* khtml/html/html_tableimpl.cpp:
* khtml/html/htmlfactory.cpp:
* khtml/html/htmlparser.cpp:
* khtml/html/htmltokenizer.cpp:
* khtml/misc/decoder.cpp:
* khtml/rendering/render_applet.cpp:
* khtml/rendering/render_form.cpp:
* khtml/rendering/render_frames.cpp:
* khtml/rendering/render_list.cpp:
* khtml/rendering/render_table.cpp:
* khtml/rendering/render_theme.cpp:
* khtml/xml/dom_nodeimpl.cpp:
* khtml/xml/dom_position.cpp:
* khtml/xml/xml_tokenizer.cpp:
* kwq/DOM.mm:
* kwq/DOMHTML.mm:
* kwq/KWQAccObject.mm:
* kwq/KWQKHTMLPart.cpp:
* kwq/KWQKHTMLPart.mm:
* kwq/WebCoreBridge.mm:
Updated "using" because HTMLNames is now inside the DOM namespace.
Revision Changes Path
1.15 +61 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 25 Aug 2005 23:08:18 -0000 1.14
+++ ChangeLog 25 Aug 2005 23:13:39 -0000 1.15
@@ -1,5 +1,66 @@
2005-08-25 Darin Adler <darin at apple.com>
+ Reviewed by John Sullivan.
+
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4654
+ one more pass of HTMLNames refinement
+
+ * khtml/html/htmlnames.h: Used new "for each" macros so the lists of tags here can
+ be re-used in other files.
+ * khtml/html/htmlnames.cpp: (DOM::HTMLNames::init): Changed the name of the function
+ and used the macros defined in the header to avoid repeating the lists.
+
+ * khtml/khtml_part.cpp: (KHTMLPart::init): Update for function name change.
+
+ * khtml/html/html_elementimpl.cpp: (HTMLElementImpl::isRecognizedTagName): Use the
+ macro from htmlnames.h to avoid repeating the list of tags.
+
+ * khtml/ecma/kjs_css.cpp:
+ * khtml/ecma/kjs_dom.cpp:
+ * khtml/ecma/kjs_html.cpp:
+ * khtml/editing/apply_style_command.cpp:
+ * khtml/editing/break_blockquote_command.cpp:
+ * khtml/editing/composite_edit_command.cpp:
+ * khtml/editing/delete_selection_command.cpp:
+ * khtml/editing/htmlediting.cpp:
+ * khtml/editing/insert_line_break_command.cpp:
+ * khtml/editing/insert_paragraph_separator_command.cpp:
+ * khtml/editing/markup.cpp:
+ * khtml/editing/replace_selection_command.cpp:
+ * khtml/editing/visible_position.cpp:
+ * khtml/editing/visible_text.cpp:
+ * khtml/editing/visible_units.cpp:
+ * khtml/html/html_documentimpl.cpp:
+ * khtml/html/html_formimpl.cpp:
+ * khtml/html/html_inlineimpl.cpp:
+ * khtml/html/html_listimpl.cpp:
+ * khtml/html/html_listimpl.h:
+ * khtml/html/html_miscimpl.cpp:
+ * khtml/html/html_objectimpl.cpp:
+ * khtml/html/html_tableimpl.cpp:
+ * khtml/html/htmlfactory.cpp:
+ * khtml/html/htmlparser.cpp:
+ * khtml/html/htmltokenizer.cpp:
+ * khtml/misc/decoder.cpp:
+ * khtml/rendering/render_applet.cpp:
+ * khtml/rendering/render_form.cpp:
+ * khtml/rendering/render_frames.cpp:
+ * khtml/rendering/render_list.cpp:
+ * khtml/rendering/render_table.cpp:
+ * khtml/rendering/render_theme.cpp:
+ * khtml/xml/dom_nodeimpl.cpp:
+ * khtml/xml/dom_position.cpp:
+ * khtml/xml/xml_tokenizer.cpp:
+ * kwq/DOM.mm:
+ * kwq/DOMHTML.mm:
+ * kwq/KWQAccObject.mm:
+ * kwq/KWQKHTMLPart.cpp:
+ * kwq/KWQKHTMLPart.mm:
+ * kwq/WebCoreBridge.mm:
+ Updated "using" because HTMLNames is now inside the DOM namespace.
+
+2005-08-25 Darin Adler <darin at apple.com>
+
Reviewed by Maciej.
- removed WebCore-tests.exp since the tests it supported are now gone
1.336 +1 -1 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- khtml_part.cpp 25 Aug 2005 17:46:55 -0000 1.335
+++ khtml_part.cpp 25 Aug 2005 23:13:40 -0000 1.336
@@ -209,7 +209,7 @@
{
AtomicString::init();
QualifiedName::init();
- HTMLNames::initHTMLNames(); // FIXME: We should make this happen only when HTML is used.
+ HTMLNames::init(); // FIXME: We should make this happen only when HTML is used.
if ( prof == DefaultGUI )
setXMLFile( "khtml.rc" );
else if ( prof == BrowserViewGUI )
1.37 +2 -1 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kjs_css.cpp 25 Aug 2005 17:47:00 -0000 1.36
+++ kjs_css.cpp 25 Aug 2005 23:13:41 -0000 1.37
@@ -35,6 +35,8 @@
#include "kjs_css.lut.h"
+using namespace DOM::HTMLNames;
+
using DOM::CSSCharsetRuleImpl;
using DOM::CSSFontFaceRuleImpl;
using DOM::CSSImportRuleImpl;
@@ -55,7 +57,6 @@
using DOM::DocumentImpl;
using DOM::DOMString;
using DOM::ElementImpl;
-using namespace HTMLNames;
using DOM::HTMLStyleElementImpl;
using DOM::MediaListImpl;
using DOM::RectImpl;
1.91 +2 -1 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kjs_dom.cpp 25 Aug 2005 17:47:00 -0000 1.90
+++ kjs_dom.cpp 25 Aug 2005 23:13:41 -0000 1.91
@@ -51,6 +51,8 @@
#include <JavaScriptCore/runtime_object.h>
#endif
+using namespace DOM::HTMLNames;
+
using DOM::AttrImpl;
using DOM::CharacterDataImpl;
using DOM::DocumentImpl;
@@ -65,7 +67,6 @@
using DOM::HTMLDocumentImpl;
using DOM::HTMLElementImpl;
using DOM::HTMLEmbedElementImpl;
-using namespace HTMLNames;
using DOM::HTMLObjectElementImpl;
using DOM::NamedNodeMapImpl;
using DOM::Node;
1.137 +2 -1 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- kjs_html.cpp 25 Aug 2005 17:47:01 -0000 1.136
+++ kjs_html.cpp 25 Aug 2005 23:13:41 -0000 1.137
@@ -64,6 +64,8 @@
#include <ApplicationServices/ApplicationServices.h>
#endif
+using namespace DOM::HTMLNames;
+
using DOM::DOMString;
using DOM::DocumentImpl;
using DOM::ElementImpl;
@@ -107,7 +109,6 @@
using DOM::HTMLMenuElementImpl;
using DOM::HTMLMetaElementImpl;
using DOM::HTMLModElementImpl;
-using namespace HTMLNames;
using DOM::HTMLOListElementImpl;
using DOM::HTMLObjectElementImpl;
using DOM::HTMLOptGroupElementImpl;
1.11 +2 -1 WebCore/khtml/editing/apply_style_command.cpp
Index: apply_style_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/apply_style_command.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apply_style_command.cpp 25 Aug 2005 17:47:04 -0000 1.10
+++ apply_style_command.cpp 25 Aug 2005 23:13:43 -0000 1.11
@@ -46,6 +46,8 @@
#define ASSERT(assertion) assert(assertion)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::CSSComputedStyleDeclarationImpl;
using DOM::CSSMutableStyleDeclarationImpl;
using DOM::CSSParser;
@@ -65,7 +67,6 @@
using DOM::Position;
using DOM::RangeImpl;
using DOM::TextImpl;
-using namespace HTMLNames;
namespace khtml {
1.5 +2 -1 WebCore/khtml/editing/break_blockquote_command.cpp
Index: break_blockquote_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/break_blockquote_command.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- break_blockquote_command.cpp 30 Jul 2005 02:33:14 -0000 1.4
+++ break_blockquote_command.cpp 25 Aug 2005 23:13:43 -0000 1.5
@@ -38,12 +38,13 @@
#define ASSERT(assertion) assert(assertion)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::DocumentImpl;
using DOM::ElementImpl;
using DOM::NodeImpl;
using DOM::Position;
using DOM::TextImpl;
-using namespace HTMLNames;
namespace khtml {
1.9 +2 -1 WebCore/khtml/editing/composite_edit_command.cpp
Index: composite_edit_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- composite_edit_command.cpp 25 Aug 2005 17:47:05 -0000 1.8
+++ composite_edit_command.cpp 25 Aug 2005 23:13:44 -0000 1.9
@@ -57,6 +57,8 @@
#define ASSERT(assertion) assert(assertion)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::CSSStyleDeclarationImpl;
using DOM::DocumentImpl;
using DOM::DOMString;
@@ -67,7 +69,6 @@
using DOM::RangeImpl;
using DOM::TextImpl;
using DOM::QualifiedName;
-using namespace HTMLNames;
namespace khtml {
1.16 +2 -1 WebCore/khtml/editing/delete_selection_command.cpp
Index: delete_selection_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/delete_selection_command.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- delete_selection_command.cpp 25 Aug 2005 17:47:05 -0000 1.15
+++ delete_selection_command.cpp 25 Aug 2005 23:13:44 -0000 1.16
@@ -46,6 +46,8 @@
#define LOG(channel, formatAndArgs...) ((void)0)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::CSSComputedStyleDeclarationImpl;
using DOM::CSSMutableStyleDeclarationImpl;
using DOM::DOMString;
@@ -54,7 +56,6 @@
using DOM::Position;
using DOM::RangeImpl;
using DOM::TextImpl;
-using namespace HTMLNames;
namespace khtml {
1.257 +2 -1 WebCore/khtml/editing/htmlediting.cpp
Index: htmlediting.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/htmlediting.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- htmlediting.cpp 5 Aug 2005 18:22:42 -0000 1.256
+++ htmlediting.cpp 25 Aug 2005 23:13:44 -0000 1.257
@@ -54,6 +54,8 @@
#include "visible_text.h"
#include "visible_units.h"
+using namespace DOM::HTMLNames;
+
using DOM::AttrImpl;
using DOM::CSSComputedStyleDeclarationImpl;
using DOM::CSSMutableStyleDeclarationImpl;
@@ -80,7 +82,6 @@
using DOM::RangeImpl;
using DOM::TextImpl;
using DOM::TreeWalkerImpl;
-using namespace HTMLNames;
#if APPLE_CHANGES
#include "KWQAssertions.h"
1.5 +2 -1 WebCore/khtml/editing/insert_line_break_command.cpp
Index: insert_line_break_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_line_break_command.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- insert_line_break_command.cpp 30 Jul 2005 02:33:14 -0000 1.4
+++ insert_line_break_command.cpp 25 Aug 2005 23:13:44 -0000 1.5
@@ -44,13 +44,14 @@
#define LOG(channel, formatAndArgs...) ((void)0)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::DocumentImpl;
using DOM::ElementImpl;
using DOM::NodeImpl;
using DOM::Position;
using DOM::TextImpl;
using DOM::CSSMutableStyleDeclarationImpl;
-using namespace HTMLNames;
namespace khtml {
1.5 +2 -1 WebCore/khtml/editing/insert_paragraph_separator_command.cpp
Index: insert_paragraph_separator_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_paragraph_separator_command.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- insert_paragraph_separator_command.cpp 30 Jul 2005 02:33:14 -0000 1.4
+++ insert_paragraph_separator_command.cpp 25 Aug 2005 23:13:45 -0000 1.5
@@ -44,13 +44,14 @@
#define LOG(channel, formatAndArgs...) ((void)0)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::CSSComputedStyleDeclarationImpl;
using DOM::DocumentImpl;
using DOM::ElementImpl;
using DOM::NodeImpl;
using DOM::Position;
using DOM::TextImpl;
-using namespace HTMLNames;
namespace khtml {
1.31 +2 -1 WebCore/khtml/editing/markup.cpp
Index: markup.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- markup.cpp 25 Aug 2005 17:47:05 -0000 1.30
+++ markup.cpp 25 Aug 2005 23:13:45 -0000 1.31
@@ -37,6 +37,8 @@
#include "rendering/render_text.h"
#include "htmlnames.h"
+using namespace DOM::HTMLNames;
+
using DOM::AttributeImpl;
using DOM::CommentImpl;
using DOM::CSSComputedStyleDeclarationImpl;
@@ -53,7 +55,6 @@
using DOM::Position;
using DOM::RangeImpl;
using DOM::TextImpl;
-using namespace HTMLNames;
#if APPLE_CHANGES
#include "KWQAssertions.h"
1.10 +2 -1 WebCore/khtml/editing/replace_selection_command.cpp
Index: replace_selection_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/replace_selection_command.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- replace_selection_command.cpp 30 Jul 2005 02:33:14 -0000 1.9
+++ replace_selection_command.cpp 25 Aug 2005 23:13:45 -0000 1.10
@@ -47,6 +47,8 @@
#define ASSERT(assertion) assert(assertion)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::CSSComputedStyleDeclarationImpl;
using DOM::DocumentImpl;
using DOM::NodeImpl;
@@ -54,7 +56,6 @@
using DOM::ElementImpl;
using DOM::TextImpl;
using DOM::DOMString;
-using namespace HTMLNames;
using DOM::HTMLElementImpl;
using DOM::CSSMutableStyleDeclarationImpl;
using DOM::Position;
1.56 +2 -1 WebCore/khtml/editing/visible_position.cpp
Index: visible_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_position.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- visible_position.cpp 25 Aug 2005 17:47:05 -0000 1.55
+++ visible_position.cpp 25 Aug 2005 23:13:45 -0000 1.56
@@ -42,6 +42,8 @@
#define LOG(channel, formatAndArgs...) ((void)0)
#endif
+using namespace DOM::HTMLNames;
+
using DOM::CharacterDataImpl;
using DOM::NodeImpl;
using DOM::offsetInCharacters;
@@ -50,7 +52,6 @@
using DOM::Range;
using DOM::RangeImpl;
using DOM::TextImpl;
-using namespace HTMLNames;
namespace khtml {
1.35 +2 -1 WebCore/khtml/editing/visible_text.cpp
Index: visible_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_text.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- visible_text.cpp 25 Aug 2005 17:47:05 -0000 1.34
+++ visible_text.cpp 25 Aug 2005 23:13:45 -0000 1.35
@@ -31,13 +31,14 @@
#include "xml/dom_position.h"
#include "xml/dom2_rangeimpl.h"
+using namespace DOM::HTMLNames;
+
using DOM::DocumentImpl;
using DOM::DOMString;
using DOM::Node;
using DOM::NodeImpl;
using DOM::offsetInCharacters;
using DOM::RangeImpl;
-using namespace HTMLNames;
// FIXME: These classes should probably use the render tree and not the DOM tree, since elements could
// be hidden using CSS, or additional generated content could be added. For now, we just make sure
1.38 +2 -1 WebCore/khtml/editing/visible_units.cpp
Index: visible_units.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_units.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- visible_units.cpp 30 Jul 2005 02:33:15 -0000 1.37
+++ visible_units.cpp 25 Aug 2005 23:13:46 -0000 1.38
@@ -36,12 +36,13 @@
#include "xml/dom_docimpl.h"
#include "xml/dom_elementimpl.h"
+using namespace DOM::HTMLNames;
+
using DOM::DocumentImpl;
using DOM::ElementImpl;
using DOM::NodeImpl;
using DOM::Position;
using DOM::RangeImpl;
-using namespace HTMLNames;
namespace khtml {
1.68 +2 -1 WebCore/khtml/html/html_documentimpl.cpp
Index: html_documentimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- html_documentimpl.cpp 25 Aug 2005 17:47:07 -0000 1.67
+++ html_documentimpl.cpp 25 Aug 2005 23:13:48 -0000 1.68
@@ -101,11 +101,12 @@
template class QPtrStack<DOM::NodeImpl>;
-using namespace HTMLNames;
using namespace khtml;
namespace DOM {
+using namespace HTMLNames;
+
HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
: DocumentImpl(_implementation, v)
{
1.98 +2 -103 WebCore/khtml/html/html_elementimpl.cpp
Index: html_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- html_elementimpl.cpp 25 Aug 2005 17:47:07 -0000 1.97
+++ html_elementimpl.cpp 25 Aug 2005 23:13:48 -0000 1.98
@@ -700,110 +700,9 @@
{
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > tagList;
if (tagList.isEmpty()) {
- tagList.insert(aTag.localName().implementation());
- tagList.insert(abbrTag.localName().implementation());
- tagList.insert(acronymTag.localName().implementation());
- tagList.insert(addressTag.localName().implementation());
- tagList.insert(appletTag.localName().implementation());
- tagList.insert(areaTag.localName().implementation());
- tagList.insert(bTag.localName().implementation());
- tagList.insert(baseTag.localName().implementation());
- tagList.insert(basefontTag.localName().implementation());
- tagList.insert(bdoTag.localName().implementation());
- tagList.insert(bigTag.localName().implementation());
- tagList.insert(blockquoteTag.localName().implementation());
- tagList.insert(bodyTag.localName().implementation());
- tagList.insert(brTag.localName().implementation());
- tagList.insert(buttonTag.localName().implementation());
- tagList.insert(canvasTag.localName().implementation());
- tagList.insert(captionTag.localName().implementation());
- tagList.insert(centerTag.localName().implementation());
- tagList.insert(citeTag.localName().implementation());
- tagList.insert(codeTag.localName().implementation());
- tagList.insert(colTag.localName().implementation());
- tagList.insert(colgroupTag.localName().implementation());
- tagList.insert(ddTag.localName().implementation());
- tagList.insert(delTag.localName().implementation());
- tagList.insert(dfnTag.localName().implementation());
- tagList.insert(dirTag.localName().implementation());
- tagList.insert(divTag.localName().implementation());
- tagList.insert(dlTag.localName().implementation());
- tagList.insert(dtTag.localName().implementation());
- tagList.insert(emTag.localName().implementation());
- tagList.insert(embedTag.localName().implementation());
- tagList.insert(fieldsetTag.localName().implementation());
- tagList.insert(fontTag.localName().implementation());
- tagList.insert(formTag.localName().implementation());
- tagList.insert(frameTag.localName().implementation());
- tagList.insert(framesetTag.localName().implementation());
- tagList.insert(headTag.localName().implementation());
- tagList.insert(h1Tag.localName().implementation());
- tagList.insert(h2Tag.localName().implementation());
- tagList.insert(h3Tag.localName().implementation());
- tagList.insert(h4Tag.localName().implementation());
- tagList.insert(h5Tag.localName().implementation());
- tagList.insert(h6Tag.localName().implementation());
- tagList.insert(hrTag.localName().implementation());
- tagList.insert(htmlTag.localName().implementation());
- tagList.insert(iTag.localName().implementation());
- tagList.insert(iframeTag.localName().implementation());
- tagList.insert(imgTag.localName().implementation());
- tagList.insert(inputTag.localName().implementation());
- tagList.insert(insTag.localName().implementation());
- tagList.insert(isindexTag.localName().implementation());
- tagList.insert(kbdTag.localName().implementation());
- tagList.insert(keygenTag.localName().implementation());
- tagList.insert(labelTag.localName().implementation());
- tagList.insert(layerTag.localName().implementation());
- tagList.insert(legendTag.localName().implementation());
- tagList.insert(liTag.localName().implementation());
- tagList.insert(linkTag.localName().implementation());
- tagList.insert(mapTag.localName().implementation());
- tagList.insert(marqueeTag.localName().implementation());
- tagList.insert(menuTag.localName().implementation());
- tagList.insert(metaTag.localName().implementation());
- tagList.insert(nobrTag.localName().implementation());
- tagList.insert(noembedTag.localName().implementation());
- tagList.insert(noframesTag.localName().implementation());
- tagList.insert(nolayerTag.localName().implementation());
- tagList.insert(noscriptTag.localName().implementation());
- tagList.insert(objectTag.localName().implementation());
- tagList.insert(olTag.localName().implementation());
- tagList.insert(optgroupTag.localName().implementation());
- tagList.insert(optionTag.localName().implementation());
- tagList.insert(pTag.localName().implementation());
- tagList.insert(paramTag.localName().implementation());
- tagList.insert(plaintextTag.localName().implementation());
- tagList.insert(preTag.localName().implementation());
- tagList.insert(qTag.localName().implementation());
- tagList.insert(sTag.localName().implementation());
- tagList.insert(sampTag.localName().implementation());
- tagList.insert(scriptTag.localName().implementation());
- tagList.insert(selectTag.localName().implementation());
- tagList.insert(smallTag.localName().implementation());
- tagList.insert(spanTag.localName().implementation());
- tagList.insert(strikeTag.localName().implementation());
- tagList.insert(strongTag.localName().implementation());
- tagList.insert(styleTag.localName().implementation());
- tagList.insert(subTag.localName().implementation());
- tagList.insert(supTag.localName().implementation());
- tagList.insert(tableTag.localName().implementation());
- tagList.insert(tbodyTag.localName().implementation());
- tagList.insert(tdTag.localName().implementation());
- tagList.insert(textareaTag.localName().implementation());
- tagList.insert(tfootTag.localName().implementation());
- tagList.insert(thTag.localName().implementation());
- tagList.insert(theadTag.localName().implementation());
- tagList.insert(titleTag.localName().implementation());
- tagList.insert(trTag.localName().implementation());
- tagList.insert(ttTag.localName().implementation());
- tagList.insert(uTag.localName().implementation());
- tagList.insert(ulTag.localName().implementation());
- tagList.insert(varTag.localName().implementation());
- tagList.insert(wbrTag.localName().implementation());
- tagList.insert(xmpTag.localName().implementation());
+ #define INSERT_TAG(name) tagList.insert(name##Tag.localName().implementation());
+ DOM_HTMLNAMES_FOR_EACH_TAG(INSERT_TAG)
}
-
return tagList.contains(tagName.localName().implementation());
}
1.187 +2 -1 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- html_formimpl.cpp 25 Aug 2005 17:47:08 -0000 1.186
+++ html_formimpl.cpp 25 Aug 2005 23:13:48 -0000 1.187
@@ -63,11 +63,12 @@
#include <assert.h>
-using namespace HTMLNames;
using namespace khtml;
namespace DOM {
+using namespace HTMLNames;
+
struct FormDataListItem {
FormDataListItem(const QCString &data) : m_data(data) { }
FormDataListItem(const QString &path) : m_path(path) { }
1.48 +2 -1 WebCore/khtml/html/html_inlineimpl.cpp
Index: html_inlineimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_inlineimpl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- html_inlineimpl.cpp 25 Aug 2005 17:47:09 -0000 1.47
+++ html_inlineimpl.cpp 25 Aug 2005 23:13:49 -0000 1.48
@@ -39,11 +39,12 @@
#include <kdebug.h>
-using namespace HTMLNames;
using namespace khtml;
namespace DOM {
+using namespace HTMLNames;
+
HTMLAnchorElementImpl::HTMLAnchorElementImpl(DocumentPtr *doc)
: HTMLElementImpl(aTag, doc)
{
1.14 +2 -0 WebCore/khtml/html/html_listimpl.cpp
Index: html_listimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_listimpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- html_listimpl.cpp 30 Jul 2005 02:33:17 -0000 1.13
+++ html_listimpl.cpp 25 Aug 2005 23:13:49 -0000 1.14
@@ -31,6 +31,8 @@
namespace DOM {
+using namespace HTMLNames;
+
bool HTMLUListElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
{
if (attrName == typeAttr) {
1.12 +1 -2 WebCore/khtml/html/html_listimpl.h
Index: html_listimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_listimpl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- html_listimpl.h 30 Jul 2005 02:33:17 -0000 1.11
+++ html_listimpl.h 25 Aug 2005 23:13:49 -0000 1.12
@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*
*/
+
#ifndef HTML_LISTIMPL_H
#define HTML_LISTIMPL_H
@@ -29,8 +30,6 @@
#include "html_elementimpl.h"
-using namespace HTMLNames;
-
namespace DOM
{
1.35 +2 -2 WebCore/khtml/html/html_miscimpl.cpp
Index: html_miscimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- html_miscimpl.cpp 25 Aug 2005 17:47:09 -0000 1.34
+++ html_miscimpl.cpp 25 Aug 2005 23:13:49 -0000 1.35
@@ -31,10 +31,10 @@
#include <kdebug.h>
-using namespace HTMLNames;
-
namespace DOM {
+using namespace HTMLNames;
+
HTMLBaseFontElementImpl::HTMLBaseFontElementImpl(DocumentPtr *doc)
: HTMLElementImpl(basefontTag, doc)
{
1.76 +2 -1 WebCore/khtml/html/html_objectimpl.cpp
Index: html_objectimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- html_objectimpl.cpp 25 Aug 2005 17:47:09 -0000 1.75
+++ html_objectimpl.cpp 25 Aug 2005 23:13:49 -0000 1.76
@@ -51,11 +51,12 @@
#include "KWQKHTMLPart.h"
#endif
-using namespace HTMLNames;
using namespace khtml;
namespace DOM {
+using namespace HTMLNames;
+
// -------------------------------------------------------------------------
HTMLAppletElementImpl::HTMLAppletElementImpl(DocumentPtr *doc)
1.60 +2 -1 WebCore/khtml/html/html_tableimpl.cpp
Index: html_tableimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- html_tableimpl.cpp 25 Aug 2005 17:47:09 -0000 1.59
+++ html_tableimpl.cpp 25 Aug 2005 23:13:49 -0000 1.60
@@ -45,11 +45,12 @@
#include <kdebug.h>
#include <kglobal.h>
-using namespace HTMLNames;
using namespace khtml;
namespace DOM {
+using namespace HTMLNames;
+
HTMLTableElementImpl::HTMLTableElementImpl(DocumentPtr *doc)
: HTMLElementImpl(tableTag, doc)
{
1.4 +2 -0 WebCore/khtml/html/htmlfactory.cpp
Index: htmlfactory.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlfactory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htmlfactory.cpp 30 Jul 2005 02:33:18 -0000 1.3
+++ htmlfactory.cpp 25 Aug 2005 23:13:50 -0000 1.4
@@ -43,6 +43,8 @@
namespace DOM
{
+using namespace HTMLNames;
+
typedef HTMLElementImpl* (*ConstructorFunc)(const AtomicString& tagName, DocumentPtr* docPtr, HTMLFormElementImpl* form, bool createdByParser);
typedef HashMap<DOMStringImpl *, void*, PointerHash<DOMStringImpl *> > FunctionMap;
static FunctionMap* gFunctionMap;
1.7 +27 -575 WebCore/khtml/html/htmlnames.cpp
Index: htmlnames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlnames.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- htmlnames.cpp 30 Jul 2005 02:33:18 -0000 1.6
+++ htmlnames.cpp 25 Aug 2005 23:13:50 -0000 1.7
@@ -20,599 +20,51 @@
*
*/
-#define KHTML_HTMLNAMES_HIDE_GLOBALS 1
+#define DOM_HTMLNAMES_HIDE_GLOBALS 1
#include "htmlnames.h"
-using DOM::AtomicString;
-using DOM::QualifiedName;
-using DOM::nullAtom;
+namespace DOM { namespace HTMLNames {
-namespace HTMLNames {
+// Define a properly-sized array of pointers to avoid static initialization.
+// Use an array of pointers instead of an array of char in case there is some alignment issue.
-void* xhtmlNamespaceURI[(sizeof(AtomicString) + sizeof(void*) - 1) / sizeof(void*)];
+#define DEFINE_UNINITIALIZED_GLOBAL(type, name) void *name[(sizeof(type) + sizeof(void *) - 1) / sizeof(void *)];
-// Define a QualifiedName-sized array of pointers to avoid static initialization.
-// Use an array of pointers instead of an array of char in case there is some alignment issue.
-#define DEFINE_TAG_GLOBAL(name) \
- void* name ## Tag[(sizeof(QualifiedName) + sizeof(void*) - 1) / sizeof(void*)];
+DEFINE_UNINITIALIZED_GLOBAL(AtomicString, xhtmlNamespaceURI)
+
+#define DEFINE_TAG_GLOBAL(name) DEFINE_UNINITIALIZED_GLOBAL(QualifiedName, name##Tag)
+DOM_HTMLNAMES_FOR_EACH_TAG(DEFINE_TAG_GLOBAL)
-DEFINE_TAG_GLOBAL(a)
-DEFINE_TAG_GLOBAL(abbr)
-DEFINE_TAG_GLOBAL(acronym)
-DEFINE_TAG_GLOBAL(address)
-DEFINE_TAG_GLOBAL(applet)
-DEFINE_TAG_GLOBAL(area)
-DEFINE_TAG_GLOBAL(b)
-DEFINE_TAG_GLOBAL(base)
-DEFINE_TAG_GLOBAL(basefont)
-DEFINE_TAG_GLOBAL(bdo)
-DEFINE_TAG_GLOBAL(big)
-DEFINE_TAG_GLOBAL(blockquote)
-DEFINE_TAG_GLOBAL(body)
-DEFINE_TAG_GLOBAL(br)
-DEFINE_TAG_GLOBAL(button)
-DEFINE_TAG_GLOBAL(canvas)
-DEFINE_TAG_GLOBAL(caption)
-DEFINE_TAG_GLOBAL(center)
-DEFINE_TAG_GLOBAL(cite)
-DEFINE_TAG_GLOBAL(code)
-DEFINE_TAG_GLOBAL(col)
-DEFINE_TAG_GLOBAL(colgroup)
-DEFINE_TAG_GLOBAL(dd)
-DEFINE_TAG_GLOBAL(del)
-DEFINE_TAG_GLOBAL(dfn)
-DEFINE_TAG_GLOBAL(dir)
-DEFINE_TAG_GLOBAL(div)
-DEFINE_TAG_GLOBAL(dl)
-DEFINE_TAG_GLOBAL(dt)
-DEFINE_TAG_GLOBAL(em)
-DEFINE_TAG_GLOBAL(embed)
-DEFINE_TAG_GLOBAL(fieldset)
-DEFINE_TAG_GLOBAL(font)
-DEFINE_TAG_GLOBAL(form)
-DEFINE_TAG_GLOBAL(frame)
-DEFINE_TAG_GLOBAL(frameset)
-DEFINE_TAG_GLOBAL(head)
-DEFINE_TAG_GLOBAL(h1)
-DEFINE_TAG_GLOBAL(h2)
-DEFINE_TAG_GLOBAL(h3)
-DEFINE_TAG_GLOBAL(h4)
-DEFINE_TAG_GLOBAL(h5)
-DEFINE_TAG_GLOBAL(h6)
-DEFINE_TAG_GLOBAL(hr)
-DEFINE_TAG_GLOBAL(html)
-DEFINE_TAG_GLOBAL(i)
-DEFINE_TAG_GLOBAL(iframe)
-DEFINE_TAG_GLOBAL(img)
-DEFINE_TAG_GLOBAL(input)
-DEFINE_TAG_GLOBAL(ins)
-DEFINE_TAG_GLOBAL(isindex)
-DEFINE_TAG_GLOBAL(kbd)
-DEFINE_TAG_GLOBAL(keygen)
-DEFINE_TAG_GLOBAL(label)
-DEFINE_TAG_GLOBAL(layer)
-DEFINE_TAG_GLOBAL(legend)
-DEFINE_TAG_GLOBAL(li)
-DEFINE_TAG_GLOBAL(link)
-DEFINE_TAG_GLOBAL(map)
-DEFINE_TAG_GLOBAL(marquee)
-DEFINE_TAG_GLOBAL(menu)
-DEFINE_TAG_GLOBAL(meta)
-DEFINE_TAG_GLOBAL(nobr)
-DEFINE_TAG_GLOBAL(noembed)
-DEFINE_TAG_GLOBAL(noframes)
-DEFINE_TAG_GLOBAL(nolayer)
-DEFINE_TAG_GLOBAL(noscript)
-DEFINE_TAG_GLOBAL(object)
-DEFINE_TAG_GLOBAL(ol)
-DEFINE_TAG_GLOBAL(optgroup)
-DEFINE_TAG_GLOBAL(option)
-DEFINE_TAG_GLOBAL(p)
-DEFINE_TAG_GLOBAL(param)
-DEFINE_TAG_GLOBAL(plaintext)
-DEFINE_TAG_GLOBAL(pre)
-DEFINE_TAG_GLOBAL(q)
-DEFINE_TAG_GLOBAL(s)
-DEFINE_TAG_GLOBAL(samp)
-DEFINE_TAG_GLOBAL(script)
-DEFINE_TAG_GLOBAL(select)
-DEFINE_TAG_GLOBAL(small)
-DEFINE_TAG_GLOBAL(span)
-DEFINE_TAG_GLOBAL(strike)
-DEFINE_TAG_GLOBAL(strong)
-DEFINE_TAG_GLOBAL(style)
-DEFINE_TAG_GLOBAL(sub)
-DEFINE_TAG_GLOBAL(sup)
-DEFINE_TAG_GLOBAL(table)
-DEFINE_TAG_GLOBAL(tbody)
-DEFINE_TAG_GLOBAL(td)
-DEFINE_TAG_GLOBAL(textarea)
-DEFINE_TAG_GLOBAL(tfoot)
-DEFINE_TAG_GLOBAL(th)
-DEFINE_TAG_GLOBAL(thead)
-DEFINE_TAG_GLOBAL(title)
-DEFINE_TAG_GLOBAL(tr)
-DEFINE_TAG_GLOBAL(tt)
-DEFINE_TAG_GLOBAL(u)
-DEFINE_TAG_GLOBAL(ul)
-DEFINE_TAG_GLOBAL(var)
-DEFINE_TAG_GLOBAL(wbr)
-DEFINE_TAG_GLOBAL(xmp)
-
-// Attribute names.
-#define DEFINE_ATTR_GLOBAL(name) \
- void* name ## Attr[(sizeof(QualifiedName) + sizeof(void*) - 1) / sizeof(void*)];
-
-DEFINE_ATTR_GLOBAL(abbr)
-DEFINE_ATTR_GLOBAL(accept_charset)
-DEFINE_ATTR_GLOBAL(accept)
-DEFINE_ATTR_GLOBAL(accesskey)
-DEFINE_ATTR_GLOBAL(action)
-DEFINE_ATTR_GLOBAL(align)
-DEFINE_ATTR_GLOBAL(alink)
-DEFINE_ATTR_GLOBAL(alt)
-DEFINE_ATTR_GLOBAL(archive)
-DEFINE_ATTR_GLOBAL(autocomplete)
-DEFINE_ATTR_GLOBAL(autosave)
-DEFINE_ATTR_GLOBAL(axis)
-DEFINE_ATTR_GLOBAL(background)
-DEFINE_ATTR_GLOBAL(behavior)
-DEFINE_ATTR_GLOBAL(bgcolor)
-DEFINE_ATTR_GLOBAL(bgproperties)
-DEFINE_ATTR_GLOBAL(border)
-DEFINE_ATTR_GLOBAL(bordercolor)
-DEFINE_ATTR_GLOBAL(cellpadding)
-DEFINE_ATTR_GLOBAL(cellspacing)
-DEFINE_ATTR_GLOBAL(char)
-DEFINE_ATTR_GLOBAL(challenge)
-DEFINE_ATTR_GLOBAL(charoff)
-DEFINE_ATTR_GLOBAL(charset)
-DEFINE_ATTR_GLOBAL(checked)
-DEFINE_ATTR_GLOBAL(cellborder)
-DEFINE_ATTR_GLOBAL(cite)
-DEFINE_ATTR_GLOBAL(class)
-DEFINE_ATTR_GLOBAL(classid)
-DEFINE_ATTR_GLOBAL(clear)
-DEFINE_ATTR_GLOBAL(code)
-DEFINE_ATTR_GLOBAL(codebase)
-DEFINE_ATTR_GLOBAL(codetype)
-DEFINE_ATTR_GLOBAL(color)
-DEFINE_ATTR_GLOBAL(cols)
-DEFINE_ATTR_GLOBAL(colspan)
-DEFINE_ATTR_GLOBAL(compact)
-DEFINE_ATTR_GLOBAL(composite)
-DEFINE_ATTR_GLOBAL(content)
-DEFINE_ATTR_GLOBAL(contenteditable)
-DEFINE_ATTR_GLOBAL(coords)
-DEFINE_ATTR_GLOBAL(data)
-DEFINE_ATTR_GLOBAL(datetime)
-DEFINE_ATTR_GLOBAL(declare)
-DEFINE_ATTR_GLOBAL(defer)
-DEFINE_ATTR_GLOBAL(dir)
-DEFINE_ATTR_GLOBAL(direction)
-DEFINE_ATTR_GLOBAL(disabled)
-DEFINE_ATTR_GLOBAL(enctype)
-DEFINE_ATTR_GLOBAL(face)
-DEFINE_ATTR_GLOBAL(for)
-DEFINE_ATTR_GLOBAL(frame)
-DEFINE_ATTR_GLOBAL(frameborder)
-DEFINE_ATTR_GLOBAL(headers)
-DEFINE_ATTR_GLOBAL(height)
-DEFINE_ATTR_GLOBAL(hidden)
-DEFINE_ATTR_GLOBAL(href)
-DEFINE_ATTR_GLOBAL(hreflang)
-DEFINE_ATTR_GLOBAL(hspace)
-DEFINE_ATTR_GLOBAL(http_equiv)
-DEFINE_ATTR_GLOBAL(id)
-DEFINE_ATTR_GLOBAL(incremental)
-DEFINE_ATTR_GLOBAL(ismap)
-DEFINE_ATTR_GLOBAL(keytype)
-DEFINE_ATTR_GLOBAL(label)
-DEFINE_ATTR_GLOBAL(lang)
-DEFINE_ATTR_GLOBAL(language)
-DEFINE_ATTR_GLOBAL(left)
-DEFINE_ATTR_GLOBAL(leftmargin)
-DEFINE_ATTR_GLOBAL(link)
-DEFINE_ATTR_GLOBAL(longdesc)
-DEFINE_ATTR_GLOBAL(loop)
-DEFINE_ATTR_GLOBAL(marginheight)
-DEFINE_ATTR_GLOBAL(marginwidth)
-DEFINE_ATTR_GLOBAL(max)
-DEFINE_ATTR_GLOBAL(maxlength)
-DEFINE_ATTR_GLOBAL(mayscript)
-DEFINE_ATTR_GLOBAL(media)
-DEFINE_ATTR_GLOBAL(method)
-DEFINE_ATTR_GLOBAL(min)
-DEFINE_ATTR_GLOBAL(multiple)
-DEFINE_ATTR_GLOBAL(name)
-DEFINE_ATTR_GLOBAL(nohref)
-DEFINE_ATTR_GLOBAL(noresize)
-DEFINE_ATTR_GLOBAL(noshade)
-DEFINE_ATTR_GLOBAL(nowrap)
-DEFINE_ATTR_GLOBAL(object)
-DEFINE_ATTR_GLOBAL(onabort)
-DEFINE_ATTR_GLOBAL(onbeforecopy)
-DEFINE_ATTR_GLOBAL(onbeforecut)
-DEFINE_ATTR_GLOBAL(onbeforepaste)
-DEFINE_ATTR_GLOBAL(onblur)
-DEFINE_ATTR_GLOBAL(onchange)
-DEFINE_ATTR_GLOBAL(onclick)
-DEFINE_ATTR_GLOBAL(oncontextmenu)
-DEFINE_ATTR_GLOBAL(oncopy)
-DEFINE_ATTR_GLOBAL(oncut)
-DEFINE_ATTR_GLOBAL(ondblclick)
-DEFINE_ATTR_GLOBAL(ondrag)
-DEFINE_ATTR_GLOBAL(ondragend)
-DEFINE_ATTR_GLOBAL(ondragenter)
-DEFINE_ATTR_GLOBAL(ondragleave)
-DEFINE_ATTR_GLOBAL(ondragover)
-DEFINE_ATTR_GLOBAL(ondragstart)
-DEFINE_ATTR_GLOBAL(ondrop)
-DEFINE_ATTR_GLOBAL(onerror)
-DEFINE_ATTR_GLOBAL(onfocus)
-DEFINE_ATTR_GLOBAL(oninput)
-DEFINE_ATTR_GLOBAL(onkeydown)
-DEFINE_ATTR_GLOBAL(onkeypress)
-DEFINE_ATTR_GLOBAL(onkeyup)
-DEFINE_ATTR_GLOBAL(onload)
-DEFINE_ATTR_GLOBAL(onmousedown)
-DEFINE_ATTR_GLOBAL(onmousemove)
-DEFINE_ATTR_GLOBAL(onmouseout)
-DEFINE_ATTR_GLOBAL(onmouseover)
-DEFINE_ATTR_GLOBAL(onmouseup)
-DEFINE_ATTR_GLOBAL(onmousewheel)
-DEFINE_ATTR_GLOBAL(onpaste)
-DEFINE_ATTR_GLOBAL(onreset)
-DEFINE_ATTR_GLOBAL(onresize)
-DEFINE_ATTR_GLOBAL(onscroll)
-DEFINE_ATTR_GLOBAL(onsearch)
-DEFINE_ATTR_GLOBAL(onselect)
-DEFINE_ATTR_GLOBAL(onselectstart)
-DEFINE_ATTR_GLOBAL(onsubmit)
-DEFINE_ATTR_GLOBAL(onunload)
-DEFINE_ATTR_GLOBAL(pagex)
-DEFINE_ATTR_GLOBAL(pagey)
-DEFINE_ATTR_GLOBAL(placeholder)
-DEFINE_ATTR_GLOBAL(plain)
-DEFINE_ATTR_GLOBAL(pluginpage)
-DEFINE_ATTR_GLOBAL(pluginspage)
-DEFINE_ATTR_GLOBAL(pluginurl)
-DEFINE_ATTR_GLOBAL(precision)
-DEFINE_ATTR_GLOBAL(profile)
-DEFINE_ATTR_GLOBAL(prompt)
-DEFINE_ATTR_GLOBAL(readonly)
-DEFINE_ATTR_GLOBAL(rel)
-DEFINE_ATTR_GLOBAL(results)
-DEFINE_ATTR_GLOBAL(rev)
-DEFINE_ATTR_GLOBAL(rows)
-DEFINE_ATTR_GLOBAL(rowspan)
-DEFINE_ATTR_GLOBAL(rules)
-DEFINE_ATTR_GLOBAL(scheme)
-DEFINE_ATTR_GLOBAL(scope)
-DEFINE_ATTR_GLOBAL(scrollamount)
-DEFINE_ATTR_GLOBAL(scrolldelay)
-DEFINE_ATTR_GLOBAL(scrolling)
-DEFINE_ATTR_GLOBAL(selected)
-DEFINE_ATTR_GLOBAL(shape)
-DEFINE_ATTR_GLOBAL(size)
-DEFINE_ATTR_GLOBAL(span)
-DEFINE_ATTR_GLOBAL(src)
-DEFINE_ATTR_GLOBAL(standby)
-DEFINE_ATTR_GLOBAL(start)
-DEFINE_ATTR_GLOBAL(style)
-DEFINE_ATTR_GLOBAL(summary)
-DEFINE_ATTR_GLOBAL(tabindex)
-DEFINE_ATTR_GLOBAL(tableborder)
-DEFINE_ATTR_GLOBAL(target)
-DEFINE_ATTR_GLOBAL(text)
-DEFINE_ATTR_GLOBAL(title)
-DEFINE_ATTR_GLOBAL(top)
-DEFINE_ATTR_GLOBAL(topmargin)
-DEFINE_ATTR_GLOBAL(truespeed)
-DEFINE_ATTR_GLOBAL(type)
-DEFINE_ATTR_GLOBAL(usemap)
-DEFINE_ATTR_GLOBAL(valign)
-DEFINE_ATTR_GLOBAL(value)
-DEFINE_ATTR_GLOBAL(valuetype)
-DEFINE_ATTR_GLOBAL(version)
-DEFINE_ATTR_GLOBAL(vlink)
-DEFINE_ATTR_GLOBAL(vspace)
-DEFINE_ATTR_GLOBAL(width)
-DEFINE_ATTR_GLOBAL(wrap)
+#define DEFINE_ATTR_GLOBAL(name) DEFINE_UNINITIALIZED_GLOBAL(QualifiedName, name##Attr)
+DOM_HTMLNAMES_FOR_EACH_ATTR(DEFINE_ATTR_GLOBAL)
-void initHTMLNames()
+void init()
{
static bool initialized;
if (!initialized) {
// Use placement new to initialize the globals.
AtomicString xhtmlNS("http://www.w3.org/1999/xhtml");
+
+ // Namespace
new (&xhtmlNamespaceURI) AtomicString(xhtmlNS);
- new (&aTag) QualifiedName(nullAtom, "a", xhtmlNS);
- new (&abbrTag) QualifiedName(nullAtom, "abbr", xhtmlNS);
- new (&acronymTag) QualifiedName(nullAtom, "acronym", xhtmlNS);
- new (&addressTag) QualifiedName(nullAtom, "address", xhtmlNS);
- new (&appletTag) QualifiedName(nullAtom, "applet", xhtmlNS);
- new (&areaTag) QualifiedName(nullAtom, "area", xhtmlNS);
- new (&bTag) QualifiedName(nullAtom, "b", xhtmlNS);
- new (&baseTag) QualifiedName(nullAtom, "base", xhtmlNS);
- new (&basefontTag) QualifiedName(nullAtom, "basefont", xhtmlNS);
- new (&bdoTag) QualifiedName(nullAtom, "bdo", xhtmlNS);
- new (&bigTag) QualifiedName(nullAtom, "big", xhtmlNS);
- new (&blockquoteTag) QualifiedName(nullAtom, "blockquote", xhtmlNS);
- new (&bodyTag) QualifiedName(nullAtom, "body", xhtmlNS);
- new (&brTag) QualifiedName(nullAtom, "br", xhtmlNS);
- new (&buttonTag) QualifiedName(nullAtom, "button", xhtmlNS);
- new (&canvasTag) QualifiedName(nullAtom, "canvas", xhtmlNS);
- new (&captionTag) QualifiedName(nullAtom, "caption", xhtmlNS);
- new (¢erTag) QualifiedName(nullAtom, "center", xhtmlNS);
- new (&citeTag) QualifiedName(nullAtom, "cite", xhtmlNS);
- new (&codeTag) QualifiedName(nullAtom, "code", xhtmlNS);
- new (&colTag) QualifiedName(nullAtom, "col", xhtmlNS);
- new (&colgroupTag) QualifiedName(nullAtom, "colgroup", xhtmlNS);
- new (&ddTag) QualifiedName(nullAtom, "dd", xhtmlNS);
- new (&delTag) QualifiedName(nullAtom, "del", xhtmlNS);
- new (&dfnTag) QualifiedName(nullAtom, "dfn", xhtmlNS);
- new (&dirTag) QualifiedName(nullAtom, "dir", xhtmlNS);
- new (&divTag) QualifiedName(nullAtom, "div", xhtmlNS);
- new (&dlTag) QualifiedName(nullAtom, "dl", xhtmlNS);
- new (&dtTag) QualifiedName(nullAtom, "dt", xhtmlNS);
- new (&emTag) QualifiedName(nullAtom, "em", xhtmlNS);
- new (&embedTag) QualifiedName(nullAtom, "embed", xhtmlNS);
- new (&fieldsetTag) QualifiedName(nullAtom, "fieldset", xhtmlNS);
- new (&fontTag) QualifiedName(nullAtom, "font", xhtmlNS);
- new (&formTag) QualifiedName(nullAtom, "form", xhtmlNS);
- new (&frameTag) QualifiedName(nullAtom, "frame", xhtmlNS);
- new (&framesetTag) QualifiedName(nullAtom, "frameset", xhtmlNS);
- new (&headTag) QualifiedName(nullAtom, "head", xhtmlNS);
- new (&h1Tag) QualifiedName(nullAtom, "h1", xhtmlNS);
- new (&h2Tag) QualifiedName(nullAtom, "h2", xhtmlNS);
- new (&h3Tag) QualifiedName(nullAtom, "h3", xhtmlNS);
- new (&h4Tag) QualifiedName(nullAtom, "h4", xhtmlNS);
- new (&h5Tag) QualifiedName(nullAtom, "h5", xhtmlNS);
- new (&h6Tag) QualifiedName(nullAtom, "h6", xhtmlNS);
- new (&hrTag) QualifiedName(nullAtom, "hr", xhtmlNS);
- new (&htmlTag) QualifiedName(nullAtom, "html", xhtmlNS);
- new (&iTag) QualifiedName(nullAtom, "i", xhtmlNS);
- new (&iframeTag) QualifiedName(nullAtom, "iframe", xhtmlNS);
- new (&imgTag) QualifiedName(nullAtom, "img", xhtmlNS);
- new (&inputTag) QualifiedName(nullAtom, "input", xhtmlNS);
- new (&insTag) QualifiedName(nullAtom, "ins", xhtmlNS);
- new (&isindexTag) QualifiedName(nullAtom, "isindex", xhtmlNS);
- new (&kbdTag) QualifiedName(nullAtom, "kbd", xhtmlNS);
- new (&keygenTag) QualifiedName(nullAtom, "keygen", xhtmlNS);
- new (&labelTag) QualifiedName(nullAtom, "label", xhtmlNS);
- new (&layerTag) QualifiedName(nullAtom, "layer", xhtmlNS);
- new (&legendTag) QualifiedName(nullAtom, "legend", xhtmlNS);
- new (&liTag) QualifiedName(nullAtom, "li", xhtmlNS);
- new (&linkTag) QualifiedName(nullAtom, "link", xhtmlNS);
- new (&mapTag) QualifiedName(nullAtom, "map", xhtmlNS);
- new (&marqueeTag) QualifiedName(nullAtom, "marquee", xhtmlNS);
- new (&menuTag) QualifiedName(nullAtom, "menu", xhtmlNS);
- new (&metaTag) QualifiedName(nullAtom, "meta", xhtmlNS);
- new (&nobrTag) QualifiedName(nullAtom, "nobr", xhtmlNS);
- new (&noembedTag) QualifiedName(nullAtom, "noembed", xhtmlNS);
- new (&noframesTag) QualifiedName(nullAtom, "noframes", xhtmlNS);
- new (&nolayerTag) QualifiedName(nullAtom, "nolayer", xhtmlNS);
- new (&noscriptTag) QualifiedName(nullAtom, "noscript", xhtmlNS);
- new (&objectTag) QualifiedName(nullAtom, "object", xhtmlNS);
- new (&olTag) QualifiedName(nullAtom, "ol", xhtmlNS);
- new (&optgroupTag) QualifiedName(nullAtom, "optgroup", xhtmlNS);
- new (&optionTag) QualifiedName(nullAtom, "option", xhtmlNS);
- new (&pTag) QualifiedName(nullAtom, "p", xhtmlNS);
- new (¶mTag) QualifiedName(nullAtom, "param", xhtmlNS);
- new (&plaintextTag) QualifiedName(nullAtom, "plaintext", xhtmlNS);
- new (&preTag) QualifiedName(nullAtom, "pre", xhtmlNS);
- new (&qTag) QualifiedName(nullAtom, "q", xhtmlNS);
- new (&sTag) QualifiedName(nullAtom, "s", xhtmlNS);
- new (&sampTag) QualifiedName(nullAtom, "samp", xhtmlNS);
- new (&scriptTag) QualifiedName(nullAtom, "script", xhtmlNS);
- new (&selectTag) QualifiedName(nullAtom, "select", xhtmlNS);
- new (&smallTag) QualifiedName(nullAtom, "small", xhtmlNS);
- new (&spanTag) QualifiedName(nullAtom, "span", xhtmlNS);
- new (&strikeTag) QualifiedName(nullAtom, "strike", xhtmlNS);
- new (&strongTag) QualifiedName(nullAtom, "strong", xhtmlNS);
- new (&styleTag) QualifiedName(nullAtom, "style", xhtmlNS);
- new (&subTag) QualifiedName(nullAtom, "sub", xhtmlNS);
- new (&supTag) QualifiedName(nullAtom, "sup", xhtmlNS);
- new (&tableTag) QualifiedName(nullAtom, "table", xhtmlNS);
- new (&tbodyTag) QualifiedName(nullAtom, "tbody", xhtmlNS);
- new (&tdTag) QualifiedName(nullAtom, "td", xhtmlNS);
- new (&textareaTag) QualifiedName(nullAtom, "textarea", xhtmlNS);
- new (&tfootTag) QualifiedName(nullAtom, "tfoot", xhtmlNS);
- new (&thTag) QualifiedName(nullAtom, "th", xhtmlNS);
- new (&theadTag) QualifiedName(nullAtom, "thead", xhtmlNS);
- new (&titleTag) QualifiedName(nullAtom, "title", xhtmlNS);
- new (&trTag) QualifiedName(nullAtom, "tr", xhtmlNS);
- new (&ttTag) QualifiedName(nullAtom, "tt", xhtmlNS);
- new (&uTag) QualifiedName(nullAtom, "u", xhtmlNS);
- new (&ulTag) QualifiedName(nullAtom, "ul", xhtmlNS);
- new (&varTag) QualifiedName(nullAtom, "var", xhtmlNS);
- new (&wbrTag) QualifiedName(nullAtom, "wbr", xhtmlNS);
- new (&xmpTag) QualifiedName(nullAtom, "xmp", xhtmlNS);
-
- // Attribute names.
- new (&abbrAttr) QualifiedName(nullAtom, "abbr", nullAtom);
- new (&accept_charsetAttr) QualifiedName(nullAtom, "accept-charset", nullAtom);
- new (&acceptAttr) QualifiedName(nullAtom, "accept", nullAtom);
- new (&accesskeyAttr) QualifiedName(nullAtom, "accesskey", nullAtom);
- new (&actionAttr) QualifiedName(nullAtom, "action", nullAtom);
- new (&alignAttr) QualifiedName(nullAtom, "align", nullAtom);
- new (&alinkAttr) QualifiedName(nullAtom, "alink", nullAtom);
- new (&altAttr) QualifiedName(nullAtom, "alt", nullAtom);
- new (&archiveAttr) QualifiedName(nullAtom, "archive", nullAtom);
- new (&autocompleteAttr) QualifiedName(nullAtom, "autocomplete", nullAtom);
- new (&autosaveAttr) QualifiedName(nullAtom, "autosave", nullAtom);
- new (&axisAttr) QualifiedName(nullAtom, "axis", nullAtom);
- new (&backgroundAttr) QualifiedName(nullAtom, "background", nullAtom);
- new (&behaviorAttr) QualifiedName(nullAtom, "behavior", nullAtom);
- new (&bgcolorAttr) QualifiedName(nullAtom, "bgcolor", nullAtom);
- new (&bgpropertiesAttr) QualifiedName(nullAtom, "bgproperties", nullAtom);
- new (&borderAttr) QualifiedName(nullAtom, "border", nullAtom);
- new (&bordercolorAttr) QualifiedName(nullAtom, "bordercolor", nullAtom);
- new (&cellpaddingAttr) QualifiedName(nullAtom, "cellpadding", nullAtom);
- new (&cellspacingAttr) QualifiedName(nullAtom, "cellspacing", nullAtom);
- new (&charAttr) QualifiedName(nullAtom, "char", nullAtom);
- new (&challengeAttr) QualifiedName(nullAtom, "challenge", nullAtom);
- new (&charoffAttr) QualifiedName(nullAtom, "charoff", nullAtom);
- new (&charsetAttr) QualifiedName(nullAtom, "charset", nullAtom);
- new (&checkedAttr) QualifiedName(nullAtom, "checked", nullAtom);
- new (&cellborderAttr) QualifiedName(nullAtom, "cellborder", nullAtom);
- new (&citeAttr) QualifiedName(nullAtom, "cite", nullAtom);
- new (&classAttr) QualifiedName(nullAtom, "class", nullAtom);
- new (&classidAttr) QualifiedName(nullAtom, "classid", nullAtom);
- new (&clearAttr) QualifiedName(nullAtom, "clear", nullAtom);
- new (&codeAttr) QualifiedName(nullAtom, "code", nullAtom);
- new (&codebaseAttr) QualifiedName(nullAtom, "codebase", nullAtom);
- new (&codetypeAttr) QualifiedName(nullAtom, "codetype", nullAtom);
- new (&colorAttr) QualifiedName(nullAtom, "color", nullAtom);
- new (&colsAttr) QualifiedName(nullAtom, "cols", nullAtom);
- new (&colspanAttr) QualifiedName(nullAtom, "colspan", nullAtom);
- new (&compactAttr) QualifiedName(nullAtom, "compact", nullAtom);
- new (&compositeAttr) QualifiedName(nullAtom, "composite", nullAtom);
- new (&contentAttr) QualifiedName(nullAtom, "content", nullAtom);
- new (&contenteditableAttr) QualifiedName(nullAtom, "contenteditable", nullAtom);
- new (&coordsAttr) QualifiedName(nullAtom, "coords", nullAtom);
- new (&dataAttr) QualifiedName(nullAtom, "data", nullAtom);
- new (&datetimeAttr) QualifiedName(nullAtom, "datetime", nullAtom);
- new (&declareAttr) QualifiedName(nullAtom, "declare", nullAtom);
- new (&deferAttr) QualifiedName(nullAtom, "defer", nullAtom);
- new (&dirAttr) QualifiedName(nullAtom, "dir", nullAtom);
- new (&directionAttr) QualifiedName(nullAtom, "direction", nullAtom);
- new (&disabledAttr) QualifiedName(nullAtom, "disabled", nullAtom);
- new (&enctypeAttr) QualifiedName(nullAtom, "enctype", nullAtom);
- new (&faceAttr) QualifiedName(nullAtom, "face", nullAtom);
- new (&forAttr) QualifiedName(nullAtom, "for", nullAtom);
- new (&frameAttr) QualifiedName(nullAtom, "frame", nullAtom);
- new (&frameborderAttr) QualifiedName(nullAtom, "frameborder", nullAtom);
- new (&headersAttr) QualifiedName(nullAtom, "headers", nullAtom);
- new (&heightAttr) QualifiedName(nullAtom, "height", nullAtom);
- new (&hiddenAttr) QualifiedName(nullAtom, "hidden", nullAtom);
- new (&hrefAttr) QualifiedName(nullAtom, "href", nullAtom);
- new (&hreflangAttr) QualifiedName(nullAtom, "hreflang", nullAtom);
- new (&hspaceAttr) QualifiedName(nullAtom, "hspace", nullAtom);
- new (&http_equivAttr) QualifiedName(nullAtom, "http-equiv", nullAtom);
- new (&idAttr) QualifiedName(nullAtom, "id", nullAtom);
- new (&incrementalAttr) QualifiedName(nullAtom, "incremental", nullAtom);
- new (&ismapAttr) QualifiedName(nullAtom, "ismap", nullAtom);
- new (&keytypeAttr) QualifiedName(nullAtom, "keytype", nullAtom);
- new (&labelAttr) QualifiedName(nullAtom, "label", nullAtom);
- new (&langAttr) QualifiedName(nullAtom, "lang", nullAtom);
- new (&languageAttr) QualifiedName(nullAtom, "language", nullAtom);
- new (&leftAttr) QualifiedName(nullAtom, "left", nullAtom);
- new (&leftmarginAttr) QualifiedName(nullAtom, "leftmargin", nullAtom);
- new (&linkAttr) QualifiedName(nullAtom, "link", nullAtom);
- new (&longdescAttr) QualifiedName(nullAtom, "longdesc", nullAtom);
- new (&loopAttr) QualifiedName(nullAtom, "loop", nullAtom);
- new (&marginheightAttr) QualifiedName(nullAtom, "marginheight", nullAtom);
- new (&marginwidthAttr) QualifiedName(nullAtom, "marginwidth", nullAtom);
- new (&maxAttr) QualifiedName(nullAtom, "max", nullAtom);
- new (&maxlengthAttr) QualifiedName(nullAtom, "maxlength", nullAtom);
- new (&mayscriptAttr) QualifiedName(nullAtom, "mayscript", nullAtom);
- new (&mediaAttr) QualifiedName(nullAtom, "media", nullAtom);
- new (&methodAttr) QualifiedName(nullAtom, "method", nullAtom);
- new (&minAttr) QualifiedName(nullAtom, "min", nullAtom);
- new (&multipleAttr) QualifiedName(nullAtom, "multiple", nullAtom);
- new (&nameAttr) QualifiedName(nullAtom, "name", nullAtom);
- new (&nohrefAttr) QualifiedName(nullAtom, "nohref", nullAtom);
- new (&noresizeAttr) QualifiedName(nullAtom, "noresize", nullAtom);
- new (&noshadeAttr) QualifiedName(nullAtom, "noshade", nullAtom);
- new (&nowrapAttr) QualifiedName(nullAtom, "nowrap", nullAtom);
- new (&objectAttr) QualifiedName(nullAtom, "object", nullAtom);
- new (&onabortAttr) QualifiedName(nullAtom, "onabort", nullAtom);
- new (&onbeforecopyAttr) QualifiedName(nullAtom, "onbeforecopy", nullAtom);
- new (&onbeforecutAttr) QualifiedName(nullAtom, "onbeforecut", nullAtom);
- new (&onbeforepasteAttr) QualifiedName(nullAtom, "onbeforepaste", nullAtom);
- new (&onblurAttr) QualifiedName(nullAtom, "onblur", nullAtom);
- new (&onchangeAttr) QualifiedName(nullAtom, "onchange", nullAtom);
- new (&onclickAttr) QualifiedName(nullAtom, "onclick", nullAtom);
- new (&oncontextmenuAttr) QualifiedName(nullAtom, "oncontextmenu", nullAtom);
- new (&oncopyAttr) QualifiedName(nullAtom, "oncopy", nullAtom);
- new (&oncutAttr) QualifiedName(nullAtom, "oncut", nullAtom);
- new (&ondblclickAttr) QualifiedName(nullAtom, "ondblclick", nullAtom);
- new (&ondragAttr) QualifiedName(nullAtom, "ondrag", nullAtom);
- new (&ondragendAttr) QualifiedName(nullAtom, "ondragend", nullAtom);
- new (&ondragenterAttr) QualifiedName(nullAtom, "ondragenter", nullAtom);
- new (&ondragleaveAttr) QualifiedName(nullAtom, "ondragleave", nullAtom);
- new (&ondragoverAttr) QualifiedName(nullAtom, "ondragover", nullAtom);
- new (&ondragstartAttr) QualifiedName(nullAtom, "ondragstart", nullAtom);
- new (&ondropAttr) QualifiedName(nullAtom, "ondrop", nullAtom);
- new (&onerrorAttr) QualifiedName(nullAtom, "onerror", nullAtom);
- new (&onfocusAttr) QualifiedName(nullAtom, "onfocus", nullAtom);
- new (&oninputAttr) QualifiedName(nullAtom, "oninput", nullAtom);
- new (&onkeydownAttr) QualifiedName(nullAtom, "onkeydown", nullAtom);
- new (&onkeypressAttr) QualifiedName(nullAtom, "onkeypress", nullAtom);
- new (&onkeyupAttr) QualifiedName(nullAtom, "onkeyup", nullAtom);
- new (&onloadAttr) QualifiedName(nullAtom, "onload", nullAtom);
- new (&onmousedownAttr) QualifiedName(nullAtom, "onmousedown", nullAtom);
- new (&onmousemoveAttr) QualifiedName(nullAtom, "onmousemove", nullAtom);
- new (&onmouseoutAttr) QualifiedName(nullAtom, "onmouseout", nullAtom);
- new (&onmouseoverAttr) QualifiedName(nullAtom, "onmouseover", nullAtom);
- new (&onmouseupAttr) QualifiedName(nullAtom, "onmouseup", nullAtom);
- new (&onmousewheelAttr) QualifiedName(nullAtom, "onmousewheel", nullAtom);
- new (&onpasteAttr) QualifiedName(nullAtom, "onpaste", nullAtom);
- new (&onresetAttr) QualifiedName(nullAtom, "onreset", nullAtom);
- new (&onresizeAttr) QualifiedName(nullAtom, "onresize", nullAtom);
- new (&onscrollAttr) QualifiedName(nullAtom, "onscroll", nullAtom);
- new (&onsearchAttr) QualifiedName(nullAtom, "onsearch", nullAtom);
- new (&onselectAttr) QualifiedName(nullAtom, "onselect", nullAtom);
- new (&onselectstartAttr) QualifiedName(nullAtom, "onselectstart", nullAtom);
- new (&onsubmitAttr) QualifiedName(nullAtom, "onsubmit", nullAtom);
- new (&onunloadAttr) QualifiedName(nullAtom, "onunload", nullAtom);
- new (&pagexAttr) QualifiedName(nullAtom, "pagex", nullAtom);
- new (&pageyAttr) QualifiedName(nullAtom, "pagey", nullAtom);
- new (&placeholderAttr) QualifiedName(nullAtom, "placeholder", nullAtom);
- new (&plainAttr) QualifiedName(nullAtom, "plain", nullAtom);
- new (&pluginpageAttr) QualifiedName(nullAtom, "pluginpage", nullAtom);
- new (&pluginspageAttr) QualifiedName(nullAtom, "pluginspage", nullAtom);
- new (&pluginurlAttr) QualifiedName(nullAtom, "pluginurl", nullAtom);
- new (&precisionAttr) QualifiedName(nullAtom, "precision", nullAtom);
- new (&profileAttr) QualifiedName(nullAtom, "profile", nullAtom);
- new (&promptAttr) QualifiedName(nullAtom, "prompt", nullAtom);
- new (&readonlyAttr) QualifiedName(nullAtom, "readonly", nullAtom);
- new (&relAttr) QualifiedName(nullAtom, "rel", nullAtom);
- new (&resultsAttr) QualifiedName(nullAtom, "results", nullAtom);
- new (&revAttr) QualifiedName(nullAtom, "rev", nullAtom);
- new (&rowsAttr) QualifiedName(nullAtom, "rows", nullAtom);
- new (&rowspanAttr) QualifiedName(nullAtom, "rowspan", nullAtom);
- new (&rulesAttr) QualifiedName(nullAtom, "rules", nullAtom);
- new (&schemeAttr) QualifiedName(nullAtom, "scheme", nullAtom);
- new (&scopeAttr) QualifiedName(nullAtom, "scope", nullAtom);
- new (&scrollamountAttr) QualifiedName(nullAtom, "scrollamount", nullAtom);
- new (&scrolldelayAttr) QualifiedName(nullAtom, "scrolldelay", nullAtom);
- new (&scrollingAttr) QualifiedName(nullAtom, "scrolling", nullAtom);
- new (&selectedAttr) QualifiedName(nullAtom, "selected", nullAtom);
- new (&shapeAttr) QualifiedName(nullAtom, "shape", nullAtom);
- new (&sizeAttr) QualifiedName(nullAtom, "size", nullAtom);
- new (&spanAttr) QualifiedName(nullAtom, "span", nullAtom);
- new (&srcAttr) QualifiedName(nullAtom, "src", nullAtom);
- new (&standbyAttr) QualifiedName(nullAtom, "standby", nullAtom);
- new (&startAttr) QualifiedName(nullAtom, "start", nullAtom);
- new (&styleAttr) QualifiedName(nullAtom, "style", nullAtom);
- new (&summaryAttr) QualifiedName(nullAtom, "summary", nullAtom);
- new (&tabindexAttr) QualifiedName(nullAtom, "tabindex", nullAtom);
- new (&tableborderAttr) QualifiedName(nullAtom, "tableborder", nullAtom);
- new (&targetAttr) QualifiedName(nullAtom, "target", nullAtom);
- new (&textAttr) QualifiedName(nullAtom, "text", nullAtom);
- new (&titleAttr) QualifiedName(nullAtom, "title", nullAtom);
- new (&topAttr) QualifiedName(nullAtom, "top", nullAtom);
- new (&topmarginAttr) QualifiedName(nullAtom, "topmargin", nullAtom);
- new (&truespeedAttr) QualifiedName(nullAtom, "truespeed", nullAtom);
- new (&typeAttr) QualifiedName(nullAtom, "type", nullAtom);
- new (&usemapAttr) QualifiedName(nullAtom, "usemap", nullAtom);
- new (&valignAttr) QualifiedName(nullAtom, "valign", nullAtom);
- new (&valueAttr) QualifiedName(nullAtom, "value", nullAtom);
- new (&valuetypeAttr) QualifiedName(nullAtom, "valuetype", nullAtom);
- new (&versionAttr) QualifiedName(nullAtom, "version", nullAtom);
- new (&vlinkAttr) QualifiedName(nullAtom, "vlink", nullAtom);
- new (&vspaceAttr) QualifiedName(nullAtom, "vspace", nullAtom);
- new (&widthAttr) QualifiedName(nullAtom, "width", nullAtom);
- new (&wrapAttr) QualifiedName(nullAtom, "wrap", nullAtom);
+ // Tags
+ #define INITIALIZE_TAG_GLOBAL(name) new (&name##Tag) QualifiedName(nullAtom, #name, xhtmlNS);
+ DOM_HTMLNAMES_FOR_EACH_TAG(INITIALIZE_TAG_GLOBAL)
+
+ // Attributes
+ // Need a little trick to handle accept_charset and http_equiv, which need "_" characters.
+ #define DEFINE_ATTR_STRING(name) const char *name##AttrString = #name;
+ DOM_HTMLNAMES_FOR_EACH_ATTR(DEFINE_ATTR_STRING)
+ accept_charsetAttrString = "accept-charset";
+ http_equivAttrString = "http-equiv";
+ #define INITIALIZE_ATTR_GLOBAL(name) new (&name##Attr) QualifiedName(nullAtom, name##AttrString, nullAtom);
+ DOM_HTMLNAMES_FOR_EACH_ATTR(INITIALIZE_ATTR_GLOBAL)
initialized = true;
}
}
-}
+} }
1.7 +297 -286 WebCore/khtml/html/htmlnames.h
Index: htmlnames.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlnames.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- htmlnames.h 30 Jul 2005 02:33:18 -0000 1.6
+++ htmlnames.h 25 Aug 2005 23:13:50 -0000 1.7
@@ -19,302 +19,313 @@
* Boston, MA 02111-1307, USA.
*
*/
-#ifndef HTMLNAMES_H
-#define HTMLNAMES_H
+#ifndef DOM_HTMLNAMES_H
+#define DOM_HTMLNAMES_H
#include "dom_qname.h"
-namespace HTMLNames {
+namespace DOM { namespace HTMLNames {
-#if !KHTML_HTMLNAMES_HIDE_GLOBALS
+#define DOM_HTMLNAMES_FOR_EACH_TAG(macro) \
+ macro(a) \
+ macro(abbr) \
+ macro(acronym) \
+ macro(address) \
+ macro(applet) \
+ macro(area) \
+ macro(b) \
+ macro(base) \
+ macro(basefont) \
+ macro(bdo) \
+ macro(big) \
+ macro(blockquote) \
+ macro(body) \
+ macro(br) \
+ macro(button) \
+ macro(canvas) \
+ macro(caption) \
+ macro(center) \
+ macro(cite) \
+ macro(code) \
+ macro(col) \
+ macro(colgroup) \
+ macro(dd) \
+ macro(del) \
+ macro(dfn) \
+ macro(dir) \
+ macro(div) \
+ macro(dl) \
+ macro(dt) \
+ macro(em) \
+ macro(embed) \
+ macro(fieldset) \
+ macro(font) \
+ macro(form) \
+ macro(frame) \
+ macro(frameset) \
+ macro(head) \
+ macro(h1) \
+ macro(h2) \
+ macro(h3) \
+ macro(h4) \
+ macro(h5) \
+ macro(h6) \
+ macro(hr) \
+ macro(html) \
+ macro(i) \
+ macro(iframe) \
+ macro(img) \
+ macro(input) \
+ macro(ins) \
+ macro(isindex) \
+ macro(kbd) \
+ macro(keygen) \
+ macro(label) \
+ macro(layer) \
+ macro(legend) \
+ macro(li) \
+ macro(link) \
+ macro(map) \
+ macro(marquee) \
+ macro(menu) \
+ macro(meta) \
+ macro(nobr) \
+ macro(noembed) \
+ macro(noframes) \
+ macro(nolayer) \
+ macro(noscript) \
+ macro(object) \
+ macro(ol) \
+ macro(optgroup) \
+ macro(option) \
+ macro(p) \
+ macro(param) \
+ macro(plaintext) \
+ macro(pre) \
+ macro(q) \
+ macro(s) \
+ macro(samp) \
+ macro(script) \
+ macro(select) \
+ macro(small) \
+ macro(span) \
+ macro(strike) \
+ macro(strong) \
+ macro(style) \
+ macro(sub) \
+ macro(sup) \
+ macro(table) \
+ macro(tbody) \
+ macro(td) \
+ macro(textarea) \
+ macro(tfoot) \
+ macro(th) \
+ macro(thead) \
+ macro(title) \
+ macro(tr) \
+ macro(tt) \
+ macro(u) \
+ macro(ul) \
+ macro(var) \
+ macro(wbr) \
+ macro(xmp) \
+// end of macro
+
+#define DOM_HTMLNAMES_FOR_EACH_ATTR(macro) \
+ macro(abbr) \
+ macro(accept_charset) \
+ macro(accept) \
+ macro(accesskey) \
+ macro(action) \
+ macro(align) \
+ macro(alink) \
+ macro(alt) \
+ macro(archive) \
+ macro(autocomplete) \
+ macro(autosave) \
+ macro(axis) \
+ macro(background) \
+ macro(behavior) \
+ macro(bgcolor) \
+ macro(bgproperties) \
+ macro(border) \
+ macro(bordercolor) \
+ macro(cellpadding) \
+ macro(cellspacing) \
+ macro(char) \
+ macro(challenge) \
+ macro(charoff) \
+ macro(charset) \
+ macro(checked) \
+ macro(cellborder) \
+ macro(cite) \
+ macro(class) \
+ macro(classid) \
+ macro(clear) \
+ macro(code) \
+ macro(codebase) \
+ macro(codetype) \
+ macro(color) \
+ macro(cols) \
+ macro(colspan) \
+ macro(compact) \
+ macro(composite) \
+ macro(content) \
+ macro(contenteditable) \
+ macro(coords) \
+ macro(data) \
+ macro(datetime) \
+ macro(declare) \
+ macro(defer) \
+ macro(dir) \
+ macro(direction) \
+ macro(disabled) \
+ macro(enctype) \
+ macro(face) \
+ macro(for) \
+ macro(frame) \
+ macro(frameborder) \
+ macro(headers) \
+ macro(height) \
+ macro(hidden) \
+ macro(href) \
+ macro(hreflang) \
+ macro(hspace) \
+ macro(http_equiv) \
+ macro(id) \
+ macro(incremental) \
+ macro(ismap) \
+ macro(keytype) \
+ macro(label) \
+ macro(lang) \
+ macro(language) \
+ macro(left) \
+ macro(leftmargin) \
+ macro(link) \
+ macro(longdesc) \
+ macro(loop) \
+ macro(marginheight) \
+ macro(marginwidth) \
+ macro(max) \
+ macro(maxlength) \
+ macro(mayscript) \
+ macro(media) \
+ macro(method) \
+ macro(min) \
+ macro(multiple) \
+ macro(name) \
+ macro(nohref) \
+ macro(noresize) \
+ macro(noshade) \
+ macro(nowrap) \
+ macro(object) \
+ macro(onabort) \
+ macro(onbeforecopy) \
+ macro(onbeforecut) \
+ macro(onbeforepaste) \
+ macro(onblur) \
+ macro(onchange) \
+ macro(onclick) \
+ macro(oncontextmenu) \
+ macro(oncopy) \
+ macro(oncut) \
+ macro(ondblclick) \
+ macro(ondrag) \
+ macro(ondragend) \
+ macro(ondragenter) \
+ macro(ondragleave) \
+ macro(ondragover) \
+ macro(ondragstart) \
+ macro(ondrop) \
+ macro(onerror) \
+ macro(onfocus) \
+ macro(oninput) \
+ macro(onkeydown) \
+ macro(onkeypress) \
+ macro(onkeyup) \
+ macro(onload) \
+ macro(onmousedown) \
+ macro(onmousemove) \
+ macro(onmouseout) \
+ macro(onmouseover) \
+ macro(onmouseup) \
+ macro(onmousewheel) \
+ macro(onpaste) \
+ macro(onreset) \
+ macro(onresize) \
+ macro(onscroll) \
+ macro(onsearch) \
+ macro(onselect) \
+ macro(onselectstart) \
+ macro(onsubmit) \
+ macro(onunload) \
+ macro(pagex) \
+ macro(pagey) \
+ macro(placeholder) \
+ macro(plain) \
+ macro(pluginpage) \
+ macro(pluginspage) \
+ macro(pluginurl) \
+ macro(precision) \
+ macro(profile) \
+ macro(prompt) \
+ macro(readonly) \
+ macro(rel) \
+ macro(results) \
+ macro(rev) \
+ macro(rows) \
+ macro(rowspan) \
+ macro(rules) \
+ macro(scheme) \
+ macro(scope) \
+ macro(scrollamount) \
+ macro(scrolldelay) \
+ macro(scrolling) \
+ macro(selected) \
+ macro(shape) \
+ macro(size) \
+ macro(span) \
+ macro(src) \
+ macro(standby) \
+ macro(start) \
+ macro(style) \
+ macro(summary) \
+ macro(tabindex) \
+ macro(tableborder) \
+ macro(target) \
+ macro(text) \
+ macro(title) \
+ macro(top) \
+ macro(topmargin) \
+ macro(truespeed) \
+ macro(type) \
+ macro(usemap) \
+ macro(valign) \
+ macro(value) \
+ macro(valuetype) \
+ macro(version) \
+ macro(vlink) \
+ macro(vspace) \
+ macro(width) \
+ macro(wrap) \
+// end of macro
+
+#if !DOM_HTMLNAMES_HIDE_GLOBALS
// Namespace
- extern const DOM::AtomicString xhtmlNamespaceURI;
+ extern const AtomicString xhtmlNamespaceURI;
// Tags
- extern const DOM::QualifiedName aTag;
- extern const DOM::QualifiedName abbrTag;
- extern const DOM::QualifiedName acronymTag;
- extern const DOM::QualifiedName addressTag;
- extern const DOM::QualifiedName appletTag;
- extern const DOM::QualifiedName areaTag;
- extern const DOM::QualifiedName bTag;
- extern const DOM::QualifiedName baseTag;
- extern const DOM::QualifiedName basefontTag;
- extern const DOM::QualifiedName bdoTag;
- extern const DOM::QualifiedName bigTag;
- extern const DOM::QualifiedName blockquoteTag;
- extern const DOM::QualifiedName bodyTag;
- extern const DOM::QualifiedName brTag;
- extern const DOM::QualifiedName buttonTag;
- extern const DOM::QualifiedName canvasTag;
- extern const DOM::QualifiedName captionTag;
- extern const DOM::QualifiedName centerTag;
- extern const DOM::QualifiedName citeTag;
- extern const DOM::QualifiedName codeTag;
- extern const DOM::QualifiedName colTag;
- extern const DOM::QualifiedName colgroupTag;
- extern const DOM::QualifiedName ddTag;
- extern const DOM::QualifiedName delTag;
- extern const DOM::QualifiedName dfnTag;
- extern const DOM::QualifiedName dirTag;
- extern const DOM::QualifiedName divTag;
- extern const DOM::QualifiedName dlTag;
- extern const DOM::QualifiedName dtTag;
- extern const DOM::QualifiedName emTag;
- extern const DOM::QualifiedName embedTag;
- extern const DOM::QualifiedName fieldsetTag;
- extern const DOM::QualifiedName fontTag;
- extern const DOM::QualifiedName formTag;
- extern const DOM::QualifiedName frameTag;
- extern const DOM::QualifiedName framesetTag;
- extern const DOM::QualifiedName headTag;
- extern const DOM::QualifiedName h1Tag;
- extern const DOM::QualifiedName h2Tag;
- extern const DOM::QualifiedName h3Tag;
- extern const DOM::QualifiedName h4Tag;
- extern const DOM::QualifiedName h5Tag;
- extern const DOM::QualifiedName h6Tag;
- extern const DOM::QualifiedName hrTag;
- extern const DOM::QualifiedName htmlTag;
- extern const DOM::QualifiedName iTag;
- extern const DOM::QualifiedName iframeTag;
- extern const DOM::QualifiedName imgTag;
- extern const DOM::QualifiedName inputTag;
- extern const DOM::QualifiedName insTag;
- extern const DOM::QualifiedName isindexTag;
- extern const DOM::QualifiedName kbdTag;
- extern const DOM::QualifiedName keygenTag;
- extern const DOM::QualifiedName labelTag;
- extern const DOM::QualifiedName layerTag;
- extern const DOM::QualifiedName legendTag;
- extern const DOM::QualifiedName liTag;
- extern const DOM::QualifiedName linkTag;
- extern const DOM::QualifiedName mapTag;
- extern const DOM::QualifiedName marqueeTag;
- extern const DOM::QualifiedName menuTag;
- extern const DOM::QualifiedName metaTag;
- extern const DOM::QualifiedName nobrTag;
- extern const DOM::QualifiedName noembedTag;
- extern const DOM::QualifiedName noframesTag;
- extern const DOM::QualifiedName nolayerTag;
- extern const DOM::QualifiedName noscriptTag;
- extern const DOM::QualifiedName objectTag;
- extern const DOM::QualifiedName olTag;
- extern const DOM::QualifiedName optgroupTag;
- extern const DOM::QualifiedName optionTag;
- extern const DOM::QualifiedName pTag;
- extern const DOM::QualifiedName paramTag;
- extern const DOM::QualifiedName plaintextTag;
- extern const DOM::QualifiedName preTag;
- extern const DOM::QualifiedName qTag;
- extern const DOM::QualifiedName sTag;
- extern const DOM::QualifiedName sampTag;
- extern const DOM::QualifiedName scriptTag;
- extern const DOM::QualifiedName selectTag;
- extern const DOM::QualifiedName smallTag;
- extern const DOM::QualifiedName spanTag;
- extern const DOM::QualifiedName strikeTag;
- extern const DOM::QualifiedName strongTag;
- extern const DOM::QualifiedName styleTag;
- extern const DOM::QualifiedName subTag;
- extern const DOM::QualifiedName supTag;
- extern const DOM::QualifiedName tableTag;
- extern const DOM::QualifiedName tbodyTag;
- extern const DOM::QualifiedName tdTag;
- extern const DOM::QualifiedName textareaTag;
- extern const DOM::QualifiedName tfootTag;
- extern const DOM::QualifiedName thTag;
- extern const DOM::QualifiedName theadTag;
- extern const DOM::QualifiedName titleTag;
- extern const DOM::QualifiedName trTag;
- extern const DOM::QualifiedName ttTag;
- extern const DOM::QualifiedName uTag;
- extern const DOM::QualifiedName ulTag;
- extern const DOM::QualifiedName varTag;
- extern const DOM::QualifiedName wbrTag;
- extern const DOM::QualifiedName xmpTag;
+ #define DOM_HTMLNAMES_DEFINE_TAG_GLOBAL(name) extern const QualifiedName name##Tag;
+ DOM_HTMLNAMES_FOR_EACH_TAG(DOM_HTMLNAMES_DEFINE_TAG_GLOBAL)
+ #undef DOM_HTMLNAMES_DEFINE_TAG_GLOBAL
// Attributes
- extern const DOM::QualifiedName abbrAttr;
- extern const DOM::QualifiedName accept_charsetAttr;
- extern const DOM::QualifiedName acceptAttr;
- extern const DOM::QualifiedName accesskeyAttr;
- extern const DOM::QualifiedName actionAttr;
- extern const DOM::QualifiedName alignAttr;
- extern const DOM::QualifiedName alinkAttr;
- extern const DOM::QualifiedName altAttr;
- extern const DOM::QualifiedName archiveAttr;
- extern const DOM::QualifiedName autocompleteAttr;
- extern const DOM::QualifiedName autosaveAttr;
- extern const DOM::QualifiedName axisAttr;
- extern const DOM::QualifiedName backgroundAttr;
- extern const DOM::QualifiedName behaviorAttr;
- extern const DOM::QualifiedName bgcolorAttr;
- extern const DOM::QualifiedName bgpropertiesAttr;
- extern const DOM::QualifiedName borderAttr;
- extern const DOM::QualifiedName bordercolorAttr;
- extern const DOM::QualifiedName cellpaddingAttr;
- extern const DOM::QualifiedName cellspacingAttr;
- extern const DOM::QualifiedName charAttr;
- extern const DOM::QualifiedName challengeAttr;
- extern const DOM::QualifiedName charoffAttr;
- extern const DOM::QualifiedName charsetAttr;
- extern const DOM::QualifiedName checkedAttr;
- extern const DOM::QualifiedName cellborderAttr;
- extern const DOM::QualifiedName citeAttr;
- extern const DOM::QualifiedName classAttr;
- extern const DOM::QualifiedName classidAttr;
- extern const DOM::QualifiedName clearAttr;
- extern const DOM::QualifiedName codeAttr;
- extern const DOM::QualifiedName codebaseAttr;
- extern const DOM::QualifiedName codetypeAttr;
- extern const DOM::QualifiedName colorAttr;
- extern const DOM::QualifiedName colsAttr;
- extern const DOM::QualifiedName colspanAttr;
- extern const DOM::QualifiedName compactAttr;
- extern const DOM::QualifiedName compositeAttr;
- extern const DOM::QualifiedName contentAttr;
- extern const DOM::QualifiedName contenteditableAttr;
- extern const DOM::QualifiedName coordsAttr;
- extern const DOM::QualifiedName dataAttr;
- extern const DOM::QualifiedName datetimeAttr;
- extern const DOM::QualifiedName declareAttr;
- extern const DOM::QualifiedName deferAttr;
- extern const DOM::QualifiedName dirAttr;
- extern const DOM::QualifiedName directionAttr;
- extern const DOM::QualifiedName disabledAttr;
- extern const DOM::QualifiedName enctypeAttr;
- extern const DOM::QualifiedName faceAttr;
- extern const DOM::QualifiedName forAttr;
- extern const DOM::QualifiedName frameAttr;
- extern const DOM::QualifiedName frameborderAttr;
- extern const DOM::QualifiedName headersAttr;
- extern const DOM::QualifiedName heightAttr;
- extern const DOM::QualifiedName hiddenAttr;
- extern const DOM::QualifiedName hrefAttr;
- extern const DOM::QualifiedName hreflangAttr;
- extern const DOM::QualifiedName hspaceAttr;
- extern const DOM::QualifiedName http_equivAttr;
- extern const DOM::QualifiedName idAttr;
- extern const DOM::QualifiedName incrementalAttr;
- extern const DOM::QualifiedName ismapAttr;
- extern const DOM::QualifiedName keytypeAttr;
- extern const DOM::QualifiedName labelAttr;
- extern const DOM::QualifiedName langAttr;
- extern const DOM::QualifiedName languageAttr;
- extern const DOM::QualifiedName leftAttr;
- extern const DOM::QualifiedName leftmarginAttr;
- extern const DOM::QualifiedName linkAttr;
- extern const DOM::QualifiedName longdescAttr;
- extern const DOM::QualifiedName loopAttr;
- extern const DOM::QualifiedName marginheightAttr;
- extern const DOM::QualifiedName marginwidthAttr;
- extern const DOM::QualifiedName maxAttr;
- extern const DOM::QualifiedName maxlengthAttr;
- extern const DOM::QualifiedName mayscriptAttr;
- extern const DOM::QualifiedName mediaAttr;
- extern const DOM::QualifiedName methodAttr;
- extern const DOM::QualifiedName minAttr;
- extern const DOM::QualifiedName multipleAttr;
- extern const DOM::QualifiedName nameAttr;
- extern const DOM::QualifiedName nohrefAttr;
- extern const DOM::QualifiedName noresizeAttr;
- extern const DOM::QualifiedName noshadeAttr;
- extern const DOM::QualifiedName nowrapAttr;
- extern const DOM::QualifiedName objectAttr;
- extern const DOM::QualifiedName onabortAttr;
- extern const DOM::QualifiedName onbeforecopyAttr;
- extern const DOM::QualifiedName onbeforecutAttr;
- extern const DOM::QualifiedName onbeforepasteAttr;
- extern const DOM::QualifiedName onblurAttr;
- extern const DOM::QualifiedName onchangeAttr;
- extern const DOM::QualifiedName onclickAttr;
- extern const DOM::QualifiedName oncontextmenuAttr;
- extern const DOM::QualifiedName oncopyAttr;
- extern const DOM::QualifiedName oncutAttr;
- extern const DOM::QualifiedName ondblclickAttr;
- extern const DOM::QualifiedName ondragAttr;
- extern const DOM::QualifiedName ondragendAttr;
- extern const DOM::QualifiedName ondragenterAttr;
- extern const DOM::QualifiedName ondragleaveAttr;
- extern const DOM::QualifiedName ondragoverAttr;
- extern const DOM::QualifiedName ondragstartAttr;
- extern const DOM::QualifiedName ondropAttr;
- extern const DOM::QualifiedName onerrorAttr;
- extern const DOM::QualifiedName onfocusAttr;
- extern const DOM::QualifiedName oninputAttr;
- extern const DOM::QualifiedName onkeydownAttr;
- extern const DOM::QualifiedName onkeypressAttr;
- extern const DOM::QualifiedName onkeyupAttr;
- extern const DOM::QualifiedName onloadAttr;
- extern const DOM::QualifiedName onmousedownAttr;
- extern const DOM::QualifiedName onmousemoveAttr;
- extern const DOM::QualifiedName onmouseoutAttr;
- extern const DOM::QualifiedName onmouseoverAttr;
- extern const DOM::QualifiedName onmouseupAttr;
- extern const DOM::QualifiedName onmousewheelAttr;
- extern const DOM::QualifiedName onpasteAttr;
- extern const DOM::QualifiedName onresetAttr;
- extern const DOM::QualifiedName onresizeAttr;
- extern const DOM::QualifiedName onscrollAttr;
- extern const DOM::QualifiedName onsearchAttr;
- extern const DOM::QualifiedName onselectAttr;
- extern const DOM::QualifiedName onselectstartAttr;
- extern const DOM::QualifiedName onsubmitAttr;
- extern const DOM::QualifiedName onunloadAttr;
- extern const DOM::QualifiedName pagexAttr;
- extern const DOM::QualifiedName pageyAttr;
- extern const DOM::QualifiedName placeholderAttr;
- extern const DOM::QualifiedName plainAttr;
- extern const DOM::QualifiedName pluginpageAttr;
- extern const DOM::QualifiedName pluginspageAttr;
- extern const DOM::QualifiedName pluginurlAttr;
- extern const DOM::QualifiedName precisionAttr;
- extern const DOM::QualifiedName profileAttr;
- extern const DOM::QualifiedName promptAttr;
- extern const DOM::QualifiedName readonlyAttr;
- extern const DOM::QualifiedName relAttr;
- extern const DOM::QualifiedName resultsAttr;
- extern const DOM::QualifiedName revAttr;
- extern const DOM::QualifiedName rowsAttr;
- extern const DOM::QualifiedName rowspanAttr;
- extern const DOM::QualifiedName rulesAttr;
- extern const DOM::QualifiedName schemeAttr;
- extern const DOM::QualifiedName scopeAttr;
- extern const DOM::QualifiedName scrollamountAttr;
- extern const DOM::QualifiedName scrolldelayAttr;
- extern const DOM::QualifiedName scrollingAttr;
- extern const DOM::QualifiedName selectedAttr;
- extern const DOM::QualifiedName shapeAttr;
- extern const DOM::QualifiedName sizeAttr;
- extern const DOM::QualifiedName spanAttr;
- extern const DOM::QualifiedName srcAttr;
- extern const DOM::QualifiedName standbyAttr;
- extern const DOM::QualifiedName startAttr;
- extern const DOM::QualifiedName styleAttr;
- extern const DOM::QualifiedName summaryAttr;
- extern const DOM::QualifiedName tabindexAttr;
- extern const DOM::QualifiedName tableborderAttr;
- extern const DOM::QualifiedName targetAttr;
- extern const DOM::QualifiedName textAttr;
- extern const DOM::QualifiedName titleAttr;
- extern const DOM::QualifiedName topAttr;
- extern const DOM::QualifiedName topmarginAttr;
- extern const DOM::QualifiedName truespeedAttr;
- extern const DOM::QualifiedName typeAttr;
- extern const DOM::QualifiedName usemapAttr;
- extern const DOM::QualifiedName valignAttr;
- extern const DOM::QualifiedName valueAttr;
- extern const DOM::QualifiedName valuetypeAttr;
- extern const DOM::QualifiedName versionAttr;
- extern const DOM::QualifiedName vlinkAttr;
- extern const DOM::QualifiedName vspaceAttr;
- extern const DOM::QualifiedName widthAttr;
- extern const DOM::QualifiedName wrapAttr;
+ #define DOM_HTMLNAMES_DEFINE_ATTR_GLOBAL(name) extern const QualifiedName name##Attr;
+ DOM_HTMLNAMES_FOR_EACH_ATTR(DOM_HTMLNAMES_DEFINE_ATTR_GLOBAL)
+ #undef DOM_HTMLNAMES_DEFINE_ATTR_GLOBAL
#endif
- // Init routine
- void initHTMLNames();
-}
+ void init();
+} }
#endif
1.106 +1 -0 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- htmlparser.cpp 25 Aug 2005 17:47:10 -0000 1.105
+++ htmlparser.cpp 25 Aug 2005 23:13:50 -0000 1.106
@@ -63,6 +63,7 @@
#include <klocale.h>
using namespace DOM;
+using namespace HTMLNames;
using namespace khtml;
//----------------------------------------------------------------------------
1.108 +3 -2 WebCore/khtml/html/htmltokenizer.cpp
Index: htmltokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- htmltokenizer.cpp 25 Aug 2005 17:47:10 -0000 1.107
+++ htmltokenizer.cpp 25 Aug 2005 23:13:50 -0000 1.108
@@ -55,6 +55,8 @@
#include <kdebug.h>
#include <stdlib.h>
+using namespace DOM::HTMLNames;
+
using DOM::AtomicString;
using DOM::AttributeImpl;
using DOM::DOMString;
@@ -64,7 +66,6 @@
using DOM::commentAtom;
using DOM::nullAtom;
using DOM::textAtom;
-using namespace HTMLNames;
using DOM::QualifiedName;
using DOM::MappedAttributeImpl;
using DOM::NamedMappedAttrMapImpl;
@@ -444,7 +445,7 @@
processToken();
// Scripts following a frameset element should not be executed or even loaded in the case of extern scripts.
- bool followingFrameset = (parser->doc()->body() && parser->doc()->body()->hasTagName(HTMLNames::framesetTag));
+ bool followingFrameset = (parser->doc()->body() && parser->doc()->body()->hasTagName(framesetTag));
TokenizerString *savedPrependingSrc = currentPrependingSrc;
TokenizerString prependingSrc;
currentPrependingSrc = &prependingSrc;
1.41 +2 -1 WebCore/khtml/misc/decoder.cpp
Index: decoder.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/decoder.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- decoder.cpp 14 Aug 2005 08:47:13 -0000 1.40
+++ decoder.cpp 25 Aug 2005 23:13:53 -0000 1.41
@@ -40,8 +40,9 @@
#include "htmlnames.h"
+using namespace DOM::HTMLNames;
+
using DOM::AtomicString;
-using namespace HTMLNames;
using DOM::nullAtom;
class KanjiCode
1.35 +1 -1 WebCore/khtml/rendering/render_applet.cpp
Index: render_applet.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_applet.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- render_applet.cpp 25 Aug 2005 17:47:14 -0000 1.34
+++ render_applet.cpp 25 Aug 2005 23:13:53 -0000 1.35
@@ -38,9 +38,9 @@
#include "java/kjavaappletwidget.h"
#include "html/html_objectimpl.h"
-using namespace HTMLNames;
using namespace khtml;
using namespace DOM;
+using namespace HTMLNames;
RenderApplet::RenderApplet(HTMLElementImpl *applet, const QMap<QString, QString> &args )
: RenderWidget(applet)
1.117 +1 -1 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- render_form.cpp 25 Aug 2005 17:47:14 -0000 1.116
+++ render_form.cpp 25 Aug 2005 23:13:53 -0000 1.117
@@ -49,9 +49,9 @@
#include "KWQSlider.h"
#endif
-using namespace HTMLNames;
using namespace khtml;
using namespace DOM;
+using namespace HTMLNames;
RenderFormElement::RenderFormElement(HTMLGenericFormElementImpl *element)
: RenderWidget(element)
1.75 +1 -1 WebCore/khtml/rendering/render_frames.cpp
Index: render_frames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- render_frames.cpp 25 Aug 2005 17:47:15 -0000 1.74
+++ render_frames.cpp 25 Aug 2005 23:13:54 -0000 1.75
@@ -48,9 +48,9 @@
#include <qpainter.h>
#include "qdict.h"
-using namespace HTMLNames;
using namespace khtml;
using namespace DOM;
+using namespace HTMLNames;
RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet)
: RenderContainer(frameSet)
1.68 +3 -2 WebCore/khtml/rendering/render_list.cpp
Index: render_list.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- render_list.cpp 25 Aug 2005 17:47:15 -0000 1.67
+++ render_list.cpp 25 Aug 2005 23:13:54 -0000 1.68
@@ -37,10 +37,11 @@
//#define BOX_DEBUG
-using DOM::DocumentImpl;
-using namespace HTMLNames;
+using namespace DOM::HTMLNames;
using namespace khtml;
+using DOM::DocumentImpl;
+
const int cMarkerPadding = 7;
static QString toRoman( int number, bool upper )
1.131 +1 -1 WebCore/khtml/rendering/render_table.cpp
Index: render_table.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_table.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- render_table.cpp 30 Jul 2005 02:33:23 -0000 1.130
+++ render_table.cpp 25 Aug 2005 23:13:54 -0000 1.131
@@ -44,9 +44,9 @@
#include "khtmlview.h"
-using namespace HTMLNames;
using namespace khtml;
using namespace DOM;
+using namespace HTMLNames;
RenderTable::RenderTable(DOM::NodeImpl* node)
: RenderBlock(node)
1.10 +3 -1 WebCore/khtml/rendering/render_theme.cpp
Index: render_theme.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_theme.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- render_theme.cpp 8 Aug 2005 21:11:59 -0000 1.9
+++ render_theme.cpp 25 Aug 2005 23:13:54 -0000 1.10
@@ -20,11 +20,13 @@
*/
#include "render_theme.h"
+
#include "render_style.h"
#include "htmlnames.h"
#include "html_formimpl.h"
-using namespace HTMLNames;
+using namespace DOM::HTMLNames;
+
using DOM::HTMLInputElementImpl;
// The methods in this file are shared by all themes on every platform.
1.177 +3 -1 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- dom_nodeimpl.cpp 25 Aug 2005 17:47:20 -0000 1.176
+++ dom_nodeimpl.cpp 25 Aug 2005 23:13:55 -0000 1.177
@@ -64,10 +64,12 @@
#define LOG(channel, formatAndArgs...) ((void)0)
#endif
-using namespace HTMLNames;
using namespace khtml;
namespace DOM {
+
+using namespace HTMLNames;
+
/**
* NodeList which lists all Nodes in a document with a given tag name
*/
1.77 +2 -1 WebCore/khtml/xml/dom_position.cpp
Index: dom_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_position.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- dom_position.cpp 25 Aug 2005 17:47:21 -0000 1.76
+++ dom_position.cpp 25 Aug 2005 23:13:56 -0000 1.77
@@ -54,7 +54,6 @@
#define LOG(channel, formatAndArgs...) ((void)0)
#endif
-using namespace HTMLNames;
using khtml::EAffinity;
using khtml::InlineBox;
using khtml::InlineTextBox;
@@ -69,6 +68,8 @@
namespace DOM {
+using namespace HTMLNames;
+
static NodeImpl *nextRenderedEditable(NodeImpl *node)
{
while (1) {
1.40 +2 -1 WebCore/khtml/xml/xml_tokenizer.cpp
Index: xml_tokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xml_tokenizer.cpp 25 Aug 2005 17:47:21 -0000 1.39
+++ xml_tokenizer.cpp 25 Aug 2005 23:13:56 -0000 1.40
@@ -40,6 +40,8 @@
#include <qptrstack.h>
+using namespace DOM::HTMLNames;
+
using DOM::AttributeImpl;
using DOM::NamedAttrMapImpl;
using DOM::DocumentFragmentImpl;
@@ -47,7 +49,6 @@
using DOM::DocumentPtr;
using DOM::DOMString;
using DOM::ElementImpl;
-using namespace HTMLNames;
using DOM::HTMLScriptElementImpl;
using DOM::HTMLTableSectionElementImpl;
using DOM::Node;
1.43 +2 -1 WebCore/kwq/DOM.mm
Index: DOM.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM.mm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- DOM.mm 25 Aug 2005 17:47:24 -0000 1.42
+++ DOM.mm 25 Aug 2005 23:13:57 -0000 1.43
@@ -57,6 +57,8 @@
#import "KWQFoundationExtras.h"
#import "KWQKHTMLPart.h"
+using namespace DOM::HTMLNames;
+
using DOM::AttrImpl;
using DOM::CharacterDataImpl;
using DOM::DocumentFragmentImpl;
@@ -71,7 +73,6 @@
using DOM::EntityImpl;
using DOM::FilterNode;
using DOM::HTMLElementImpl;
-using namespace HTMLNames;
using DOM::NamedNodeMapImpl;
using DOM::Node;
using DOM::NodeFilter;
1.27 +2 -1 WebCore/kwq/DOMHTML.mm
Index: DOMHTML.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMHTML.mm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DOMHTML.mm 14 Aug 2005 08:07:23 -0000 1.26
+++ DOMHTML.mm 25 Aug 2005 23:13:57 -0000 1.27
@@ -48,7 +48,8 @@
#import "KWQAssertions.h"
#import "KWQFoundationExtras.h"
-using namespace HTMLNames;
+using namespace DOM::HTMLNames;
+
using DOM::Document;
using DOM::DocumentFragmentImpl;
using DOM::DOMString;
1.78 +2 -1 WebCore/kwq/KWQAccObject.mm
Index: KWQAccObject.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQAccObject.mm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- KWQAccObject.mm 25 Aug 2005 17:47:24 -0000 1.77
+++ KWQAccObject.mm 25 Aug 2005 23:13:57 -0000 1.78
@@ -66,12 +66,13 @@
#import "qptrstack.h"
#import "DOMInternal.h"
+using namespace DOM::HTMLNames;
+
using DOM::DocumentImpl;
using DOM::DOMString;
using DOM::ElementImpl;
using DOM::HTMLAnchorElementImpl;
using DOM::HTMLAreaElementImpl;
-using namespace HTMLNames;
using DOM::HTMLCollection;
using DOM::HTMLCollectionImpl;
using DOM::HTMLElementImpl;
1.13 +2 -1 WebCore/kwq/KWQKHTMLPart.cpp
Index: KWQKHTMLPart.cpp
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KWQKHTMLPart.cpp 30 Jul 2005 02:33:09 -0000 1.12
+++ KWQKHTMLPart.cpp 25 Aug 2005 23:13:57 -0000 1.13
@@ -30,9 +30,10 @@
#include "htmltokenizer.h"
#include "khtmlpart_p.h"
+using namespace DOM::HTMLNames;
+
using DOM::DocumentImpl;
using DOM::HTMLDocumentImpl;
-using namespace HTMLNames;
using DOM::NodeImpl;
// FIXME: What on earth is this single tiny file with only this method doing here?
1.664 +2 -1 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -r1.663 -r1.664
--- KWQKHTMLPart.mm 25 Aug 2005 17:47:25 -0000 1.663
+++ KWQKHTMLPart.mm 25 Aug 2005 23:13:57 -0000 1.664
@@ -86,6 +86,8 @@
#undef _KWQ_TIMING
+using namespace DOM::HTMLNames;
+
using DOM::AtomicString;
using DOM::ClipboardEventImpl;
using DOM::DocumentFragmentImpl;
@@ -94,7 +96,6 @@
using DOM::DOMString;
using DOM::ElementImpl;
using DOM::EventImpl;
-using namespace HTMLNames;
using DOM::HTMLDocumentImpl;
using DOM::HTMLElementImpl;
using DOM::HTMLFormElementImpl;
1.410 +2 -1 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- WebCoreBridge.mm 25 Aug 2005 17:47:26 -0000 1.409
+++ WebCoreBridge.mm 25 Aug 2005 23:13:58 -0000 1.410
@@ -85,6 +85,8 @@
@class NSView;
+using namespace DOM::HTMLNames;
+
using DOM::AtomicString;
using DOM::CSSStyleDeclarationImpl;
using DOM::DocumentFragmentImpl;
@@ -97,7 +99,6 @@
using DOM::HTMLGenericFormElementImpl;
using DOM::HTMLImageElementImpl;
using DOM::HTMLInputElementImpl;
-using namespace HTMLNames;
using DOM::NodeImpl;
using DOM::Position;
using DOM::RangeImpl;
More information about the webkit-changes
mailing list