[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:17:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1d1ca8e7637d40c72c0af7f47f75d4bab6eb19ff
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 9 23:01:09 2003 +0000
Reviewed by Richard.
- fixed 3500408: Web Kit should pass the MAYSCRIPT attribute from the APPLET tag to the Java plug-in
* khtml/html/html_objectimpl.cpp:
(HTMLAppletElementImpl::parseAttribute): Allow the "mayscript" attribute.
(HTMLAppletElementImpl::createRenderer): Pass the value of the "mayscript" attribute
as an argument named "mayScript".
* khtml/misc/htmlattrs.in: Added "mayscript".
* khtml/misc/htmlattrs.c: Regenerated.
* khtml/misc/htmlattrs.h: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 11f3a99..2e78c80 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-12-09 Darin Adler <darin at apple.com>
+
+ Reviewed by Richard.
+
+ - fixed 3500408: Web Kit should pass the MAYSCRIPT attribute from the APPLET tag to the Java plug-in
+
+ * khtml/html/html_objectimpl.cpp:
+ (HTMLAppletElementImpl::parseAttribute): Allow the "mayscript" attribute.
+ (HTMLAppletElementImpl::createRenderer): Pass the value of the "mayscript" attribute
+ as an argument named "mayScript".
+
+ * khtml/misc/htmlattrs.in: Added "mayscript".
+ * khtml/misc/htmlattrs.c: Regenerated.
+ * khtml/misc/htmlattrs.h: Regenerated.
+
2003-12-09 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index e03b0c7..8ad2817 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -75,13 +75,14 @@ void HTMLAppletElementImpl::parseAttribute(AttributeImpl *attr)
{
switch( attr->id() )
{
- case ATTR_CODEBASE:
+ case ATTR_ALT:
case ATTR_ARCHIVE:
case ATTR_CODE:
- case ATTR_OBJECT:
- case ATTR_ALT:
+ case ATTR_CODEBASE:
case ATTR_ID:
+ case ATTR_MAYSCRIPT:
case ATTR_NAME:
+ case ATTR_OBJECT:
break;
case ATTR_WIDTH:
addCSSLength(CSS_PROP_WIDTH, attr->value());
@@ -125,7 +126,11 @@ RenderObject *HTMLAppletElementImpl::createRenderer(RenderArena *arena, RenderSt
args.insert( "baseURL", getDocument()->baseURL() );
- // Other arguments (from <PARAM> tags are added later.
+ DOMString mayScript = getAttribute(ATTR_MAYSCRIPT);
+ if (!mayScript.isNull())
+ args.insert("mayScript", mayScript.string());
+
+ // Other arguments (from <PARAM> tags) are added later.
return new (getDocument()->renderArena()) RenderApplet(this, args);
}
diff --git a/WebCore/khtml/misc/htmlattrs.c b/WebCore/khtml/misc/htmlattrs.c
index e08c47c..8e1da55 100644
--- a/WebCore/khtml/misc/htmlattrs.c
+++ b/WebCore/khtml/misc/htmlattrs.c
@@ -8,7 +8,7 @@ struct attrs {
const char *name;
int id;
};
-/* maximum key range = 1233, duplicates = 1 */
+/* maximum key range = 1148, duplicates = 1 */
#ifdef __GNUC__
__inline
@@ -22,32 +22,32 @@ hash_attr (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 0, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 45, 175, 10,
- 50, 0, 280, 65, 55, 195, 10, 100, 0, 140,
- 0, 0, 0, 5, 25, 5, 0, 0, 220, 60,
- 80, 45, 0, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236, 1236,
- 1236, 1236, 1236, 1236, 1236, 1236
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 5, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 45, 65, 10,
+ 50, 0, 160, 80, 85, 175, 0, 115, 0, 0,
+ 0, 0, 0, 5, 25, 5, 0, 30, 130, 205,
+ 30, 240, 25, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151,
+ 1151, 1151, 1151, 1151, 1151, 1151
};
register int hval = len;
@@ -97,11 +97,11 @@ findAttr (register const char *str, register unsigned int len)
{
enum
{
- TOTAL_KEYWORDS = 153,
+ TOTAL_KEYWORDS = 154,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 15,
MIN_HASH_VALUE = 3,
- MAX_HASH_VALUE = 1235
+ MAX_HASH_VALUE = 1150
};
static const struct attrs wordlist_attr[] =
@@ -113,151 +113,152 @@ findAttr (register const char *str, register unsigned int len)
{"scope", ATTR_SCOPE},
{"onselect", ATTR_ONSELECT},
{"rel", ATTR_REL},
- {"rules", ATTR_RULES},
+ {"prompt", ATTR_PROMPT},
+ {"text", ATTR_TEXT},
{"onreset", ATTR_ONRESET},
{"color", ATTR_COLOR},
{"src", ATTR_SRC},
{"alt", ATTR_ALT},
- {"type", ATTR_TYPE},
+ {"name", ATTR_NAME},
{"span", ATTR_SPAN},
- {"style", ATTR_STYLE},
- {"enctype", ATTR_ENCTYPE},
{"code", ATTR_CODE},
+ {"rules", ATTR_RULES},
{"colspan", ATTR_COLSPAN},
{"class", ATTR_CLASS},
{"accept", ATTR_ACCEPT},
+ {"compact", ATTR_COMPACT},
{"selected", ATTR_SELECTED},
+ {"onmouseup", ATTR_ONMOUSEUP},
+ {"onmouseout", ATTR_ONMOUSEOUT},
{"start", ATTR_START},
+ {"object", ATTR_OBJECT},
{"onerror", ATTR_ONERROR},
- {"text", ATTR_TEXT},
+ {"oncontextmenu", ATTR_ONCONTEXTMENU},
{"clear", ATTR_CLEAR},
- {"truespeed", ATTR_TRUESPEED},
- {"rows", ATTR_ROWS},
+ {"usemap", ATTR_USEMAP},
+ {"html", ATTR_HTML},
{"coords", ATTR_COORDS},
+ {"autocomplete", ATTR_AUTOCOMPLETE},
{"onload", ATTR_ONLOAD},
+ {"scheme", ATTR_SCHEME},
+ {"label", ATTR_LABEL},
+ {"truespeed", ATTR_TRUESPEED},
+ {"onblur", ATTR_ONBLUR},
+ {"scrollamount", ATTR_SCROLLAMOUNT},
+ {"lang", ATTR_LANG},
{"onunload", ATTR_ONUNLOAD},
+ {"declare", ATTR_DECLARE},
{"shape", ATTR_SHAPE},
- {"codetype", ATTR_CODETYPE},
- {"lang", ATTR_LANG},
+ {"method", ATTR_METHOD},
+ {"onabort", ATTR_ONABORT},
+ {"data", ATTR_DATA},
{"hspace", ATTR_HSPACE},
- {"wrap", ATTR_WRAP},
- {"nowrap", ATTR_NOWRAP},
- {"declare", ATTR_DECLARE},
{"longdesc", ATTR_LONGDESC},
- {"char", ATTR_CHAR},
{"target", ATTR_TARGET},
- {"rowspan", ATTR_ROWSPAN},
- {"data", ATTR_DATA},
- {"charset", ATTR_CHARSET},
- {"onkeyup", ATTR_ONKEYUP},
- {"onmouseup", ATTR_ONMOUSEUP},
- {"onmouseout", ATTR_ONMOUSEOUT},
- {"pagey", ATTR_PAGEY},
- {"noshade", ATTR_NOSHADE},
- {"unknown", ATTR_UNKNOWN},
- {"prompt", ATTR_PROMPT},
- {"readonly", ATTR_READONLY},
- {"onchange", ATTR_ONCHANGE},
- {"challenge", ATTR_CHALLENGE},
- {"headers", ATTR_HEADERS},
- {"name", ATTR_NAME},
- {"onkeypress", ATTR_ONKEYPRESS},
- {"scrolldelay", ATTR_SCROLLDELAY},
+ {"rev", ATTR_REV},
{"pagex", ATTR_PAGEX},
- {"usemap", ATTR_USEMAP},
- {"keytype", ATTR_KEYTYPE},
- {"html", ATTR_HTML},
+ {"left", ATTR_LEFT},
+ {"char", ATTR_CHAR},
+ {"border", ATTR_BORDER},
+ {"onmousemove", ATTR_ONMOUSEMOVE},
+ {"charset", ATTR_CHARSET},
{"title", ATTR_TITLE},
- {"object", ATTR_OBJECT},
- {"size", ATTR_SIZE},
- {"onblur", ATTR_ONBLUR},
- {"autocomplete", ATTR_AUTOCOMPLETE},
+ {"codebase", ATTR_CODEBASE},
+ {"nosave", ATTR_NOSAVE},
+ {"bgcolor", ATTR_BGCOLOR},
+ {"for", ATTR_FOR},
{"cite", ATTR_CITE},
- {"compact", ATTR_COMPACT},
- {"scheme", ATTR_SCHEME},
- {"accept-charset", ATTR_ACCEPT_CHARSET},
- {"label", ATTR_LABEL},
- {"language", ATTR_LANGUAGE},
- {"accesskey", ATTR_ACCESSKEY},
- {"checked", ATTR_CHECKED},
- {"noresize", ATTR_NORESIZE},
- {"onresize", ATTR_ONRESIZE},
- {"scrollamount", ATTR_SCROLLAMOUNT},
- {"oncontextmenu", ATTR_ONCONTEXTMENU},
+ {"noshade", ATTR_NOSHADE},
+ {"vspace", ATTR_VSPACE},
+ {"onmouseover", ATTR_ONMOUSEOVER},
+ {"oversrc", ATTR_OVERSRC},
+ {"abbr", ATTR_ABBR},
+ {"size", ATTR_SIZE},
+ {"value", ATTR_VALUE},
+ {"bordercolor", ATTR_BORDERCOLOR},
+ {"onfocus", ATTR_ONFOCUS},
+ {"multiple", ATTR_MULTIPLE},
+ {"headers", ATTR_HEADERS},
+ {"face", ATTR_FACE},
{"plain", ATTR_PLAIN},
{"id", ATTR_ID},
- {"rev", ATTR_REV},
- {"method", ATTR_METHOD},
- {"onabort", ATTR_ONABORT},
+ {"onchange", ATTR_ONCHANGE},
+ {"challenge", ATTR_CHALLENGE},
+ {"ismap", ATTR_ISMAP},
+ {"frame", ATTR_FRAME},
{"action", ATTR_ACTION},
- {"onkeydown", ATTR_ONKEYDOWN},
- {"onmousedown", ATTR_ONMOUSEDOWN},
- {"value", ATTR_VALUE},
+ {"noresize", ATTR_NORESIZE},
+ {"onresize", ATTR_ONRESIZE},
+ {"rows", ATTR_ROWS},
+ {"defer", ATTR_DEFER},
+ {"type", ATTR_TYPE},
+ {"maxlength", ATTR_MAXLENGTH},
+ {"style", ATTR_STYLE},
{"dir", ATTR_DIR},
- {"nosave", ATTR_NOSAVE},
- {"border", ATTR_BORDER},
- {"bgcolor", ATTR_BGCOLOR},
- {"left", ATTR_LEFT},
- {"vspace", ATTR_VSPACE},
- {"oversrc", ATTR_OVERSRC},
- {"codebase", ATTR_CODEBASE},
- {"pluginurl", ATTR_PLUGINURL},
+ {"accept-charset", ATTR_ACCEPT_CHARSET},
+ {"enctype", ATTR_ENCTYPE},
+ {"axis", ATTR_AXIS},
+ {"href", ATTR_HREF},
+ {"media", ATTR_MEDIA},
+ {"nohref", ATTR_NOHREF},
+ {"checked", ATTR_CHECKED},
+ {"datetime", ATTR_DATETIME},
+ {"wrap", ATTR_WRAP},
+ {"nowrap", ATTR_NOWRAP},
+ {"onsubmit", ATTR_ONSUBMIT},
+ {"rowspan", ATTR_ROWSPAN},
+ {"language", ATTR_LANGUAGE},
+ {"z-index", ATTR_Z_INDEX},
{"link", ATTR_LINK},
- {"onfocus", ATTR_ONFOCUS},
- {"for", ATTR_FOR},
+ {"classid", ATTR_CLASSID},
+ {"onmousedown", ATTR_ONMOUSEDOWN},
{"scrolling", ATTR_SCROLLING},
{"align", ATTR_ALIGN},
- {"classid", ATTR_CLASSID},
- {"valuetype", ATTR_VALUETYPE},
- {"bordercolor", ATTR_BORDERCOLOR},
+ {"codetype", ATTR_CODETYPE},
{"onclick", ATTR_ONCLICK},
- {"standby", ATTR_STANDBY},
- {"axis", ATTR_AXIS},
- {"z-index", ATTR_Z_INDEX},
- {"face", ATTR_FACE},
+ {"topmargin", ATTR_TOPMARGIN},
{"cellspacing", ATTR_CELLSPACING},
- {"multiple", ATTR_MULTIPLE},
{"alink", ATTR_ALINK},
- {"hidden", ATTR_HIDDEN},
- {"defer", ATTR_DEFER},
- {"href", ATTR_HREF},
- {"width", ATTR_WIDTH},
- {"nohref", ATTR_NOHREF},
- {"height", ATTR_HEIGHT},
- {"pluginpage", ATTR_PLUGINPAGE},
- {"pluginspage", ATTR_PLUGINSPAGE},
- {"ismap", ATTR_ISMAP},
- {"maxlength", ATTR_MAXLENGTH},
- {"onmouseover", ATTR_ONMOUSEOVER},
- {"summary", ATTR_SUMMARY},
- {"abbr", ATTR_ABBR},
- {"cellpadding", ATTR_CELLPADDING},
- {"media", ATTR_MEDIA},
- {"datetime", ATTR_DATETIME},
{"version", ATTR_VERSION},
- {"hreflang", ATTR_HREFLANG},
- {"topmargin", ATTR_TOPMARGIN},
- {"background", ATTR_BACKGROUND},
- {"direction", ATTR_DIRECTION},
- {"http-equiv", ATTR_HTTP_EQUIV},
+ {"pluginurl", ATTR_PLUGINURL},
+ {"summary", ATTR_SUMMARY},
+ {"unknown", ATTR_UNKNOWN},
{"contenteditable", ATTR_CONTENTEDITABLE},
- {"frame", ATTR_FRAME},
- {"bgproperties", ATTR_BGPROPERTIES},
+ {"hidden", ATTR_HIDDEN},
{"profile", ATTR_PROFILE},
- {"onmousemove", ATTR_ONMOUSEMOVE},
- {"vlink", ATTR_VLINK},
- {"onsubmit", ATTR_ONSUBMIT},
+ {"readonly", ATTR_READONLY},
+ {"pagey", ATTR_PAGEY},
+ {"tabindex", ATTR_TABINDEX},
+ {"scrolldelay", ATTR_SCROLLDELAY},
+ {"bgproperties", ATTR_BGPROPERTIES},
+ {"onkeyup", ATTR_ONKEYUP},
{"disabled", ATTR_DISABLED},
- {"valign", ATTR_VALIGN},
+ {"onkeypress", ATTR_ONKEYPRESS},
+ {"hreflang", ATTR_HREFLANG},
+ {"frameborder", ATTR_FRAMEBORDER},
+ {"standby", ATTR_STANDBY},
+ {"pluginpage", ATTR_PLUGINPAGE},
+ {"cellpadding", ATTR_CELLPADDING},
+ {"vlink", ATTR_VLINK},
+ {"pluginspage", ATTR_PLUGINSPAGE},
+ {"background", ATTR_BACKGROUND},
+ {"height", ATTR_HEIGHT},
{"ondblclick", ATTR_ONDBLCLICK},
- {"tabindex", ATTR_TABINDEX},
+ {"valign", ATTR_VALIGN},
+ {"accesskey", ATTR_ACCESSKEY},
+ {"http-equiv", ATTR_HTTP_EQUIV},
+ {"direction", ATTR_DIRECTION},
+ {"valuetype", ATTR_VALUETYPE},
{"archive", ATTR_ARCHIVE},
{"charoff", ATTR_CHAROFF},
- {"behavior", ATTR_BEHAVIOR},
{"leftmargin", ATTR_LEFTMARGIN},
- {"frameborder", ATTR_FRAMEBORDER},
- {"marginwidth", ATTR_MARGINWIDTH},
+ {"mayscript", ATTR_MAYSCRIPT},
+ {"width", ATTR_WIDTH},
+ {"behavior", ATTR_BEHAVIOR},
+ {"keytype", ATTR_KEYTYPE},
+ {"onkeydown", ATTR_ONKEYDOWN},
{"marginheight", ATTR_MARGINHEIGHT},
+ {"marginwidth", ATTR_MARGINWIDTH},
{"visibility", ATTR_VISIBILITY}
};
@@ -266,79 +267,70 @@ findAttr (register const char *str, register unsigned int len)
-1, -1, -1, 0, 1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, 2, -1, 3, 4, -1, -1, 5,
- -1, -1, -1, -1, 6, -1, -1, -1,
- -1, -1, -1, 7, -1, 8, -1, -1,
- 9, -1, -1, 10, -1, -1, -1, -1,
- 11, 12, -1, -1, -1, -1, 13, 14,
- -1, -1, -1, -1, -1, -1, 15, -1,
- 16, -1, -1, 17, -1, -1, 18, 19,
- -1, 20, -1, -1, -1, -1, -1, -1,
- 21, -1, 22, -1, 23, 24, -1, -1,
- -1, 25, -1, -1, -1, -1, 26, -1,
- 27, -1, -1, -1, -1, 28, -1, 29,
- -1, -1, -1, -1, -1, -1, 30, -1,
- -1, 31, 32, -1, -1, -1, -1, -1,
- -1, 33, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 34, -1,
- 35, 36, 37, 38, -1, 39, 40, -1,
- 41, -1, -1, 42, -1, -1, -1, -1,
- 43, -1, 44, 45, -1, -1, -1, -1,
- 46, -1, 47, -1, -1, -1, -1, 48,
- -1, -1, -1, 49, -1, 50, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 51,
- 52, -1, -1, 53, -1, 54, 55, 56,
- -1, -1, -1, 57, 58, 59, -1, 60,
- 61, 62, -1, -1, 63, -1, 64, 65,
- -1, 66, -1, -1, 67, -1, -1, -1,
- 68, -1, -1, 69, -1, -1, -1, -1,
- -1, 70, -1, -1, 71, 72, -1, -1,
- 73, -388, -79, -2, -1, 76, -1, -1,
- -1, -1, -1, 77, -1, 78, -1, 79,
- 80, -1, -1, 81, 82, -1, -1, -1,
- 83, -1, -1, -1, -1, -1, -1, -1,
- 84, -1, 85, -1, -1, -1, 86, -1,
- -1, 87, -1, -1, 88, -1, -1, -1,
- -1, 89, 90, -1, 91, -1, 92, -1,
- -1, -1, -1, -1, 93, 94, 95, -1,
- -1, -1, -1, 96, -1, -1, 97, -1,
- -1, -1, -1, -1, 98, 99, 100, -1,
- -1, -1, -1, -1, -1, 101, -1, 102,
- -1, 103, 104, -1, -1, -1, -1, 105,
- -1, 106, -1, -1, 107, -1, -1, -1,
- -1, -1, -1, 108, -1, 109, -1, 110,
- -1, 111, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 112, -1, -1, -1,
- 113, -1, -1, -1, 114, 115, 116, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 117, -1, -1, -1, 118, -1, -1, -1,
- -1, -1, 119, -1, -1, -1, 120, -1,
- -1, -1, 121, -1, -1, -1, -1, -1,
- -1, 122, -1, -1, -1, -1, -1, 123,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 124, -1, 125, -1, -1, -1, -1, -1,
- -1, -1, -1, 126, -1, -1, 127, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 128, -1, -1, -1,
+ -1, -1, -1, -1, 6, -1, -1, 7,
+ -1, -1, 8, -1, -1, 9, -1, -1,
+ 10, -1, -1, 11, -1, -1, -1, -1,
+ 12, 13, -1, -1, -1, -1, 14, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 15, 16, -1, 17, -1, -1, 18, 19,
+ 20, 21, 22, 23, -1, -1, -1, -1,
+ 24, 25, 26, 27, -1, 28, 29, -1,
+ -1, 30, -1, -1, -1, -1, -1, -1,
+ 31, 32, -1, -1, -1, 33, -1, -1,
+ -1, -1, 34, -1, -1, -1, -1, -1,
+ -1, -1, -1, 35, -1, -1, -1, 36,
+ -1, -1, -1, -1, -1, -1, 37, 38,
+ -1, 39, -1, -1, -1, 40, -1, -1,
+ -1, 41, -1, -1, 42, 43, 44, -1,
+ 45, -1, -1, -1, -1, -1, -1, 46,
+ -1, 47, -1, -1, 48, -1, 49, -1,
+ 50, -1, -1, -1, 51, -1, -1, -1,
+ -1, 52, -1, 53, -1, -1, -1, -1,
+ 54, 55, -1, -1, 56, -1, -1, 57,
+ -1, -1, 58, 59, 60, 61, -1, -1,
+ 62, -1, -1, -1, 63, -1, -1, -1,
+ -1, 64, 65, -1, 66, -1, -1, -1,
+ -1, 67, 68, 69, 70, 71, -1, -1,
+ -1, 72, -1, 73, -1, -1, -1, -1,
+ -1, 74, -1, 75, 76, 77, 78, -1,
+ -1, -1, -1, 79, 80, -1, -396, 83,
+ 84, -73, -2, -1, 85, -1, -1, -1,
+ -1, 86, 87, -1, -1, 88, 89, -1,
+ -1, 90, -1, 91, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 129, 130,
- 131, -1, -1, -1, 132, 133, -1, -1,
- -1, -1, 134, -1, -1, -1, -1, 135,
- -1, -1, -1, -1, -1, -1, 136, -1,
- -1, -1, -1, 137, -1, -1, -1, -1,
- -1, -1, -1, -1, 138, -1, -1, -1,
- 139, -1, -1, 140, -1, -1, -1, -1,
- 141, -1, -1, 142, -1, -1, -1, -1,
+ -1, -1, 92, 93, 94, 95, 96, 97,
+ -1, 98, -1, 99, -1, -1, -1, 100,
+ 101, -1, -1, -1, 102, -1, 103, -1,
+ -1, 104, -1, -1, -1, 105, -1, -1,
+ 106, 107, -1, -1, 108, -1, -1, -1,
+ -1, -1, -1, -1, -1, 109, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 143, -1,
- -1, 144, -1, -1, -1, 145, -1, -1,
+ -1, -1, -1, -1, -1, -1, 110, -1,
+ 111, -1, -1, -1, 112, -1, 113, -1,
+ -1, -1, -1, -1, -1, 114, -1, -1,
+ 115, -1, -1, -1, -1, 116, -1, -1,
+ 117, -1, -1, -1, -1, -1, 118, 119,
+ 120, -1, 121, -1, -1, 122, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 123, 124, -1, -1, -1, -1,
+ 125, -1, -1, -1, -1, -1, 126, -1,
+ 127, -1, -1, 128, -1, -1, 129, -1,
+ -1, -1, -1, -1, 130, -1, -1, -1,
+ -1, -1, -1, -1, 131, 132, -1, -1,
+ -1, 133, 134, -1, -1, -1, 135, 136,
+ -1, -1, -1, 137, 138, -1, -1, 139,
+ 140, -1, -1, -1, 141, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 142, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 143, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 144, -1, -1, 145,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 146, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 148, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -347,20 +339,18 @@ findAttr (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 149, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 150, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 146, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 147, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 148, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -368,9 +358,8 @@ findAttr (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 150, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 151, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 151, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -381,6 +370,7 @@ findAttr (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 152, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -417,7 +407,7 @@ findAttr (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 152
+ -1, -1, -1, -1, -1, -1, 153
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -529,6 +519,7 @@ static const char * const attrList[] = {
"MARGINHEIGHT",
"MARGINWIDTH",
"MAXLENGTH",
+ "MAYSCRIPT",
"MEDIA",
"METHOD",
"MULTIPLE",
diff --git a/WebCore/khtml/misc/htmlattrs.h b/WebCore/khtml/misc/htmlattrs.h
index 5b72ab9..54a84cf 100644
--- a/WebCore/khtml/misc/htmlattrs.h
+++ b/WebCore/khtml/misc/htmlattrs.h
@@ -80,88 +80,89 @@ using namespace DOM;
#define ATTR_MARGINHEIGHT 70
#define ATTR_MARGINWIDTH 71
#define ATTR_MAXLENGTH 72
-#define ATTR_MEDIA 73
-#define ATTR_METHOD 74
-#define ATTR_MULTIPLE 75
-#define ATTR_NAME 76
-#define ATTR_NOHREF 77
-#define ATTR_NORESIZE 78
-#define ATTR_NOSAVE 79
-#define ATTR_NOSHADE 80
-#define ATTR_NOWRAP 81
-#define ATTR_OBJECT 82
-#define ATTR_ONABORT 83
-#define ATTR_ONBLUR 84
-#define ATTR_ONCHANGE 85
-#define ATTR_ONCLICK 86
-#define ATTR_ONCONTEXTMENU 87
-#define ATTR_ONDBLCLICK 88
-#define ATTR_ONERROR 89
-#define ATTR_ONFOCUS 90
-#define ATTR_ONKEYDOWN 91
-#define ATTR_ONKEYPRESS 92
-#define ATTR_ONKEYUP 93
-#define ATTR_ONLOAD 94
-#define ATTR_ONMOUSEDOWN 95
-#define ATTR_ONMOUSEMOVE 96
-#define ATTR_ONMOUSEOUT 97
-#define ATTR_ONMOUSEOVER 98
-#define ATTR_ONMOUSEUP 99
-#define ATTR_ONRESET 100
-#define ATTR_ONRESIZE 101
-#define ATTR_ONSELECT 102
-#define ATTR_ONSUBMIT 103
-#define ATTR_ONUNLOAD 104
-#define ATTR_OVERSRC 105
-#define ATTR_PAGEX 106
-#define ATTR_PAGEY 107
-#define ATTR_PLAIN 108
-#define ATTR_PLUGINPAGE 109
-#define ATTR_PLUGINSPAGE 110
-#define ATTR_PLUGINURL 111
-#define ATTR_PROFILE 112
-#define ATTR_PROMPT 113
-#define ATTR_READONLY 114
-#define ATTR_REL 115
-#define ATTR_REV 116
-#define ATTR_ROWS 117
-#define ATTR_ROWSPAN 118
-#define ATTR_RULES 119
-#define ATTR_SCHEME 120
-#define ATTR_SCOPE 121
-#define ATTR_SCROLLAMOUNT 122
-#define ATTR_SCROLLDELAY 123
-#define ATTR_SCROLLING 124
-#define ATTR_SELECTED 125
-#define ATTR_SHAPE 126
-#define ATTR_SIZE 127
-#define ATTR_SPAN 128
-#define ATTR_SRC 129
-#define ATTR_STANDBY 130
-#define ATTR_START 131
-#define ATTR_STYLE 132
-#define ATTR_SUMMARY 133
-#define ATTR_TABINDEX 134
-#define ATTR_TARGET 135
-#define ATTR_TEXT 136
-#define ATTR_TITLE 137
-#define ATTR_TOP 138
-#define ATTR_TOPMARGIN 139
-#define ATTR_TRUESPEED 140
-#define ATTR_TYPE 141
-#define ATTR_UNKNOWN 142
-#define ATTR_USEMAP 143
-#define ATTR_VALIGN 144
-#define ATTR_VALUE 145
-#define ATTR_VALUETYPE 146
-#define ATTR_VERSION 147
-#define ATTR_VISIBILITY 148
-#define ATTR_VLINK 149
-#define ATTR_VSPACE 150
-#define ATTR_WIDTH 151
-#define ATTR_WRAP 152
-#define ATTR_Z_INDEX 153
-#define ATTR_LAST_ATTR 153
+#define ATTR_MAYSCRIPT 73
+#define ATTR_MEDIA 74
+#define ATTR_METHOD 75
+#define ATTR_MULTIPLE 76
+#define ATTR_NAME 77
+#define ATTR_NOHREF 78
+#define ATTR_NORESIZE 79
+#define ATTR_NOSAVE 80
+#define ATTR_NOSHADE 81
+#define ATTR_NOWRAP 82
+#define ATTR_OBJECT 83
+#define ATTR_ONABORT 84
+#define ATTR_ONBLUR 85
+#define ATTR_ONCHANGE 86
+#define ATTR_ONCLICK 87
+#define ATTR_ONCONTEXTMENU 88
+#define ATTR_ONDBLCLICK 89
+#define ATTR_ONERROR 90
+#define ATTR_ONFOCUS 91
+#define ATTR_ONKEYDOWN 92
+#define ATTR_ONKEYPRESS 93
+#define ATTR_ONKEYUP 94
+#define ATTR_ONLOAD 95
+#define ATTR_ONMOUSEDOWN 96
+#define ATTR_ONMOUSEMOVE 97
+#define ATTR_ONMOUSEOUT 98
+#define ATTR_ONMOUSEOVER 99
+#define ATTR_ONMOUSEUP 100
+#define ATTR_ONRESET 101
+#define ATTR_ONRESIZE 102
+#define ATTR_ONSELECT 103
+#define ATTR_ONSUBMIT 104
+#define ATTR_ONUNLOAD 105
+#define ATTR_OVERSRC 106
+#define ATTR_PAGEX 107
+#define ATTR_PAGEY 108
+#define ATTR_PLAIN 109
+#define ATTR_PLUGINPAGE 110
+#define ATTR_PLUGINSPAGE 111
+#define ATTR_PLUGINURL 112
+#define ATTR_PROFILE 113
+#define ATTR_PROMPT 114
+#define ATTR_READONLY 115
+#define ATTR_REL 116
+#define ATTR_REV 117
+#define ATTR_ROWS 118
+#define ATTR_ROWSPAN 119
+#define ATTR_RULES 120
+#define ATTR_SCHEME 121
+#define ATTR_SCOPE 122
+#define ATTR_SCROLLAMOUNT 123
+#define ATTR_SCROLLDELAY 124
+#define ATTR_SCROLLING 125
+#define ATTR_SELECTED 126
+#define ATTR_SHAPE 127
+#define ATTR_SIZE 128
+#define ATTR_SPAN 129
+#define ATTR_SRC 130
+#define ATTR_STANDBY 131
+#define ATTR_START 132
+#define ATTR_STYLE 133
+#define ATTR_SUMMARY 134
+#define ATTR_TABINDEX 135
+#define ATTR_TARGET 136
+#define ATTR_TEXT 137
+#define ATTR_TITLE 138
+#define ATTR_TOP 139
+#define ATTR_TOPMARGIN 140
+#define ATTR_TRUESPEED 141
+#define ATTR_TYPE 142
+#define ATTR_UNKNOWN 143
+#define ATTR_USEMAP 144
+#define ATTR_VALIGN 145
+#define ATTR_VALUE 146
+#define ATTR_VALUETYPE 147
+#define ATTR_VERSION 148
+#define ATTR_VISIBILITY 149
+#define ATTR_VLINK 150
+#define ATTR_VSPACE 151
+#define ATTR_WIDTH 152
+#define ATTR_WRAP 153
+#define ATTR_Z_INDEX 154
+#define ATTR_LAST_ATTR 154
DOMString getAttrName(unsigned short id);
#endif
diff --git a/WebCore/khtml/misc/htmlattrs.in b/WebCore/khtml/misc/htmlattrs.in
index bb9b1b6..4758b9f 100644
--- a/WebCore/khtml/misc/htmlattrs.in
+++ b/WebCore/khtml/misc/htmlattrs.in
@@ -70,6 +70,7 @@ loop
marginheight
marginwidth
maxlength
+mayscript
media
method
multiple
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list