diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp index fb22515f270..1c9a9357485 100644 --- a/mozilla/content/base/src/nsNameSpaceManager.cpp +++ b/mozilla/content/base/src/nsNameSpaceManager.cpp @@ -244,7 +244,7 @@ public: PRUnichar ch; while ((ch = *string++) != 0) { // FYI: hash = hash*37 + ch - ch = nsCRT::ToUpper(ch); + ch = nsCRT::ToLower(ch); hash = ((hash << 5) + (hash << 2) + hash) + ch; } return hash; @@ -261,7 +261,7 @@ public: const nsString* other = ((const NameSpaceURIKey*)aKey)->mString; if (nsnull != mString) { if (nsnull != other) { - return mString->EqualsIgnoreCase(*other); // XXX case sensative? + return mString->EqualsIgnoreCase(*other); // XXX case sensitive? } return PR_FALSE; } diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index b4c99a822d3..3f71887bf00 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -456,9 +456,9 @@ nsGenericHTMLElement::ParseAttributeString(const nsString& aStr, PRInt32& aNameSpaceID) { // XXX need to validate/strip namespace prefix - nsAutoString upper; - aStr.ToUpperCase(upper); - aName = NS_NewAtom(upper); + nsAutoString lower; + aStr.ToLowerCase(lower); + aName = NS_NewAtom(lower); aNameSpaceID = kNameSpaceID_HTML; return NS_OK; diff --git a/mozilla/content/html/content/src/nsHTMLAtoms.cpp b/mozilla/content/html/content/src/nsHTMLAtoms.cpp index 8f3f5465f26..0823ce62bb8 100644 --- a/mozilla/content/html/content/src/nsHTMLAtoms.cpp +++ b/mozilla/content/html/content/src/nsHTMLAtoms.cpp @@ -271,251 +271,251 @@ static nsrefcnt gRefCnt; void nsHTMLAtoms::AddrefAtoms() { if (0 == gRefCnt) { - mozAnonymousBlock = NS_NewAtom(":MOZ-ANONYMOUS-BLOCK"); + mozAnonymousBlock = NS_NewAtom(":-moz-anonymous-block"); _baseHref = NS_NewAtom(NS_HTML_BASE_HREF); _baseTarget = NS_NewAtom(NS_HTML_BASE_TARGET); - a = NS_NewAtom("A"); - abbr = NS_NewAtom("ABBR"); - above = NS_NewAtom("ABOVE"); - accept = NS_NewAtom("ACCEPT"); - acceptcharset = NS_NewAtom("ACCEPTCHARSET"); - accesskey = NS_NewAtom("ACCESSKEY"); - action = NS_NewAtom("ACTION"); - align = NS_NewAtom("ALIGN"); - alink = NS_NewAtom("ALINK"); - alt = NS_NewAtom("ALT"); - applet = NS_NewAtom("APPLET"); - archive = NS_NewAtom("ARCHIVE"); - area = NS_NewAtom("AREA"); - axis = NS_NewAtom("AXIS"); - background = NS_NewAtom("BACKGROUND"); - below = NS_NewAtom("BELOW"); - bgcolor = NS_NewAtom("BGCOLOR"); - body = NS_NewAtom("BODY"); - border = NS_NewAtom("BORDER"); - bordercolor = NS_NewAtom("BORDERCOLOR"); - bottompadding = NS_NewAtom("BOTTOMPADDING"); - br = NS_NewAtom("BR"); - bulletPseudo = NS_NewAtom(":BULLET"); - button = NS_NewAtom("BUTTON"); - buttonContentPseudo = NS_NewAtom(":BUTTON-CONTENT"); - caption = NS_NewAtom("CAPTION"); - cellContentPseudo = NS_NewAtom(":CELL-CONTENT"); - cellpadding = NS_NewAtom("CELLPADDING"); - cellspacing = NS_NewAtom("CELLSPACING"); - ch = NS_NewAtom("CH"); - _char = NS_NewAtom("CHAR"); - charoff = NS_NewAtom("CHAROFF"); - charset = NS_NewAtom("CHARSET"); - checked = NS_NewAtom("CHECKED"); - choff = NS_NewAtom("CHOFF"); - cite = NS_NewAtom("CITE"); - kClass = NS_NewAtom("CLASS"); - classid = NS_NewAtom("CLASSID"); - clear = NS_NewAtom("CLEAR"); - clip = NS_NewAtom("CLIP"); - code = NS_NewAtom("CODE"); - codebase = NS_NewAtom("CODEBASE"); - codetype = NS_NewAtom("CODETYPE"); - color = NS_NewAtom("COLOR"); - col = NS_NewAtom("COL"); - colgroup = NS_NewAtom("COLGROUP"); - cols = NS_NewAtom("COLS"); - colspan = NS_NewAtom("COLSPAN"); - columnPseudo = NS_NewAtom(":BODY-COLUMN"); - commentPseudo = NS_NewAtom(":MOZ-COMMENT"); - compact = NS_NewAtom("COMPACT"); - content = NS_NewAtom("CONTENT"); - coords = NS_NewAtom("COORDS"); - defaultchecked = NS_NewAtom("DEFAULTCHECKED"); - defaultselected = NS_NewAtom("DEFAULTSELECTED"); - defaultvalue = NS_NewAtom("DEFAULTVALUE"); - declare = NS_NewAtom("DECLARE"); - defer = NS_NewAtom("DEFER"); - dir = NS_NewAtom("DIR"); - div = NS_NewAtom("DIV"); - disabled = NS_NewAtom("DISABLED"); - dl = NS_NewAtom("DL"); - dropDownVisible = NS_NewAtom(":DROPDOWN-VISIBLE"); - dropDownHidden = NS_NewAtom(":DROPDOWN-HIDDEN"); - dropDownBtnOut = NS_NewAtom(":DROPDOWN-BTN-OUT"); - dropDownBtnPressed = NS_NewAtom(":DROPDOWN-BTN-PRESSED"); - datetime = NS_NewAtom("DATETIME"); - data = NS_NewAtom("DATA"); - embed = NS_NewAtom("EMBED"); - encoding = NS_NewAtom("ENCODING"); - enctype = NS_NewAtom("ENCTYPE"); - face = NS_NewAtom("FACE"); - fieldset = NS_NewAtom("FIELDSET"); - fieldsetContentPseudo = NS_NewAtom(":FIELDSET-CONTENT"); - firstLetterPseudo = NS_NewAtom(":FIRST-LETTER"); - firstLinePseudo = NS_NewAtom(":FIRST-LINE"); - font = NS_NewAtom("FONT"); - fontWeight = NS_NewAtom("FONT-WEIGHT"); - _for = NS_NewAtom("FOR"); - form = NS_NewAtom("FORM"); - frame = NS_NewAtom("FRAME"); - frameborder = NS_NewAtom("FRAMEBORDER"); - frameset = NS_NewAtom("FRAMESET"); - framesetBlankPseudo = NS_NewAtom(":FRAMESET-BLANK"); - gutter = NS_NewAtom("GUTTER"); - h1 = NS_NewAtom("H1"); - h2 = NS_NewAtom("H2"); - h3 = NS_NewAtom("H3"); - h4 = NS_NewAtom("H4"); - h5 = NS_NewAtom("H5"); - h6 = NS_NewAtom("H6"); - headerContentBase = NS_NewAtom("CONTENT-BASE"); - headerContentLanguage = NS_NewAtom("CONTENT-LANGUAGE"); - headerContentScriptType = NS_NewAtom("CONTENT-SCRIPT-TYPE"); - headerContentStyleType = NS_NewAtom("CONTENT-STYLE-TYPE"); - headerContentType = NS_NewAtom("CONTENT-TYPE"); - headerDefaultStyle = NS_NewAtom("DEFAULT-STYLE"); - headerWindowTarget = NS_NewAtom("WINDOW-TARGET"); - headers = NS_NewAtom("HEADERS"); - height = NS_NewAtom("HEIGHT"); - hidden = NS_NewAtom("HIDDEN"); - horizontalFramesetBorderPseudo = NS_NewAtom(":HFRAMESET-BORDER"); - hr = NS_NewAtom("HR"); - href = NS_NewAtom("HREF"); - hreflang = NS_NewAtom("HREFLANG"); - hspace = NS_NewAtom("HSPACE"); - html = NS_NewAtom("HTML"); - httpEquiv = NS_NewAtom("HTTP-EQUIV"); - ibPseudo = NS_NewAtom(":IB-PSEUDO"); - id = NS_NewAtom("ID"); - iframe = NS_NewAtom("IFRAME"); - img = NS_NewAtom("IMG"); - index = NS_NewAtom("INDEX"); - input = NS_NewAtom("INPUT"); - ismap = NS_NewAtom("ISMAP"); - label = NS_NewAtom("LABEL"); - labelContentPseudo = NS_NewAtom(":LABEL-CONTENT"); - lang = NS_NewAtom("LANG"); - layout = NS_NewAtom("LAYOUT"); - li = NS_NewAtom("LI"); - link = NS_NewAtom("LINK"); - left = NS_NewAtom("LEFT"); - leftpadding = NS_NewAtom("LEFTPADDING"); - legend = NS_NewAtom("LEGEND"); - legendContentPseudo = NS_NewAtom(":LEGEND-CONTENT"); - length = NS_NewAtom("LENGTH"); - lowsrc = NS_NewAtom("LOWSRC"); - marginheight = NS_NewAtom("MARGINHEIGHT"); - marginwidth = NS_NewAtom("MARGINWIDTH"); - maxlength = NS_NewAtom("MAXLENGTH"); - mayscript = NS_NewAtom("MAYSCRIPT"); - media = NS_NewAtom("MEDIA"); - menu = NS_NewAtom("MENU"); - method = NS_NewAtom("METHOD"); - multicol = NS_NewAtom("MULTICOL"); - multiple = NS_NewAtom("MULTIPLE"); - name = NS_NewAtom("NAME"); - nohref = NS_NewAtom("NOHREF"); - noresize = NS_NewAtom("NORESIZE"); - noshade = NS_NewAtom("NOSHADE"); - nowrap = NS_NewAtom("NOWRAP"); - object = NS_NewAtom("OBJECT"); - ol = NS_NewAtom("OL"); - onabort = NS_NewAtom("ONABORT"); - onblur = NS_NewAtom("ONBLUR"); - onchange = NS_NewAtom("ONCHANGE"); - onclick = NS_NewAtom("ONCLICK"); - ondragdrop = NS_NewAtom("ONDBLCLICK"); - ondragdrop = NS_NewAtom("ONDRAGDROP"); - onerror = NS_NewAtom("ONERROR"); - onfocus = NS_NewAtom("ONFOCUS"); - onkeydown = NS_NewAtom("ONKEYDOWN"); - onkeypress = NS_NewAtom("ONKEYPRESS"); - onkeyup = NS_NewAtom("ONKEYUP"); - onload = NS_NewAtom("ONLOAD"); - onmousedown = NS_NewAtom("ONMOUSEDOWN"); - onmousemove = NS_NewAtom("ONMOUSEMOVE"); - onmouseover = NS_NewAtom("ONMOUSEOVER"); - onmouseout = NS_NewAtom("ONMOUSEOUT"); - onmouseup = NS_NewAtom("ONMOUSEUP"); - onpaint = NS_NewAtom("ONPAINT"); - onreset = NS_NewAtom("ONRESET"); - onsubmit = NS_NewAtom("ONSUBMIT"); - onunload = NS_NewAtom("ONUNLOAD"); - overflow = NS_NewAtom("OVERFLOW"); - p = NS_NewAtom("P"); - pagex = NS_NewAtom("PAGEX"); - pagey = NS_NewAtom("PAGEY"); - param = NS_NewAtom("PARAM"); - placeholderPseudo = NS_NewAtom(":PLACEHOLDER-FRAME"); - pointSize = NS_NewAtom("POINT-SIZE"); - pre = NS_NewAtom("PRE"); - profile = NS_NewAtom("PROFILE"); - prompt = NS_NewAtom("PROMPT"); - readonly = NS_NewAtom("READONLY"); - rel = NS_NewAtom("REL"); - repeat = NS_NewAtom("REPEAT"); - rev = NS_NewAtom("REV"); - rightpadding = NS_NewAtom("RIGHTPADDING"); - rootPseudo = NS_NewAtom(":ROOT"); - rows = NS_NewAtom("ROWS"); - rowspan = NS_NewAtom("ROWSPAN"); - rules = NS_NewAtom("RULES"); - scheme = NS_NewAtom("SCHEME"); - scope = NS_NewAtom("SCOPE"); - script = NS_NewAtom("SCRIPT"); - scrolledContentPseudo = NS_NewAtom(":SCROLLED-CONTENT"); - scrolling = NS_NewAtom("SCROLLING"); - select = NS_NewAtom("SELECT"); - selected = NS_NewAtom("SELECTED"); - selectedindex = NS_NewAtom("SELECTEDINDEX"); - shape = NS_NewAtom("SHAPE"); - size = NS_NewAtom("SIZE"); - spacer = NS_NewAtom("SPACER"); - span = NS_NewAtom("SPAN"); - src = NS_NewAtom("SRC"); - standby = NS_NewAtom("STANDBY"); - start = NS_NewAtom("START"); - style = NS_NewAtom("STYLE"); - summary = NS_NewAtom("SUMMARY"); - suppress = NS_NewAtom("SUPPRESS"); - tabindex = NS_NewAtom("TABINDEX"); - table = NS_NewAtom("TABLE"); - tablePseudo = NS_NewAtom(":TABLE"); - tableCellPseudo = NS_NewAtom(":TABLE-CELL"); - tableColGroupPseudo = NS_NewAtom(":TABLE-COLUMN-GROUP"); - tableColPseudo = NS_NewAtom(":TABLE-COLUMN"); - tableOuterPseudo = NS_NewAtom(":TABLE-OUTER"); - tableRowGroupPseudo = NS_NewAtom(":TABLE-ROW-GROUP"); - tableRowPseudo = NS_NewAtom(":TABLE-ROW"); - tabstop = NS_NewAtom("TABSTOP"); - target = NS_NewAtom("TARGET"); - tbody = NS_NewAtom("TBODY"); - td = NS_NewAtom("TD"); - tfoot = NS_NewAtom("TFOOT"); - thead = NS_NewAtom("THEAD"); - text = NS_NewAtom("TEXT"); - textarea = NS_NewAtom("TEXTAREA"); - textPseudo = NS_NewAtom(":MOZ-TEXT"); - th = NS_NewAtom("TH"); - title = NS_NewAtom("TITLE"); - top = NS_NewAtom("TOP"); - toppadding = NS_NewAtom("TOPPADDING"); - tr = NS_NewAtom("TR"); - type = NS_NewAtom("TYPE"); - ul = NS_NewAtom("UL"); - usemap = NS_NewAtom("USEMAP"); - valign = NS_NewAtom("VALIGN"); - value = NS_NewAtom("VALUE"); - valuetype = NS_NewAtom("VALUETYPE"); - variable = NS_NewAtom("VARIABLE"); - version = NS_NewAtom("VERSION"); - verticalFramesetBorderPseudo = NS_NewAtom(":VFRAMESET-BORDER"); - visibility = NS_NewAtom("VISIBILITY"); - vlink = NS_NewAtom("VLINK"); - vspace = NS_NewAtom("VSPACE"); - wbr = NS_NewAtom("WBR"); - width = NS_NewAtom("WIDTH"); - wrap = NS_NewAtom("WRAP"); - wrappedFramePseudo = NS_NewAtom(":WRAPPED-FRAME"); - zindex = NS_NewAtom("ZINDEX"); + a = NS_NewAtom("a"); + abbr = NS_NewAtom("abbr"); + above = NS_NewAtom("above"); + accept = NS_NewAtom("accept"); + acceptcharset = NS_NewAtom("acceptcharset"); + accesskey = NS_NewAtom("accesskey"); + action = NS_NewAtom("action"); + align = NS_NewAtom("align"); + alink = NS_NewAtom("alink"); + alt = NS_NewAtom("alt"); + applet = NS_NewAtom("applet"); + archive = NS_NewAtom("archive"); + area = NS_NewAtom("area"); + axis = NS_NewAtom("axis"); + background = NS_NewAtom("background"); + below = NS_NewAtom("below"); + bgcolor = NS_NewAtom("bgcolor"); + body = NS_NewAtom("body"); + border = NS_NewAtom("border"); + bordercolor = NS_NewAtom("bordercolor"); + bottompadding = NS_NewAtom("bottompadding"); + br = NS_NewAtom("br"); + bulletPseudo = NS_NewAtom(":bullet"); + button = NS_NewAtom("button"); + buttonContentPseudo = NS_NewAtom(":button-content"); + caption = NS_NewAtom("caption"); + cellContentPseudo = NS_NewAtom(":cell-content"); + cellpadding = NS_NewAtom("cellpadding"); + cellspacing = NS_NewAtom("cellspacing"); + ch = NS_NewAtom("ch"); + _char = NS_NewAtom("char"); + charoff = NS_NewAtom("charoff"); + charset = NS_NewAtom("charset"); + checked = NS_NewAtom("checked"); + choff = NS_NewAtom("choff"); + cite = NS_NewAtom("cite"); + kClass = NS_NewAtom("class"); + classid = NS_NewAtom("classid"); + clear = NS_NewAtom("clear"); + clip = NS_NewAtom("clip"); + code = NS_NewAtom("code"); + codebase = NS_NewAtom("codebase"); + codetype = NS_NewAtom("codetype"); + color = NS_NewAtom("color"); + col = NS_NewAtom("col"); + colgroup = NS_NewAtom("colgroup"); + cols = NS_NewAtom("cols"); + colspan = NS_NewAtom("colspan"); + columnPseudo = NS_NewAtom(":body-column"); + commentPseudo = NS_NewAtom(":-moz-comment"); + compact = NS_NewAtom("compact"); + content = NS_NewAtom("content"); + coords = NS_NewAtom("coords"); + defaultchecked = NS_NewAtom("defaultchecked"); + defaultselected = NS_NewAtom("defaultselected"); + defaultvalue = NS_NewAtom("defaultvalue"); + declare = NS_NewAtom("declare"); + defer = NS_NewAtom("defer"); + dir = NS_NewAtom("dir"); + div = NS_NewAtom("div"); + disabled = NS_NewAtom("disabled"); + dl = NS_NewAtom("dl"); + dropDownVisible = NS_NewAtom(":dropdown-visible"); + dropDownHidden = NS_NewAtom(":dropdown-hidden"); + dropDownBtnOut = NS_NewAtom(":dropdown-btn-out"); + dropDownBtnPressed = NS_NewAtom(":dropdown-btn-pressed"); + datetime = NS_NewAtom("datetime"); + data = NS_NewAtom("data"); + embed = NS_NewAtom("embed"); + encoding = NS_NewAtom("encoding"); + enctype = NS_NewAtom("enctype"); + face = NS_NewAtom("face"); + fieldset = NS_NewAtom("fieldset"); + fieldsetContentPseudo = NS_NewAtom(":fieldset-content"); + firstLetterPseudo = NS_NewAtom(":first-letter"); + firstLinePseudo = NS_NewAtom(":first-line"); + font = NS_NewAtom("font"); + fontWeight = NS_NewAtom("font-weight"); + _for = NS_NewAtom("for"); + form = NS_NewAtom("form"); + frame = NS_NewAtom("frame"); + frameborder = NS_NewAtom("frameborder"); + frameset = NS_NewAtom("frameset"); + framesetBlankPseudo = NS_NewAtom(":frameset-blank"); + gutter = NS_NewAtom("gutter"); + h1 = NS_NewAtom("h1"); + h2 = NS_NewAtom("h2"); + h3 = NS_NewAtom("h3"); + h4 = NS_NewAtom("h4"); + h5 = NS_NewAtom("h5"); + h6 = NS_NewAtom("h6"); + headerContentBase = NS_NewAtom("content-base"); + headerContentLanguage = NS_NewAtom("content-language"); + headerContentScriptType = NS_NewAtom("content-script-type"); + headerContentStyleType = NS_NewAtom("content-style-type"); + headerContentType = NS_NewAtom("content-type"); + headerDefaultStyle = NS_NewAtom("default-style"); + headerWindowTarget = NS_NewAtom("window-target"); + headers = NS_NewAtom("headers"); + height = NS_NewAtom("height"); + hidden = NS_NewAtom("hidden"); + horizontalFramesetBorderPseudo = NS_NewAtom(":hframeset-border"); + hr = NS_NewAtom("hr"); + href = NS_NewAtom("href"); + hreflang = NS_NewAtom("hreflang"); + hspace = NS_NewAtom("hspace"); + html = NS_NewAtom("html"); + httpEquiv = NS_NewAtom("http-equiv"); + ibPseudo = NS_NewAtom(":ib-pseudo"); + id = NS_NewAtom("id"); + iframe = NS_NewAtom("iframe"); + img = NS_NewAtom("img"); + index = NS_NewAtom("index"); + input = NS_NewAtom("input"); + ismap = NS_NewAtom("ismap"); + label = NS_NewAtom("label"); + labelContentPseudo = NS_NewAtom(":label-content"); + lang = NS_NewAtom("lang"); + layout = NS_NewAtom("layout"); + li = NS_NewAtom("li"); + link = NS_NewAtom("link"); + left = NS_NewAtom("left"); + leftpadding = NS_NewAtom("leftpadding"); + legend = NS_NewAtom("legend"); + legendContentPseudo = NS_NewAtom(":legend-content"); + length = NS_NewAtom("length"); + lowsrc = NS_NewAtom("lowsrc"); + marginheight = NS_NewAtom("marginheight"); + marginwidth = NS_NewAtom("marginwidth"); + maxlength = NS_NewAtom("maxlength"); + mayscript = NS_NewAtom("mayscript"); + media = NS_NewAtom("media"); + menu = NS_NewAtom("menu"); + method = NS_NewAtom("method"); + multicol = NS_NewAtom("multicol"); + multiple = NS_NewAtom("multiple"); + name = NS_NewAtom("name"); + nohref = NS_NewAtom("nohref"); + noresize = NS_NewAtom("noresize"); + noshade = NS_NewAtom("noshade"); + nowrap = NS_NewAtom("nowrap"); + object = NS_NewAtom("object"); + ol = NS_NewAtom("ol"); + onabort = NS_NewAtom("onabort"); + onblur = NS_NewAtom("onblur"); + onchange = NS_NewAtom("onchange"); + onclick = NS_NewAtom("onclick"); + ondragdrop = NS_NewAtom("ondblclick"); + ondragdrop = NS_NewAtom("ondragdrop"); + onerror = NS_NewAtom("onerror"); + onfocus = NS_NewAtom("onfocus"); + onkeydown = NS_NewAtom("onkeydown"); + onkeypress = NS_NewAtom("onkeypress"); + onkeyup = NS_NewAtom("onkeyup"); + onload = NS_NewAtom("onload"); + onmousedown = NS_NewAtom("onmousedown"); + onmousemove = NS_NewAtom("onmousemove"); + onmouseover = NS_NewAtom("onmouseover"); + onmouseout = NS_NewAtom("onmouseout"); + onmouseup = NS_NewAtom("onmouseup"); + onpaint = NS_NewAtom("onpaint"); + onreset = NS_NewAtom("onreset"); + onsubmit = NS_NewAtom("onsubmit"); + onunload = NS_NewAtom("onunload"); + overflow = NS_NewAtom("overflow"); + p = NS_NewAtom("p"); + pagex = NS_NewAtom("pagex"); + pagey = NS_NewAtom("pagey"); + param = NS_NewAtom("param"); + placeholderPseudo = NS_NewAtom(":placeholder-frame"); + pointSize = NS_NewAtom("point-size"); + pre = NS_NewAtom("pre"); + profile = NS_NewAtom("profile"); + prompt = NS_NewAtom("prompt"); + readonly = NS_NewAtom("readonly"); + rel = NS_NewAtom("rel"); + repeat = NS_NewAtom("repeat"); + rev = NS_NewAtom("rev"); + rightpadding = NS_NewAtom("rightpadding"); + rootPseudo = NS_NewAtom(":root"); + rows = NS_NewAtom("rows"); + rowspan = NS_NewAtom("rowspan"); + rules = NS_NewAtom("rules"); + scheme = NS_NewAtom("scheme"); + scope = NS_NewAtom("scope"); + script = NS_NewAtom("script"); + scrolledContentPseudo = NS_NewAtom(":scrolled-content"); + scrolling = NS_NewAtom("scrolling"); + select = NS_NewAtom("select"); + selected = NS_NewAtom("selected"); + selectedindex = NS_NewAtom("selectedindex"); + shape = NS_NewAtom("shape"); + size = NS_NewAtom("size"); + spacer = NS_NewAtom("spacer"); + span = NS_NewAtom("span"); + src = NS_NewAtom("src"); + standby = NS_NewAtom("standby"); + start = NS_NewAtom("start"); + style = NS_NewAtom("style"); + summary = NS_NewAtom("summary"); + suppress = NS_NewAtom("suppress"); + tabindex = NS_NewAtom("tabindex"); + table = NS_NewAtom("table"); + tablePseudo = NS_NewAtom(":table"); + tableCellPseudo = NS_NewAtom(":table-cell"); + tableColGroupPseudo = NS_NewAtom(":table-column-group"); + tableColPseudo = NS_NewAtom(":table-column"); + tableOuterPseudo = NS_NewAtom(":table-outer"); + tableRowGroupPseudo = NS_NewAtom(":table-row-group"); + tableRowPseudo = NS_NewAtom(":table-row"); + tabstop = NS_NewAtom("tabstop"); + target = NS_NewAtom("target"); + tbody = NS_NewAtom("tbody"); + td = NS_NewAtom("td"); + tfoot = NS_NewAtom("tfoot"); + thead = NS_NewAtom("thead"); + text = NS_NewAtom("text"); + textarea = NS_NewAtom("textarea"); + textPseudo = NS_NewAtom(":-moz-text"); + th = NS_NewAtom("th"); + title = NS_NewAtom("title"); + top = NS_NewAtom("top"); + toppadding = NS_NewAtom("toppadding"); + tr = NS_NewAtom("tr"); + type = NS_NewAtom("type"); + ul = NS_NewAtom("ul"); + usemap = NS_NewAtom("usemap"); + valign = NS_NewAtom("valign"); + value = NS_NewAtom("value"); + valuetype = NS_NewAtom("valuetype"); + variable = NS_NewAtom("variable"); + version = NS_NewAtom("version"); + verticalFramesetBorderPseudo = NS_NewAtom(":vframeset-border"); + visibility = NS_NewAtom("visibility"); + vlink = NS_NewAtom("vlink"); + vspace = NS_NewAtom("vspace"); + wbr = NS_NewAtom("wbr"); + width = NS_NewAtom("width"); + wrap = NS_NewAtom("wrap"); + wrappedFramePseudo = NS_NewAtom(":wrapped-frame"); + zindex = NS_NewAtom("zindex"); } ++gRefCnt; } diff --git a/mozilla/content/html/content/src/nsHTMLAtoms.h b/mozilla/content/html/content/src/nsHTMLAtoms.h index 2a1bbd1da1d..2800a85a0fb 100644 --- a/mozilla/content/html/content/src/nsHTMLAtoms.h +++ b/mozilla/content/html/content/src/nsHTMLAtoms.h @@ -20,8 +20,8 @@ #include "nsIAtom.h" -#define NS_HTML_BASE_HREF "_BASE_HREF" -#define NS_HTML_BASE_TARGET "_BASE_TARGET" +#define NS_HTML_BASE_HREF "_base_href" +#define NS_HTML_BASE_TARGET "_base_target" /** * This class wraps up the creation (and destruction) of the standard diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index ad6ccb4f4fd..665842e1935 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -483,7 +483,7 @@ AddAttributes(const nsIParserNode& aNode, const nsString& key = aNode.GetKeyAt(i); k.Truncate(); k.Append(key); - k.ToUpperCase(); + k.ToLowerCase(); nsIAtom* keyAtom = NS_NewAtom(k); nsHTMLValue value; @@ -774,7 +774,7 @@ CreateContentObject(const nsIParserNode& aNode, nsAutoString tmp; if (eHTMLTag_userdefined == aNodeType) { tmp.Append(aNode.GetText()); - tmp.ToUpperCase(); + tmp.ToLowerCase(); } else { tmp.Append(NS_EnumToTag(aNodeType)); @@ -867,7 +867,7 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, const nsString& aTag) { // Find tag in tag table nsAutoString tmp(aTag); - tmp.ToUpperCase(); + tmp.ToLowerCase(); char cbuf[20]; tmp.ToCString(cbuf, sizeof(cbuf)); nsHTMLTag id = NS_TagToEnum(cbuf); @@ -1434,7 +1434,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, mDocument->SetRootContent(mRoot); // Make head part - nsIAtom* atom = NS_NewAtom("HEAD"); + nsIAtom* atom = NS_NewAtom("head"); if (nsnull == atom) { return NS_ERROR_OUT_OF_MEMORY; } @@ -1617,7 +1617,7 @@ HTMLContentSink::SetTitle(const nsString& aValue) mTitle->CompressWhitespace(PR_TRUE, PR_TRUE); mHTMLDocument->SetTitle(*mTitle); - nsIAtom* atom = NS_NewAtom("TITLE"); + nsIAtom* atom = NS_NewAtom("title"); nsIHTMLContent* it = nsnull; nsresult rv = NS_NewHTMLTitleElement(&it, atom); if (NS_OK == rv) { @@ -1745,7 +1745,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode) NS_IF_RELEASE(mCurrentForm); // set the current form - nsAutoString tmp("FORM"); + nsAutoString tmp("form"); nsIAtom* atom = NS_NewAtom(tmp); nsIHTMLContent* iContent = nsnull; nsresult rv = NS_NewHTMLFormElement(&iContent, atom); @@ -2572,7 +2572,7 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode) if (nsnull != mHead) { // Create content object - nsAutoString tmp("META"); + nsAutoString tmp("meta"); nsIAtom* atom = NS_NewAtom(tmp); if (nsnull == atom) { return NS_ERROR_OUT_OF_MEMORY; @@ -2620,7 +2620,7 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode) delete value; } - header.ToUpperCase(); + header.ToLowerCase(); nsIAtom* fieldAtom = NS_NewAtom(header); mDocument->SetHeaderData(fieldAtom, result); diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index db5f8976755..aed5e1dbfa2 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -271,7 +271,7 @@ nsImageDocument::CreateSyntheticDocument() body->SetDocument(this, PR_FALSE); nsIHTMLContent* center; - nsIAtom* centerAtom = NS_NewAtom("P"); + nsIAtom* centerAtom = NS_NewAtom("p"); rv = NS_NewHTMLParagraphElement(¢er, centerAtom); NS_RELEASE(centerAtom); if (NS_OK != rv) { @@ -280,7 +280,7 @@ nsImageDocument::CreateSyntheticDocument() center->SetDocument(this, PR_FALSE); nsIHTMLContent* image; - nsIAtom* imgAtom = NS_NewAtom("IMG"); + nsIAtom* imgAtom = NS_NewAtom("img"); rv = NS_NewHTMLImageElement(&image, imgAtom); NS_RELEASE(imgAtom); if (NS_OK != rv) { diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index b3f57c6762a..46915dcf456 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -1121,7 +1121,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, aSelector.SetTag(mToken.mIdent); } else { - mToken.mIdent.ToUpperCase(buffer); + mToken.mIdent.ToLowerCase(buffer); aSelector.SetTag(buffer); } } @@ -1130,7 +1130,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, mToken.mIdent.Left(nameSpace, colon); mToken.mIdent.Right(buffer, (mToken.mIdent.Length() - (colon + 1))); if (! mCaseSensitive) { - buffer.ToUpperCase(); + buffer.ToLowerCase(); } // XXX lookup namespace, set it // deal with * namespace (== unknown) @@ -1181,7 +1181,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, buffer.Truncate(); buffer.Append(':'); buffer.Append(mToken.mIdent); - buffer.ToUpperCase(); + buffer.ToLowerCase(); nsIAtom* pseudo = NS_NewAtom(buffer); if (IsPseudoClass(pseudo)) { // XXX parse lang pseudo class @@ -1225,7 +1225,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, mToken.AppendToString(aSource); nsAutoString attr(mToken.mIdent); if (! mCaseSensitive) { - attr.ToUpperCase(); + attr.ToLowerCase(); } if (! GetToken(aErrorCode, PR_FALSE)) { // premature EOF return PR_FALSE; diff --git a/mozilla/content/shared/public/nsHTMLAtoms.h b/mozilla/content/shared/public/nsHTMLAtoms.h index 2a1bbd1da1d..2800a85a0fb 100644 --- a/mozilla/content/shared/public/nsHTMLAtoms.h +++ b/mozilla/content/shared/public/nsHTMLAtoms.h @@ -20,8 +20,8 @@ #include "nsIAtom.h" -#define NS_HTML_BASE_HREF "_BASE_HREF" -#define NS_HTML_BASE_TARGET "_BASE_TARGET" +#define NS_HTML_BASE_HREF "_base_href" +#define NS_HTML_BASE_TARGET "_base_target" /** * This class wraps up the creation (and destruction) of the standard diff --git a/mozilla/content/shared/src/nsCSSAtoms.cpp b/mozilla/content/shared/src/nsCSSAtoms.cpp index 0c75595e424..34700f949e0 100644 --- a/mozilla/content/shared/src/nsCSSAtoms.cpp +++ b/mozilla/content/shared/src/nsCSSAtoms.cpp @@ -41,21 +41,21 @@ static nsrefcnt gRefCnt; void nsCSSAtoms::AddrefAtoms() { if (0 == gRefCnt) { - activePseudo = NS_NewAtom(":ACTIVE"); + activePseudo = NS_NewAtom(":active"); - firstChildPseudo = NS_NewAtom(":FIRST-CHILD"); - focusPseudo = NS_NewAtom(":FOCUS"); + firstChildPseudo = NS_NewAtom(":first-child"); + focusPseudo = NS_NewAtom(":focus"); - hoverPseudo = NS_NewAtom(":HOVER"); + hoverPseudo = NS_NewAtom(":hover"); - langPseudo = NS_NewAtom(":LANG"); - linkPseudo = NS_NewAtom(":LINK"); + langPseudo = NS_NewAtom(":lang"); + linkPseudo = NS_NewAtom(":link"); - outOfDatePseudo = NS_NewAtom(":OUT-OF-DATE"); + outOfDatePseudo = NS_NewAtom(":out-of-date"); universalSelector = NS_NewAtom("*"); - visitedPseudo = NS_NewAtom(":VISITED"); + visitedPseudo = NS_NewAtom(":visited"); } ++gRefCnt; } diff --git a/mozilla/content/shared/src/nsHTMLAtoms.cpp b/mozilla/content/shared/src/nsHTMLAtoms.cpp index 8f3f5465f26..0823ce62bb8 100644 --- a/mozilla/content/shared/src/nsHTMLAtoms.cpp +++ b/mozilla/content/shared/src/nsHTMLAtoms.cpp @@ -271,251 +271,251 @@ static nsrefcnt gRefCnt; void nsHTMLAtoms::AddrefAtoms() { if (0 == gRefCnt) { - mozAnonymousBlock = NS_NewAtom(":MOZ-ANONYMOUS-BLOCK"); + mozAnonymousBlock = NS_NewAtom(":-moz-anonymous-block"); _baseHref = NS_NewAtom(NS_HTML_BASE_HREF); _baseTarget = NS_NewAtom(NS_HTML_BASE_TARGET); - a = NS_NewAtom("A"); - abbr = NS_NewAtom("ABBR"); - above = NS_NewAtom("ABOVE"); - accept = NS_NewAtom("ACCEPT"); - acceptcharset = NS_NewAtom("ACCEPTCHARSET"); - accesskey = NS_NewAtom("ACCESSKEY"); - action = NS_NewAtom("ACTION"); - align = NS_NewAtom("ALIGN"); - alink = NS_NewAtom("ALINK"); - alt = NS_NewAtom("ALT"); - applet = NS_NewAtom("APPLET"); - archive = NS_NewAtom("ARCHIVE"); - area = NS_NewAtom("AREA"); - axis = NS_NewAtom("AXIS"); - background = NS_NewAtom("BACKGROUND"); - below = NS_NewAtom("BELOW"); - bgcolor = NS_NewAtom("BGCOLOR"); - body = NS_NewAtom("BODY"); - border = NS_NewAtom("BORDER"); - bordercolor = NS_NewAtom("BORDERCOLOR"); - bottompadding = NS_NewAtom("BOTTOMPADDING"); - br = NS_NewAtom("BR"); - bulletPseudo = NS_NewAtom(":BULLET"); - button = NS_NewAtom("BUTTON"); - buttonContentPseudo = NS_NewAtom(":BUTTON-CONTENT"); - caption = NS_NewAtom("CAPTION"); - cellContentPseudo = NS_NewAtom(":CELL-CONTENT"); - cellpadding = NS_NewAtom("CELLPADDING"); - cellspacing = NS_NewAtom("CELLSPACING"); - ch = NS_NewAtom("CH"); - _char = NS_NewAtom("CHAR"); - charoff = NS_NewAtom("CHAROFF"); - charset = NS_NewAtom("CHARSET"); - checked = NS_NewAtom("CHECKED"); - choff = NS_NewAtom("CHOFF"); - cite = NS_NewAtom("CITE"); - kClass = NS_NewAtom("CLASS"); - classid = NS_NewAtom("CLASSID"); - clear = NS_NewAtom("CLEAR"); - clip = NS_NewAtom("CLIP"); - code = NS_NewAtom("CODE"); - codebase = NS_NewAtom("CODEBASE"); - codetype = NS_NewAtom("CODETYPE"); - color = NS_NewAtom("COLOR"); - col = NS_NewAtom("COL"); - colgroup = NS_NewAtom("COLGROUP"); - cols = NS_NewAtom("COLS"); - colspan = NS_NewAtom("COLSPAN"); - columnPseudo = NS_NewAtom(":BODY-COLUMN"); - commentPseudo = NS_NewAtom(":MOZ-COMMENT"); - compact = NS_NewAtom("COMPACT"); - content = NS_NewAtom("CONTENT"); - coords = NS_NewAtom("COORDS"); - defaultchecked = NS_NewAtom("DEFAULTCHECKED"); - defaultselected = NS_NewAtom("DEFAULTSELECTED"); - defaultvalue = NS_NewAtom("DEFAULTVALUE"); - declare = NS_NewAtom("DECLARE"); - defer = NS_NewAtom("DEFER"); - dir = NS_NewAtom("DIR"); - div = NS_NewAtom("DIV"); - disabled = NS_NewAtom("DISABLED"); - dl = NS_NewAtom("DL"); - dropDownVisible = NS_NewAtom(":DROPDOWN-VISIBLE"); - dropDownHidden = NS_NewAtom(":DROPDOWN-HIDDEN"); - dropDownBtnOut = NS_NewAtom(":DROPDOWN-BTN-OUT"); - dropDownBtnPressed = NS_NewAtom(":DROPDOWN-BTN-PRESSED"); - datetime = NS_NewAtom("DATETIME"); - data = NS_NewAtom("DATA"); - embed = NS_NewAtom("EMBED"); - encoding = NS_NewAtom("ENCODING"); - enctype = NS_NewAtom("ENCTYPE"); - face = NS_NewAtom("FACE"); - fieldset = NS_NewAtom("FIELDSET"); - fieldsetContentPseudo = NS_NewAtom(":FIELDSET-CONTENT"); - firstLetterPseudo = NS_NewAtom(":FIRST-LETTER"); - firstLinePseudo = NS_NewAtom(":FIRST-LINE"); - font = NS_NewAtom("FONT"); - fontWeight = NS_NewAtom("FONT-WEIGHT"); - _for = NS_NewAtom("FOR"); - form = NS_NewAtom("FORM"); - frame = NS_NewAtom("FRAME"); - frameborder = NS_NewAtom("FRAMEBORDER"); - frameset = NS_NewAtom("FRAMESET"); - framesetBlankPseudo = NS_NewAtom(":FRAMESET-BLANK"); - gutter = NS_NewAtom("GUTTER"); - h1 = NS_NewAtom("H1"); - h2 = NS_NewAtom("H2"); - h3 = NS_NewAtom("H3"); - h4 = NS_NewAtom("H4"); - h5 = NS_NewAtom("H5"); - h6 = NS_NewAtom("H6"); - headerContentBase = NS_NewAtom("CONTENT-BASE"); - headerContentLanguage = NS_NewAtom("CONTENT-LANGUAGE"); - headerContentScriptType = NS_NewAtom("CONTENT-SCRIPT-TYPE"); - headerContentStyleType = NS_NewAtom("CONTENT-STYLE-TYPE"); - headerContentType = NS_NewAtom("CONTENT-TYPE"); - headerDefaultStyle = NS_NewAtom("DEFAULT-STYLE"); - headerWindowTarget = NS_NewAtom("WINDOW-TARGET"); - headers = NS_NewAtom("HEADERS"); - height = NS_NewAtom("HEIGHT"); - hidden = NS_NewAtom("HIDDEN"); - horizontalFramesetBorderPseudo = NS_NewAtom(":HFRAMESET-BORDER"); - hr = NS_NewAtom("HR"); - href = NS_NewAtom("HREF"); - hreflang = NS_NewAtom("HREFLANG"); - hspace = NS_NewAtom("HSPACE"); - html = NS_NewAtom("HTML"); - httpEquiv = NS_NewAtom("HTTP-EQUIV"); - ibPseudo = NS_NewAtom(":IB-PSEUDO"); - id = NS_NewAtom("ID"); - iframe = NS_NewAtom("IFRAME"); - img = NS_NewAtom("IMG"); - index = NS_NewAtom("INDEX"); - input = NS_NewAtom("INPUT"); - ismap = NS_NewAtom("ISMAP"); - label = NS_NewAtom("LABEL"); - labelContentPseudo = NS_NewAtom(":LABEL-CONTENT"); - lang = NS_NewAtom("LANG"); - layout = NS_NewAtom("LAYOUT"); - li = NS_NewAtom("LI"); - link = NS_NewAtom("LINK"); - left = NS_NewAtom("LEFT"); - leftpadding = NS_NewAtom("LEFTPADDING"); - legend = NS_NewAtom("LEGEND"); - legendContentPseudo = NS_NewAtom(":LEGEND-CONTENT"); - length = NS_NewAtom("LENGTH"); - lowsrc = NS_NewAtom("LOWSRC"); - marginheight = NS_NewAtom("MARGINHEIGHT"); - marginwidth = NS_NewAtom("MARGINWIDTH"); - maxlength = NS_NewAtom("MAXLENGTH"); - mayscript = NS_NewAtom("MAYSCRIPT"); - media = NS_NewAtom("MEDIA"); - menu = NS_NewAtom("MENU"); - method = NS_NewAtom("METHOD"); - multicol = NS_NewAtom("MULTICOL"); - multiple = NS_NewAtom("MULTIPLE"); - name = NS_NewAtom("NAME"); - nohref = NS_NewAtom("NOHREF"); - noresize = NS_NewAtom("NORESIZE"); - noshade = NS_NewAtom("NOSHADE"); - nowrap = NS_NewAtom("NOWRAP"); - object = NS_NewAtom("OBJECT"); - ol = NS_NewAtom("OL"); - onabort = NS_NewAtom("ONABORT"); - onblur = NS_NewAtom("ONBLUR"); - onchange = NS_NewAtom("ONCHANGE"); - onclick = NS_NewAtom("ONCLICK"); - ondragdrop = NS_NewAtom("ONDBLCLICK"); - ondragdrop = NS_NewAtom("ONDRAGDROP"); - onerror = NS_NewAtom("ONERROR"); - onfocus = NS_NewAtom("ONFOCUS"); - onkeydown = NS_NewAtom("ONKEYDOWN"); - onkeypress = NS_NewAtom("ONKEYPRESS"); - onkeyup = NS_NewAtom("ONKEYUP"); - onload = NS_NewAtom("ONLOAD"); - onmousedown = NS_NewAtom("ONMOUSEDOWN"); - onmousemove = NS_NewAtom("ONMOUSEMOVE"); - onmouseover = NS_NewAtom("ONMOUSEOVER"); - onmouseout = NS_NewAtom("ONMOUSEOUT"); - onmouseup = NS_NewAtom("ONMOUSEUP"); - onpaint = NS_NewAtom("ONPAINT"); - onreset = NS_NewAtom("ONRESET"); - onsubmit = NS_NewAtom("ONSUBMIT"); - onunload = NS_NewAtom("ONUNLOAD"); - overflow = NS_NewAtom("OVERFLOW"); - p = NS_NewAtom("P"); - pagex = NS_NewAtom("PAGEX"); - pagey = NS_NewAtom("PAGEY"); - param = NS_NewAtom("PARAM"); - placeholderPseudo = NS_NewAtom(":PLACEHOLDER-FRAME"); - pointSize = NS_NewAtom("POINT-SIZE"); - pre = NS_NewAtom("PRE"); - profile = NS_NewAtom("PROFILE"); - prompt = NS_NewAtom("PROMPT"); - readonly = NS_NewAtom("READONLY"); - rel = NS_NewAtom("REL"); - repeat = NS_NewAtom("REPEAT"); - rev = NS_NewAtom("REV"); - rightpadding = NS_NewAtom("RIGHTPADDING"); - rootPseudo = NS_NewAtom(":ROOT"); - rows = NS_NewAtom("ROWS"); - rowspan = NS_NewAtom("ROWSPAN"); - rules = NS_NewAtom("RULES"); - scheme = NS_NewAtom("SCHEME"); - scope = NS_NewAtom("SCOPE"); - script = NS_NewAtom("SCRIPT"); - scrolledContentPseudo = NS_NewAtom(":SCROLLED-CONTENT"); - scrolling = NS_NewAtom("SCROLLING"); - select = NS_NewAtom("SELECT"); - selected = NS_NewAtom("SELECTED"); - selectedindex = NS_NewAtom("SELECTEDINDEX"); - shape = NS_NewAtom("SHAPE"); - size = NS_NewAtom("SIZE"); - spacer = NS_NewAtom("SPACER"); - span = NS_NewAtom("SPAN"); - src = NS_NewAtom("SRC"); - standby = NS_NewAtom("STANDBY"); - start = NS_NewAtom("START"); - style = NS_NewAtom("STYLE"); - summary = NS_NewAtom("SUMMARY"); - suppress = NS_NewAtom("SUPPRESS"); - tabindex = NS_NewAtom("TABINDEX"); - table = NS_NewAtom("TABLE"); - tablePseudo = NS_NewAtom(":TABLE"); - tableCellPseudo = NS_NewAtom(":TABLE-CELL"); - tableColGroupPseudo = NS_NewAtom(":TABLE-COLUMN-GROUP"); - tableColPseudo = NS_NewAtom(":TABLE-COLUMN"); - tableOuterPseudo = NS_NewAtom(":TABLE-OUTER"); - tableRowGroupPseudo = NS_NewAtom(":TABLE-ROW-GROUP"); - tableRowPseudo = NS_NewAtom(":TABLE-ROW"); - tabstop = NS_NewAtom("TABSTOP"); - target = NS_NewAtom("TARGET"); - tbody = NS_NewAtom("TBODY"); - td = NS_NewAtom("TD"); - tfoot = NS_NewAtom("TFOOT"); - thead = NS_NewAtom("THEAD"); - text = NS_NewAtom("TEXT"); - textarea = NS_NewAtom("TEXTAREA"); - textPseudo = NS_NewAtom(":MOZ-TEXT"); - th = NS_NewAtom("TH"); - title = NS_NewAtom("TITLE"); - top = NS_NewAtom("TOP"); - toppadding = NS_NewAtom("TOPPADDING"); - tr = NS_NewAtom("TR"); - type = NS_NewAtom("TYPE"); - ul = NS_NewAtom("UL"); - usemap = NS_NewAtom("USEMAP"); - valign = NS_NewAtom("VALIGN"); - value = NS_NewAtom("VALUE"); - valuetype = NS_NewAtom("VALUETYPE"); - variable = NS_NewAtom("VARIABLE"); - version = NS_NewAtom("VERSION"); - verticalFramesetBorderPseudo = NS_NewAtom(":VFRAMESET-BORDER"); - visibility = NS_NewAtom("VISIBILITY"); - vlink = NS_NewAtom("VLINK"); - vspace = NS_NewAtom("VSPACE"); - wbr = NS_NewAtom("WBR"); - width = NS_NewAtom("WIDTH"); - wrap = NS_NewAtom("WRAP"); - wrappedFramePseudo = NS_NewAtom(":WRAPPED-FRAME"); - zindex = NS_NewAtom("ZINDEX"); + a = NS_NewAtom("a"); + abbr = NS_NewAtom("abbr"); + above = NS_NewAtom("above"); + accept = NS_NewAtom("accept"); + acceptcharset = NS_NewAtom("acceptcharset"); + accesskey = NS_NewAtom("accesskey"); + action = NS_NewAtom("action"); + align = NS_NewAtom("align"); + alink = NS_NewAtom("alink"); + alt = NS_NewAtom("alt"); + applet = NS_NewAtom("applet"); + archive = NS_NewAtom("archive"); + area = NS_NewAtom("area"); + axis = NS_NewAtom("axis"); + background = NS_NewAtom("background"); + below = NS_NewAtom("below"); + bgcolor = NS_NewAtom("bgcolor"); + body = NS_NewAtom("body"); + border = NS_NewAtom("border"); + bordercolor = NS_NewAtom("bordercolor"); + bottompadding = NS_NewAtom("bottompadding"); + br = NS_NewAtom("br"); + bulletPseudo = NS_NewAtom(":bullet"); + button = NS_NewAtom("button"); + buttonContentPseudo = NS_NewAtom(":button-content"); + caption = NS_NewAtom("caption"); + cellContentPseudo = NS_NewAtom(":cell-content"); + cellpadding = NS_NewAtom("cellpadding"); + cellspacing = NS_NewAtom("cellspacing"); + ch = NS_NewAtom("ch"); + _char = NS_NewAtom("char"); + charoff = NS_NewAtom("charoff"); + charset = NS_NewAtom("charset"); + checked = NS_NewAtom("checked"); + choff = NS_NewAtom("choff"); + cite = NS_NewAtom("cite"); + kClass = NS_NewAtom("class"); + classid = NS_NewAtom("classid"); + clear = NS_NewAtom("clear"); + clip = NS_NewAtom("clip"); + code = NS_NewAtom("code"); + codebase = NS_NewAtom("codebase"); + codetype = NS_NewAtom("codetype"); + color = NS_NewAtom("color"); + col = NS_NewAtom("col"); + colgroup = NS_NewAtom("colgroup"); + cols = NS_NewAtom("cols"); + colspan = NS_NewAtom("colspan"); + columnPseudo = NS_NewAtom(":body-column"); + commentPseudo = NS_NewAtom(":-moz-comment"); + compact = NS_NewAtom("compact"); + content = NS_NewAtom("content"); + coords = NS_NewAtom("coords"); + defaultchecked = NS_NewAtom("defaultchecked"); + defaultselected = NS_NewAtom("defaultselected"); + defaultvalue = NS_NewAtom("defaultvalue"); + declare = NS_NewAtom("declare"); + defer = NS_NewAtom("defer"); + dir = NS_NewAtom("dir"); + div = NS_NewAtom("div"); + disabled = NS_NewAtom("disabled"); + dl = NS_NewAtom("dl"); + dropDownVisible = NS_NewAtom(":dropdown-visible"); + dropDownHidden = NS_NewAtom(":dropdown-hidden"); + dropDownBtnOut = NS_NewAtom(":dropdown-btn-out"); + dropDownBtnPressed = NS_NewAtom(":dropdown-btn-pressed"); + datetime = NS_NewAtom("datetime"); + data = NS_NewAtom("data"); + embed = NS_NewAtom("embed"); + encoding = NS_NewAtom("encoding"); + enctype = NS_NewAtom("enctype"); + face = NS_NewAtom("face"); + fieldset = NS_NewAtom("fieldset"); + fieldsetContentPseudo = NS_NewAtom(":fieldset-content"); + firstLetterPseudo = NS_NewAtom(":first-letter"); + firstLinePseudo = NS_NewAtom(":first-line"); + font = NS_NewAtom("font"); + fontWeight = NS_NewAtom("font-weight"); + _for = NS_NewAtom("for"); + form = NS_NewAtom("form"); + frame = NS_NewAtom("frame"); + frameborder = NS_NewAtom("frameborder"); + frameset = NS_NewAtom("frameset"); + framesetBlankPseudo = NS_NewAtom(":frameset-blank"); + gutter = NS_NewAtom("gutter"); + h1 = NS_NewAtom("h1"); + h2 = NS_NewAtom("h2"); + h3 = NS_NewAtom("h3"); + h4 = NS_NewAtom("h4"); + h5 = NS_NewAtom("h5"); + h6 = NS_NewAtom("h6"); + headerContentBase = NS_NewAtom("content-base"); + headerContentLanguage = NS_NewAtom("content-language"); + headerContentScriptType = NS_NewAtom("content-script-type"); + headerContentStyleType = NS_NewAtom("content-style-type"); + headerContentType = NS_NewAtom("content-type"); + headerDefaultStyle = NS_NewAtom("default-style"); + headerWindowTarget = NS_NewAtom("window-target"); + headers = NS_NewAtom("headers"); + height = NS_NewAtom("height"); + hidden = NS_NewAtom("hidden"); + horizontalFramesetBorderPseudo = NS_NewAtom(":hframeset-border"); + hr = NS_NewAtom("hr"); + href = NS_NewAtom("href"); + hreflang = NS_NewAtom("hreflang"); + hspace = NS_NewAtom("hspace"); + html = NS_NewAtom("html"); + httpEquiv = NS_NewAtom("http-equiv"); + ibPseudo = NS_NewAtom(":ib-pseudo"); + id = NS_NewAtom("id"); + iframe = NS_NewAtom("iframe"); + img = NS_NewAtom("img"); + index = NS_NewAtom("index"); + input = NS_NewAtom("input"); + ismap = NS_NewAtom("ismap"); + label = NS_NewAtom("label"); + labelContentPseudo = NS_NewAtom(":label-content"); + lang = NS_NewAtom("lang"); + layout = NS_NewAtom("layout"); + li = NS_NewAtom("li"); + link = NS_NewAtom("link"); + left = NS_NewAtom("left"); + leftpadding = NS_NewAtom("leftpadding"); + legend = NS_NewAtom("legend"); + legendContentPseudo = NS_NewAtom(":legend-content"); + length = NS_NewAtom("length"); + lowsrc = NS_NewAtom("lowsrc"); + marginheight = NS_NewAtom("marginheight"); + marginwidth = NS_NewAtom("marginwidth"); + maxlength = NS_NewAtom("maxlength"); + mayscript = NS_NewAtom("mayscript"); + media = NS_NewAtom("media"); + menu = NS_NewAtom("menu"); + method = NS_NewAtom("method"); + multicol = NS_NewAtom("multicol"); + multiple = NS_NewAtom("multiple"); + name = NS_NewAtom("name"); + nohref = NS_NewAtom("nohref"); + noresize = NS_NewAtom("noresize"); + noshade = NS_NewAtom("noshade"); + nowrap = NS_NewAtom("nowrap"); + object = NS_NewAtom("object"); + ol = NS_NewAtom("ol"); + onabort = NS_NewAtom("onabort"); + onblur = NS_NewAtom("onblur"); + onchange = NS_NewAtom("onchange"); + onclick = NS_NewAtom("onclick"); + ondragdrop = NS_NewAtom("ondblclick"); + ondragdrop = NS_NewAtom("ondragdrop"); + onerror = NS_NewAtom("onerror"); + onfocus = NS_NewAtom("onfocus"); + onkeydown = NS_NewAtom("onkeydown"); + onkeypress = NS_NewAtom("onkeypress"); + onkeyup = NS_NewAtom("onkeyup"); + onload = NS_NewAtom("onload"); + onmousedown = NS_NewAtom("onmousedown"); + onmousemove = NS_NewAtom("onmousemove"); + onmouseover = NS_NewAtom("onmouseover"); + onmouseout = NS_NewAtom("onmouseout"); + onmouseup = NS_NewAtom("onmouseup"); + onpaint = NS_NewAtom("onpaint"); + onreset = NS_NewAtom("onreset"); + onsubmit = NS_NewAtom("onsubmit"); + onunload = NS_NewAtom("onunload"); + overflow = NS_NewAtom("overflow"); + p = NS_NewAtom("p"); + pagex = NS_NewAtom("pagex"); + pagey = NS_NewAtom("pagey"); + param = NS_NewAtom("param"); + placeholderPseudo = NS_NewAtom(":placeholder-frame"); + pointSize = NS_NewAtom("point-size"); + pre = NS_NewAtom("pre"); + profile = NS_NewAtom("profile"); + prompt = NS_NewAtom("prompt"); + readonly = NS_NewAtom("readonly"); + rel = NS_NewAtom("rel"); + repeat = NS_NewAtom("repeat"); + rev = NS_NewAtom("rev"); + rightpadding = NS_NewAtom("rightpadding"); + rootPseudo = NS_NewAtom(":root"); + rows = NS_NewAtom("rows"); + rowspan = NS_NewAtom("rowspan"); + rules = NS_NewAtom("rules"); + scheme = NS_NewAtom("scheme"); + scope = NS_NewAtom("scope"); + script = NS_NewAtom("script"); + scrolledContentPseudo = NS_NewAtom(":scrolled-content"); + scrolling = NS_NewAtom("scrolling"); + select = NS_NewAtom("select"); + selected = NS_NewAtom("selected"); + selectedindex = NS_NewAtom("selectedindex"); + shape = NS_NewAtom("shape"); + size = NS_NewAtom("size"); + spacer = NS_NewAtom("spacer"); + span = NS_NewAtom("span"); + src = NS_NewAtom("src"); + standby = NS_NewAtom("standby"); + start = NS_NewAtom("start"); + style = NS_NewAtom("style"); + summary = NS_NewAtom("summary"); + suppress = NS_NewAtom("suppress"); + tabindex = NS_NewAtom("tabindex"); + table = NS_NewAtom("table"); + tablePseudo = NS_NewAtom(":table"); + tableCellPseudo = NS_NewAtom(":table-cell"); + tableColGroupPseudo = NS_NewAtom(":table-column-group"); + tableColPseudo = NS_NewAtom(":table-column"); + tableOuterPseudo = NS_NewAtom(":table-outer"); + tableRowGroupPseudo = NS_NewAtom(":table-row-group"); + tableRowPseudo = NS_NewAtom(":table-row"); + tabstop = NS_NewAtom("tabstop"); + target = NS_NewAtom("target"); + tbody = NS_NewAtom("tbody"); + td = NS_NewAtom("td"); + tfoot = NS_NewAtom("tfoot"); + thead = NS_NewAtom("thead"); + text = NS_NewAtom("text"); + textarea = NS_NewAtom("textarea"); + textPseudo = NS_NewAtom(":-moz-text"); + th = NS_NewAtom("th"); + title = NS_NewAtom("title"); + top = NS_NewAtom("top"); + toppadding = NS_NewAtom("toppadding"); + tr = NS_NewAtom("tr"); + type = NS_NewAtom("type"); + ul = NS_NewAtom("ul"); + usemap = NS_NewAtom("usemap"); + valign = NS_NewAtom("valign"); + value = NS_NewAtom("value"); + valuetype = NS_NewAtom("valuetype"); + variable = NS_NewAtom("variable"); + version = NS_NewAtom("version"); + verticalFramesetBorderPseudo = NS_NewAtom(":vframeset-border"); + visibility = NS_NewAtom("visibility"); + vlink = NS_NewAtom("vlink"); + vspace = NS_NewAtom("vspace"); + wbr = NS_NewAtom("wbr"); + width = NS_NewAtom("width"); + wrap = NS_NewAtom("wrap"); + wrappedFramePseudo = NS_NewAtom(":wrapped-frame"); + zindex = NS_NewAtom("zindex"); } ++gRefCnt; } diff --git a/mozilla/content/shared/src/nsLayoutAtoms.cpp b/mozilla/content/shared/src/nsLayoutAtoms.cpp index 2da737bd0db..862a3989b2e 100644 --- a/mozilla/content/shared/src/nsLayoutAtoms.cpp +++ b/mozilla/content/shared/src/nsLayoutAtoms.cpp @@ -75,7 +75,7 @@ void nsLayoutAtoms::AddrefAtoms() commentTagName = NS_NewAtom("__moz_comment"); textTagName = NS_NewAtom("__moz_text"); - viewportPseudo = NS_NewAtom(":-MOZ-VIEWPORT"); // XXX lower case + viewportPseudo = NS_NewAtom(":-moz-viewport"); } ++gRefCnt; } diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index acb38d64dff..e240b4bbc45 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -203,7 +203,7 @@ nsXMLContentSink::WillBuildModel(void) // hierarchy. In the future we might want to get rid of it // or at least make it invisible from the perspective of the // DOM. - nsIAtom *tagAtom = NS_NewAtom("XML"); + nsIAtom *tagAtom = NS_NewAtom("xml"); nsIXMLContent *content; result = NS_NewXMLElement(&content, tagAtom); NS_RELEASE(tagAtom); @@ -427,9 +427,6 @@ nsXMLContentSink::AddAttributes(const nsIParserNode& aNode, const nsString& key = aNode.GetKeyAt(i); name.Truncate(); name.Append(key); - if (aIsHTML) { - name.ToUpperCase(); - } nsIAtom* nameSpacePrefix = CutNameSpacePrefix(name); nsIAtom* nameAtom = NS_NewAtom(name); @@ -568,7 +565,6 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode) isHTML = IsHTMLNameSpace(nameSpaceID); if (isHTML) { - tag.ToUpperCase(); // HTML is case-insensitive nsIAtom* tagAtom = NS_NewAtom(tag); if (nsHTMLAtoms::script == tagAtom) { result = ProcessStartSCRIPTTag(aNode); @@ -649,7 +645,6 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode) } if (isHTML) { - tag.ToUpperCase(); nsIAtom* tagAtom = NS_NewAtom(tag); if (nsHTMLAtoms::script == tagAtom) { result = ProcessEndSCRIPTTag(aNode); @@ -989,7 +984,6 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode) if (NS_OK != result) { return result; } - media.ToUpperCase(); if (type.Equals(kCSSType)) { // Use the SRC attribute value to load the URL @@ -1082,7 +1076,6 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode) if (NS_OK != result) { return result; } - media.ToUpperCase(); // XXX At some point, we need to have a registry based mechanism // for dealing with loading stylesheets attached to XML documents diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 9ef1697975c..075b64fe41b 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -1807,7 +1807,7 @@ XULDocumentImpl::SplitProperty(nsIRDFResource* aProperty, // XXX XUL atoms seem to all be in lower case. HTML atoms are in // upper case. This sucks. - //tag.ToUpperCase(); + //tag.ToUpperCase(); // All XML is case sensitive even HTML in XML nsresult rv; PRInt32 nameSpaceID; @@ -1817,9 +1817,6 @@ XULDocumentImpl::SplitProperty(nsIRDFResource* aProperty, if (NS_SUCCEEDED(rv) && nameSpaceID != kNameSpaceID_Unknown) { *aNameSpaceID = nameSpaceID; - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - *aTag = NS_NewAtom(tag); return NS_OK; } @@ -1833,9 +1830,6 @@ XULDocumentImpl::SplitProperty(nsIRDFResource* aProperty, if (NS_SUCCEEDED(rv) && nameSpaceID != kNameSpaceID_Unknown) { *aNameSpaceID = nameSpaceID; - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - *aTag = NS_NewAtom(tag); return NS_OK; } diff --git a/mozilla/layout/base/nsLayoutAtoms.cpp b/mozilla/layout/base/nsLayoutAtoms.cpp index 2da737bd0db..862a3989b2e 100644 --- a/mozilla/layout/base/nsLayoutAtoms.cpp +++ b/mozilla/layout/base/nsLayoutAtoms.cpp @@ -75,7 +75,7 @@ void nsLayoutAtoms::AddrefAtoms() commentTagName = NS_NewAtom("__moz_comment"); textTagName = NS_NewAtom("__moz_text"); - viewportPseudo = NS_NewAtom(":-MOZ-VIEWPORT"); // XXX lower case + viewportPseudo = NS_NewAtom(":-moz-viewport"); } ++gRefCnt; } diff --git a/mozilla/layout/base/nsPresContext.h b/mozilla/layout/base/nsPresContext.h index 51a9eef7e20..c6b6f1b9be4 100644 --- a/mozilla/layout/base/nsPresContext.h +++ b/mozilla/layout/base/nsPresContext.h @@ -107,8 +107,8 @@ public: /** * Resolve style for a pseudo frame within the given aParentContent & aParentContext. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ NS_IMETHOD ResolvePseudoStyleContextFor(nsIContent* aParentContent, nsIAtom* aPseudoTag, @@ -119,8 +119,8 @@ public: /** * Probe style for a pseudo frame within the given aParentContent & aParentContext. * This will return nsnull id there are no explicit rules for the pseudo element. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ virtual nsIStyleContext* ProbePseudoStyleContextFor(nsIContent* aParentContent, nsIAtom* aPseudoTag, diff --git a/mozilla/layout/base/public/nsIPresContext.h b/mozilla/layout/base/public/nsIPresContext.h index 51a9eef7e20..c6b6f1b9be4 100644 --- a/mozilla/layout/base/public/nsIPresContext.h +++ b/mozilla/layout/base/public/nsIPresContext.h @@ -107,8 +107,8 @@ public: /** * Resolve style for a pseudo frame within the given aParentContent & aParentContext. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ NS_IMETHOD ResolvePseudoStyleContextFor(nsIContent* aParentContent, nsIAtom* aPseudoTag, @@ -119,8 +119,8 @@ public: /** * Probe style for a pseudo frame within the given aParentContent & aParentContext. * This will return nsnull id there are no explicit rules for the pseudo element. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ virtual nsIStyleContext* ProbePseudoStyleContextFor(nsIContent* aParentContent, nsIAtom* aPseudoTag, diff --git a/mozilla/layout/base/public/nsIStyleSet.h b/mozilla/layout/base/public/nsIStyleSet.h index 7f20bab7437..a2cf89fe119 100644 --- a/mozilla/layout/base/public/nsIStyleSet.h +++ b/mozilla/layout/base/public/nsIStyleSet.h @@ -70,7 +70,7 @@ public: nsIStyleContext* aParentContext, PRBool aForceUnique = PR_FALSE) = 0; - // get a style context for a pseudo-frame (ie: tag = NS_NewAtom(":FIRST-LINE"); + // get a style context for a pseudo-frame (ie: tag = NS_NewAtom(":first-line"); virtual nsIStyleContext* ResolvePseudoStyleFor(nsIPresContext* aPresContext, nsIContent* aParentContent, nsIAtom* aPseudoTag, diff --git a/mozilla/layout/base/public/nsPresContext.h b/mozilla/layout/base/public/nsPresContext.h index 51a9eef7e20..c6b6f1b9be4 100644 --- a/mozilla/layout/base/public/nsPresContext.h +++ b/mozilla/layout/base/public/nsPresContext.h @@ -107,8 +107,8 @@ public: /** * Resolve style for a pseudo frame within the given aParentContent & aParentContext. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ NS_IMETHOD ResolvePseudoStyleContextFor(nsIContent* aParentContent, nsIAtom* aPseudoTag, @@ -119,8 +119,8 @@ public: /** * Probe style for a pseudo frame within the given aParentContent & aParentContext. * This will return nsnull id there are no explicit rules for the pseudo element. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ virtual nsIStyleContext* ProbePseudoStyleContextFor(nsIContent* aParentContent, nsIAtom* aPseudoTag, diff --git a/mozilla/layout/base/src/nsLayoutAtoms.cpp b/mozilla/layout/base/src/nsLayoutAtoms.cpp index 2da737bd0db..862a3989b2e 100644 --- a/mozilla/layout/base/src/nsLayoutAtoms.cpp +++ b/mozilla/layout/base/src/nsLayoutAtoms.cpp @@ -75,7 +75,7 @@ void nsLayoutAtoms::AddrefAtoms() commentTagName = NS_NewAtom("__moz_comment"); textTagName = NS_NewAtom("__moz_text"); - viewportPseudo = NS_NewAtom(":-MOZ-VIEWPORT"); // XXX lower case + viewportPseudo = NS_NewAtom(":-moz-viewport"); } ++gRefCnt; } diff --git a/mozilla/layout/base/src/nsNameSpaceManager.cpp b/mozilla/layout/base/src/nsNameSpaceManager.cpp index fb22515f270..1c9a9357485 100644 --- a/mozilla/layout/base/src/nsNameSpaceManager.cpp +++ b/mozilla/layout/base/src/nsNameSpaceManager.cpp @@ -244,7 +244,7 @@ public: PRUnichar ch; while ((ch = *string++) != 0) { // FYI: hash = hash*37 + ch - ch = nsCRT::ToUpper(ch); + ch = nsCRT::ToLower(ch); hash = ((hash << 5) + (hash << 2) + hash) + ch; } return hash; @@ -261,7 +261,7 @@ public: const nsString* other = ((const NameSpaceURIKey*)aKey)->mString; if (nsnull != mString) { if (nsnull != other) { - return mString->EqualsIgnoreCase(*other); // XXX case sensative? + return mString->EqualsIgnoreCase(*other); // XXX case sensitive? } return PR_FALSE; } diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 5587a8c3329..481db6672c4 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -306,7 +306,7 @@ NS_IMETHODIMP nsComboboxControlFrame::Reflow(nsIPresContext& aPresConte //nsIFrame* childFrame; if (1 == numChildren) { - nsIAtom * textBlockContentPseudo = NS_NewAtom(":COMBOBOX-TEXT"); + nsIAtom * textBlockContentPseudo = NS_NewAtom(":combobox-text"); aPresContext.ResolvePseudoStyleContextFor(mContent, textBlockContentPseudo, mStyleContext, &mBlockTextStyle); NS_RELEASE(textBlockContentPseudo); @@ -551,7 +551,7 @@ nsComboboxControlFrame::PaintComboboxControl(nsIPresContext& aPresContext, // Scrollbars //const nsStyleColor* myColor = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); - //nsIAtom * sbAtom = NS_NewAtom(":SCROLLBAR-ARROW-LOOK"); + //nsIAtom * sbAtom = NS_NewAtom(":scrollbar-arrow-look"); //nsIStyleContext* arrowStyle = aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, mStyleContext); //NS_RELEASE(sbAtom); @@ -704,15 +704,15 @@ nsComboboxControlFrame::ReResolveStyleContext(nsIPresContext* aPresContext, RefreshStyleContext(aPresContext, nsHTMLAtoms::dropDownBtnOut, mBtnOutStyleContext, mContent, mStyleContext); RefreshStyleContext(aPresContext, nsHTMLAtoms::dropDownBtnPressed, mBtnPressedStyleContext, mContent, mStyleContext); - nsIAtom * txtBlkContentPseudo = NS_NewAtom(":COMBOBOX-TEXT"); + nsIAtom * txtBlkContentPseudo = NS_NewAtom(":combobox-text"); RefreshStyleContext(aPresContext, txtBlkContentPseudo, mBlockTextStyle, mContent, mStyleContext); NS_IF_RELEASE(txtBlkContentPseudo); - nsIAtom * txtBlkSelContentPseudo = NS_NewAtom(":COMBOBOX-TEXTSELECTED"); + nsIAtom * txtBlkSelContentPseudo = NS_NewAtom(":combobox-textselected"); RefreshStyleContext(aPresContext, txtBlkSelContentPseudo, mBlockTextSelectedStyle, mContent, mStyleContext); NS_IF_RELEASE(txtBlkSelContentPseudo); - nsIAtom * txtBlkSelFocContentPseudo = NS_NewAtom(":COMBOBOX-TEXTSELECTEDFOCUS"); + nsIAtom * txtBlkSelFocContentPseudo = NS_NewAtom(":combobox-textselectedfocus"); RefreshStyleContext(aPresContext, txtBlkSelFocContentPseudo, mBlockTextSelectedFocusStyle, mContent, mStyleContext); NS_IF_RELEASE(txtBlkSelFocContentPseudo); diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index bdbfd61a485..34011f89db6 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -695,11 +695,11 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext, // Scrollbars const nsStyleColor* myColor = (const nsStyleColor*)aStyleContext->GetStyleData(eStyleStruct_Color); - nsIAtom * sbAtom = NS_NewAtom(":SCROLLBAR-LOOK"); + nsIAtom * sbAtom = NS_NewAtom(":scrollbar-look"); nsIStyleContext* scrollbarStyle; aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, aStyleContext, &scrollbarStyle); NS_RELEASE(sbAtom); - sbAtom = NS_NewAtom(":SCROLLBAR-ARROW-LOOK"); + sbAtom = NS_NewAtom(":scrollbar-arrow-look"); nsIStyleContext* arrowStyle; aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, aStyleContext, &arrowStyle); NS_RELEASE(sbAtom); diff --git a/mozilla/layout/html/base/src/nsHTMLAtoms.cpp b/mozilla/layout/html/base/src/nsHTMLAtoms.cpp index 8f3f5465f26..0823ce62bb8 100644 --- a/mozilla/layout/html/base/src/nsHTMLAtoms.cpp +++ b/mozilla/layout/html/base/src/nsHTMLAtoms.cpp @@ -271,251 +271,251 @@ static nsrefcnt gRefCnt; void nsHTMLAtoms::AddrefAtoms() { if (0 == gRefCnt) { - mozAnonymousBlock = NS_NewAtom(":MOZ-ANONYMOUS-BLOCK"); + mozAnonymousBlock = NS_NewAtom(":-moz-anonymous-block"); _baseHref = NS_NewAtom(NS_HTML_BASE_HREF); _baseTarget = NS_NewAtom(NS_HTML_BASE_TARGET); - a = NS_NewAtom("A"); - abbr = NS_NewAtom("ABBR"); - above = NS_NewAtom("ABOVE"); - accept = NS_NewAtom("ACCEPT"); - acceptcharset = NS_NewAtom("ACCEPTCHARSET"); - accesskey = NS_NewAtom("ACCESSKEY"); - action = NS_NewAtom("ACTION"); - align = NS_NewAtom("ALIGN"); - alink = NS_NewAtom("ALINK"); - alt = NS_NewAtom("ALT"); - applet = NS_NewAtom("APPLET"); - archive = NS_NewAtom("ARCHIVE"); - area = NS_NewAtom("AREA"); - axis = NS_NewAtom("AXIS"); - background = NS_NewAtom("BACKGROUND"); - below = NS_NewAtom("BELOW"); - bgcolor = NS_NewAtom("BGCOLOR"); - body = NS_NewAtom("BODY"); - border = NS_NewAtom("BORDER"); - bordercolor = NS_NewAtom("BORDERCOLOR"); - bottompadding = NS_NewAtom("BOTTOMPADDING"); - br = NS_NewAtom("BR"); - bulletPseudo = NS_NewAtom(":BULLET"); - button = NS_NewAtom("BUTTON"); - buttonContentPseudo = NS_NewAtom(":BUTTON-CONTENT"); - caption = NS_NewAtom("CAPTION"); - cellContentPseudo = NS_NewAtom(":CELL-CONTENT"); - cellpadding = NS_NewAtom("CELLPADDING"); - cellspacing = NS_NewAtom("CELLSPACING"); - ch = NS_NewAtom("CH"); - _char = NS_NewAtom("CHAR"); - charoff = NS_NewAtom("CHAROFF"); - charset = NS_NewAtom("CHARSET"); - checked = NS_NewAtom("CHECKED"); - choff = NS_NewAtom("CHOFF"); - cite = NS_NewAtom("CITE"); - kClass = NS_NewAtom("CLASS"); - classid = NS_NewAtom("CLASSID"); - clear = NS_NewAtom("CLEAR"); - clip = NS_NewAtom("CLIP"); - code = NS_NewAtom("CODE"); - codebase = NS_NewAtom("CODEBASE"); - codetype = NS_NewAtom("CODETYPE"); - color = NS_NewAtom("COLOR"); - col = NS_NewAtom("COL"); - colgroup = NS_NewAtom("COLGROUP"); - cols = NS_NewAtom("COLS"); - colspan = NS_NewAtom("COLSPAN"); - columnPseudo = NS_NewAtom(":BODY-COLUMN"); - commentPseudo = NS_NewAtom(":MOZ-COMMENT"); - compact = NS_NewAtom("COMPACT"); - content = NS_NewAtom("CONTENT"); - coords = NS_NewAtom("COORDS"); - defaultchecked = NS_NewAtom("DEFAULTCHECKED"); - defaultselected = NS_NewAtom("DEFAULTSELECTED"); - defaultvalue = NS_NewAtom("DEFAULTVALUE"); - declare = NS_NewAtom("DECLARE"); - defer = NS_NewAtom("DEFER"); - dir = NS_NewAtom("DIR"); - div = NS_NewAtom("DIV"); - disabled = NS_NewAtom("DISABLED"); - dl = NS_NewAtom("DL"); - dropDownVisible = NS_NewAtom(":DROPDOWN-VISIBLE"); - dropDownHidden = NS_NewAtom(":DROPDOWN-HIDDEN"); - dropDownBtnOut = NS_NewAtom(":DROPDOWN-BTN-OUT"); - dropDownBtnPressed = NS_NewAtom(":DROPDOWN-BTN-PRESSED"); - datetime = NS_NewAtom("DATETIME"); - data = NS_NewAtom("DATA"); - embed = NS_NewAtom("EMBED"); - encoding = NS_NewAtom("ENCODING"); - enctype = NS_NewAtom("ENCTYPE"); - face = NS_NewAtom("FACE"); - fieldset = NS_NewAtom("FIELDSET"); - fieldsetContentPseudo = NS_NewAtom(":FIELDSET-CONTENT"); - firstLetterPseudo = NS_NewAtom(":FIRST-LETTER"); - firstLinePseudo = NS_NewAtom(":FIRST-LINE"); - font = NS_NewAtom("FONT"); - fontWeight = NS_NewAtom("FONT-WEIGHT"); - _for = NS_NewAtom("FOR"); - form = NS_NewAtom("FORM"); - frame = NS_NewAtom("FRAME"); - frameborder = NS_NewAtom("FRAMEBORDER"); - frameset = NS_NewAtom("FRAMESET"); - framesetBlankPseudo = NS_NewAtom(":FRAMESET-BLANK"); - gutter = NS_NewAtom("GUTTER"); - h1 = NS_NewAtom("H1"); - h2 = NS_NewAtom("H2"); - h3 = NS_NewAtom("H3"); - h4 = NS_NewAtom("H4"); - h5 = NS_NewAtom("H5"); - h6 = NS_NewAtom("H6"); - headerContentBase = NS_NewAtom("CONTENT-BASE"); - headerContentLanguage = NS_NewAtom("CONTENT-LANGUAGE"); - headerContentScriptType = NS_NewAtom("CONTENT-SCRIPT-TYPE"); - headerContentStyleType = NS_NewAtom("CONTENT-STYLE-TYPE"); - headerContentType = NS_NewAtom("CONTENT-TYPE"); - headerDefaultStyle = NS_NewAtom("DEFAULT-STYLE"); - headerWindowTarget = NS_NewAtom("WINDOW-TARGET"); - headers = NS_NewAtom("HEADERS"); - height = NS_NewAtom("HEIGHT"); - hidden = NS_NewAtom("HIDDEN"); - horizontalFramesetBorderPseudo = NS_NewAtom(":HFRAMESET-BORDER"); - hr = NS_NewAtom("HR"); - href = NS_NewAtom("HREF"); - hreflang = NS_NewAtom("HREFLANG"); - hspace = NS_NewAtom("HSPACE"); - html = NS_NewAtom("HTML"); - httpEquiv = NS_NewAtom("HTTP-EQUIV"); - ibPseudo = NS_NewAtom(":IB-PSEUDO"); - id = NS_NewAtom("ID"); - iframe = NS_NewAtom("IFRAME"); - img = NS_NewAtom("IMG"); - index = NS_NewAtom("INDEX"); - input = NS_NewAtom("INPUT"); - ismap = NS_NewAtom("ISMAP"); - label = NS_NewAtom("LABEL"); - labelContentPseudo = NS_NewAtom(":LABEL-CONTENT"); - lang = NS_NewAtom("LANG"); - layout = NS_NewAtom("LAYOUT"); - li = NS_NewAtom("LI"); - link = NS_NewAtom("LINK"); - left = NS_NewAtom("LEFT"); - leftpadding = NS_NewAtom("LEFTPADDING"); - legend = NS_NewAtom("LEGEND"); - legendContentPseudo = NS_NewAtom(":LEGEND-CONTENT"); - length = NS_NewAtom("LENGTH"); - lowsrc = NS_NewAtom("LOWSRC"); - marginheight = NS_NewAtom("MARGINHEIGHT"); - marginwidth = NS_NewAtom("MARGINWIDTH"); - maxlength = NS_NewAtom("MAXLENGTH"); - mayscript = NS_NewAtom("MAYSCRIPT"); - media = NS_NewAtom("MEDIA"); - menu = NS_NewAtom("MENU"); - method = NS_NewAtom("METHOD"); - multicol = NS_NewAtom("MULTICOL"); - multiple = NS_NewAtom("MULTIPLE"); - name = NS_NewAtom("NAME"); - nohref = NS_NewAtom("NOHREF"); - noresize = NS_NewAtom("NORESIZE"); - noshade = NS_NewAtom("NOSHADE"); - nowrap = NS_NewAtom("NOWRAP"); - object = NS_NewAtom("OBJECT"); - ol = NS_NewAtom("OL"); - onabort = NS_NewAtom("ONABORT"); - onblur = NS_NewAtom("ONBLUR"); - onchange = NS_NewAtom("ONCHANGE"); - onclick = NS_NewAtom("ONCLICK"); - ondragdrop = NS_NewAtom("ONDBLCLICK"); - ondragdrop = NS_NewAtom("ONDRAGDROP"); - onerror = NS_NewAtom("ONERROR"); - onfocus = NS_NewAtom("ONFOCUS"); - onkeydown = NS_NewAtom("ONKEYDOWN"); - onkeypress = NS_NewAtom("ONKEYPRESS"); - onkeyup = NS_NewAtom("ONKEYUP"); - onload = NS_NewAtom("ONLOAD"); - onmousedown = NS_NewAtom("ONMOUSEDOWN"); - onmousemove = NS_NewAtom("ONMOUSEMOVE"); - onmouseover = NS_NewAtom("ONMOUSEOVER"); - onmouseout = NS_NewAtom("ONMOUSEOUT"); - onmouseup = NS_NewAtom("ONMOUSEUP"); - onpaint = NS_NewAtom("ONPAINT"); - onreset = NS_NewAtom("ONRESET"); - onsubmit = NS_NewAtom("ONSUBMIT"); - onunload = NS_NewAtom("ONUNLOAD"); - overflow = NS_NewAtom("OVERFLOW"); - p = NS_NewAtom("P"); - pagex = NS_NewAtom("PAGEX"); - pagey = NS_NewAtom("PAGEY"); - param = NS_NewAtom("PARAM"); - placeholderPseudo = NS_NewAtom(":PLACEHOLDER-FRAME"); - pointSize = NS_NewAtom("POINT-SIZE"); - pre = NS_NewAtom("PRE"); - profile = NS_NewAtom("PROFILE"); - prompt = NS_NewAtom("PROMPT"); - readonly = NS_NewAtom("READONLY"); - rel = NS_NewAtom("REL"); - repeat = NS_NewAtom("REPEAT"); - rev = NS_NewAtom("REV"); - rightpadding = NS_NewAtom("RIGHTPADDING"); - rootPseudo = NS_NewAtom(":ROOT"); - rows = NS_NewAtom("ROWS"); - rowspan = NS_NewAtom("ROWSPAN"); - rules = NS_NewAtom("RULES"); - scheme = NS_NewAtom("SCHEME"); - scope = NS_NewAtom("SCOPE"); - script = NS_NewAtom("SCRIPT"); - scrolledContentPseudo = NS_NewAtom(":SCROLLED-CONTENT"); - scrolling = NS_NewAtom("SCROLLING"); - select = NS_NewAtom("SELECT"); - selected = NS_NewAtom("SELECTED"); - selectedindex = NS_NewAtom("SELECTEDINDEX"); - shape = NS_NewAtom("SHAPE"); - size = NS_NewAtom("SIZE"); - spacer = NS_NewAtom("SPACER"); - span = NS_NewAtom("SPAN"); - src = NS_NewAtom("SRC"); - standby = NS_NewAtom("STANDBY"); - start = NS_NewAtom("START"); - style = NS_NewAtom("STYLE"); - summary = NS_NewAtom("SUMMARY"); - suppress = NS_NewAtom("SUPPRESS"); - tabindex = NS_NewAtom("TABINDEX"); - table = NS_NewAtom("TABLE"); - tablePseudo = NS_NewAtom(":TABLE"); - tableCellPseudo = NS_NewAtom(":TABLE-CELL"); - tableColGroupPseudo = NS_NewAtom(":TABLE-COLUMN-GROUP"); - tableColPseudo = NS_NewAtom(":TABLE-COLUMN"); - tableOuterPseudo = NS_NewAtom(":TABLE-OUTER"); - tableRowGroupPseudo = NS_NewAtom(":TABLE-ROW-GROUP"); - tableRowPseudo = NS_NewAtom(":TABLE-ROW"); - tabstop = NS_NewAtom("TABSTOP"); - target = NS_NewAtom("TARGET"); - tbody = NS_NewAtom("TBODY"); - td = NS_NewAtom("TD"); - tfoot = NS_NewAtom("TFOOT"); - thead = NS_NewAtom("THEAD"); - text = NS_NewAtom("TEXT"); - textarea = NS_NewAtom("TEXTAREA"); - textPseudo = NS_NewAtom(":MOZ-TEXT"); - th = NS_NewAtom("TH"); - title = NS_NewAtom("TITLE"); - top = NS_NewAtom("TOP"); - toppadding = NS_NewAtom("TOPPADDING"); - tr = NS_NewAtom("TR"); - type = NS_NewAtom("TYPE"); - ul = NS_NewAtom("UL"); - usemap = NS_NewAtom("USEMAP"); - valign = NS_NewAtom("VALIGN"); - value = NS_NewAtom("VALUE"); - valuetype = NS_NewAtom("VALUETYPE"); - variable = NS_NewAtom("VARIABLE"); - version = NS_NewAtom("VERSION"); - verticalFramesetBorderPseudo = NS_NewAtom(":VFRAMESET-BORDER"); - visibility = NS_NewAtom("VISIBILITY"); - vlink = NS_NewAtom("VLINK"); - vspace = NS_NewAtom("VSPACE"); - wbr = NS_NewAtom("WBR"); - width = NS_NewAtom("WIDTH"); - wrap = NS_NewAtom("WRAP"); - wrappedFramePseudo = NS_NewAtom(":WRAPPED-FRAME"); - zindex = NS_NewAtom("ZINDEX"); + a = NS_NewAtom("a"); + abbr = NS_NewAtom("abbr"); + above = NS_NewAtom("above"); + accept = NS_NewAtom("accept"); + acceptcharset = NS_NewAtom("acceptcharset"); + accesskey = NS_NewAtom("accesskey"); + action = NS_NewAtom("action"); + align = NS_NewAtom("align"); + alink = NS_NewAtom("alink"); + alt = NS_NewAtom("alt"); + applet = NS_NewAtom("applet"); + archive = NS_NewAtom("archive"); + area = NS_NewAtom("area"); + axis = NS_NewAtom("axis"); + background = NS_NewAtom("background"); + below = NS_NewAtom("below"); + bgcolor = NS_NewAtom("bgcolor"); + body = NS_NewAtom("body"); + border = NS_NewAtom("border"); + bordercolor = NS_NewAtom("bordercolor"); + bottompadding = NS_NewAtom("bottompadding"); + br = NS_NewAtom("br"); + bulletPseudo = NS_NewAtom(":bullet"); + button = NS_NewAtom("button"); + buttonContentPseudo = NS_NewAtom(":button-content"); + caption = NS_NewAtom("caption"); + cellContentPseudo = NS_NewAtom(":cell-content"); + cellpadding = NS_NewAtom("cellpadding"); + cellspacing = NS_NewAtom("cellspacing"); + ch = NS_NewAtom("ch"); + _char = NS_NewAtom("char"); + charoff = NS_NewAtom("charoff"); + charset = NS_NewAtom("charset"); + checked = NS_NewAtom("checked"); + choff = NS_NewAtom("choff"); + cite = NS_NewAtom("cite"); + kClass = NS_NewAtom("class"); + classid = NS_NewAtom("classid"); + clear = NS_NewAtom("clear"); + clip = NS_NewAtom("clip"); + code = NS_NewAtom("code"); + codebase = NS_NewAtom("codebase"); + codetype = NS_NewAtom("codetype"); + color = NS_NewAtom("color"); + col = NS_NewAtom("col"); + colgroup = NS_NewAtom("colgroup"); + cols = NS_NewAtom("cols"); + colspan = NS_NewAtom("colspan"); + columnPseudo = NS_NewAtom(":body-column"); + commentPseudo = NS_NewAtom(":-moz-comment"); + compact = NS_NewAtom("compact"); + content = NS_NewAtom("content"); + coords = NS_NewAtom("coords"); + defaultchecked = NS_NewAtom("defaultchecked"); + defaultselected = NS_NewAtom("defaultselected"); + defaultvalue = NS_NewAtom("defaultvalue"); + declare = NS_NewAtom("declare"); + defer = NS_NewAtom("defer"); + dir = NS_NewAtom("dir"); + div = NS_NewAtom("div"); + disabled = NS_NewAtom("disabled"); + dl = NS_NewAtom("dl"); + dropDownVisible = NS_NewAtom(":dropdown-visible"); + dropDownHidden = NS_NewAtom(":dropdown-hidden"); + dropDownBtnOut = NS_NewAtom(":dropdown-btn-out"); + dropDownBtnPressed = NS_NewAtom(":dropdown-btn-pressed"); + datetime = NS_NewAtom("datetime"); + data = NS_NewAtom("data"); + embed = NS_NewAtom("embed"); + encoding = NS_NewAtom("encoding"); + enctype = NS_NewAtom("enctype"); + face = NS_NewAtom("face"); + fieldset = NS_NewAtom("fieldset"); + fieldsetContentPseudo = NS_NewAtom(":fieldset-content"); + firstLetterPseudo = NS_NewAtom(":first-letter"); + firstLinePseudo = NS_NewAtom(":first-line"); + font = NS_NewAtom("font"); + fontWeight = NS_NewAtom("font-weight"); + _for = NS_NewAtom("for"); + form = NS_NewAtom("form"); + frame = NS_NewAtom("frame"); + frameborder = NS_NewAtom("frameborder"); + frameset = NS_NewAtom("frameset"); + framesetBlankPseudo = NS_NewAtom(":frameset-blank"); + gutter = NS_NewAtom("gutter"); + h1 = NS_NewAtom("h1"); + h2 = NS_NewAtom("h2"); + h3 = NS_NewAtom("h3"); + h4 = NS_NewAtom("h4"); + h5 = NS_NewAtom("h5"); + h6 = NS_NewAtom("h6"); + headerContentBase = NS_NewAtom("content-base"); + headerContentLanguage = NS_NewAtom("content-language"); + headerContentScriptType = NS_NewAtom("content-script-type"); + headerContentStyleType = NS_NewAtom("content-style-type"); + headerContentType = NS_NewAtom("content-type"); + headerDefaultStyle = NS_NewAtom("default-style"); + headerWindowTarget = NS_NewAtom("window-target"); + headers = NS_NewAtom("headers"); + height = NS_NewAtom("height"); + hidden = NS_NewAtom("hidden"); + horizontalFramesetBorderPseudo = NS_NewAtom(":hframeset-border"); + hr = NS_NewAtom("hr"); + href = NS_NewAtom("href"); + hreflang = NS_NewAtom("hreflang"); + hspace = NS_NewAtom("hspace"); + html = NS_NewAtom("html"); + httpEquiv = NS_NewAtom("http-equiv"); + ibPseudo = NS_NewAtom(":ib-pseudo"); + id = NS_NewAtom("id"); + iframe = NS_NewAtom("iframe"); + img = NS_NewAtom("img"); + index = NS_NewAtom("index"); + input = NS_NewAtom("input"); + ismap = NS_NewAtom("ismap"); + label = NS_NewAtom("label"); + labelContentPseudo = NS_NewAtom(":label-content"); + lang = NS_NewAtom("lang"); + layout = NS_NewAtom("layout"); + li = NS_NewAtom("li"); + link = NS_NewAtom("link"); + left = NS_NewAtom("left"); + leftpadding = NS_NewAtom("leftpadding"); + legend = NS_NewAtom("legend"); + legendContentPseudo = NS_NewAtom(":legend-content"); + length = NS_NewAtom("length"); + lowsrc = NS_NewAtom("lowsrc"); + marginheight = NS_NewAtom("marginheight"); + marginwidth = NS_NewAtom("marginwidth"); + maxlength = NS_NewAtom("maxlength"); + mayscript = NS_NewAtom("mayscript"); + media = NS_NewAtom("media"); + menu = NS_NewAtom("menu"); + method = NS_NewAtom("method"); + multicol = NS_NewAtom("multicol"); + multiple = NS_NewAtom("multiple"); + name = NS_NewAtom("name"); + nohref = NS_NewAtom("nohref"); + noresize = NS_NewAtom("noresize"); + noshade = NS_NewAtom("noshade"); + nowrap = NS_NewAtom("nowrap"); + object = NS_NewAtom("object"); + ol = NS_NewAtom("ol"); + onabort = NS_NewAtom("onabort"); + onblur = NS_NewAtom("onblur"); + onchange = NS_NewAtom("onchange"); + onclick = NS_NewAtom("onclick"); + ondragdrop = NS_NewAtom("ondblclick"); + ondragdrop = NS_NewAtom("ondragdrop"); + onerror = NS_NewAtom("onerror"); + onfocus = NS_NewAtom("onfocus"); + onkeydown = NS_NewAtom("onkeydown"); + onkeypress = NS_NewAtom("onkeypress"); + onkeyup = NS_NewAtom("onkeyup"); + onload = NS_NewAtom("onload"); + onmousedown = NS_NewAtom("onmousedown"); + onmousemove = NS_NewAtom("onmousemove"); + onmouseover = NS_NewAtom("onmouseover"); + onmouseout = NS_NewAtom("onmouseout"); + onmouseup = NS_NewAtom("onmouseup"); + onpaint = NS_NewAtom("onpaint"); + onreset = NS_NewAtom("onreset"); + onsubmit = NS_NewAtom("onsubmit"); + onunload = NS_NewAtom("onunload"); + overflow = NS_NewAtom("overflow"); + p = NS_NewAtom("p"); + pagex = NS_NewAtom("pagex"); + pagey = NS_NewAtom("pagey"); + param = NS_NewAtom("param"); + placeholderPseudo = NS_NewAtom(":placeholder-frame"); + pointSize = NS_NewAtom("point-size"); + pre = NS_NewAtom("pre"); + profile = NS_NewAtom("profile"); + prompt = NS_NewAtom("prompt"); + readonly = NS_NewAtom("readonly"); + rel = NS_NewAtom("rel"); + repeat = NS_NewAtom("repeat"); + rev = NS_NewAtom("rev"); + rightpadding = NS_NewAtom("rightpadding"); + rootPseudo = NS_NewAtom(":root"); + rows = NS_NewAtom("rows"); + rowspan = NS_NewAtom("rowspan"); + rules = NS_NewAtom("rules"); + scheme = NS_NewAtom("scheme"); + scope = NS_NewAtom("scope"); + script = NS_NewAtom("script"); + scrolledContentPseudo = NS_NewAtom(":scrolled-content"); + scrolling = NS_NewAtom("scrolling"); + select = NS_NewAtom("select"); + selected = NS_NewAtom("selected"); + selectedindex = NS_NewAtom("selectedindex"); + shape = NS_NewAtom("shape"); + size = NS_NewAtom("size"); + spacer = NS_NewAtom("spacer"); + span = NS_NewAtom("span"); + src = NS_NewAtom("src"); + standby = NS_NewAtom("standby"); + start = NS_NewAtom("start"); + style = NS_NewAtom("style"); + summary = NS_NewAtom("summary"); + suppress = NS_NewAtom("suppress"); + tabindex = NS_NewAtom("tabindex"); + table = NS_NewAtom("table"); + tablePseudo = NS_NewAtom(":table"); + tableCellPseudo = NS_NewAtom(":table-cell"); + tableColGroupPseudo = NS_NewAtom(":table-column-group"); + tableColPseudo = NS_NewAtom(":table-column"); + tableOuterPseudo = NS_NewAtom(":table-outer"); + tableRowGroupPseudo = NS_NewAtom(":table-row-group"); + tableRowPseudo = NS_NewAtom(":table-row"); + tabstop = NS_NewAtom("tabstop"); + target = NS_NewAtom("target"); + tbody = NS_NewAtom("tbody"); + td = NS_NewAtom("td"); + tfoot = NS_NewAtom("tfoot"); + thead = NS_NewAtom("thead"); + text = NS_NewAtom("text"); + textarea = NS_NewAtom("textarea"); + textPseudo = NS_NewAtom(":-moz-text"); + th = NS_NewAtom("th"); + title = NS_NewAtom("title"); + top = NS_NewAtom("top"); + toppadding = NS_NewAtom("toppadding"); + tr = NS_NewAtom("tr"); + type = NS_NewAtom("type"); + ul = NS_NewAtom("ul"); + usemap = NS_NewAtom("usemap"); + valign = NS_NewAtom("valign"); + value = NS_NewAtom("value"); + valuetype = NS_NewAtom("valuetype"); + variable = NS_NewAtom("variable"); + version = NS_NewAtom("version"); + verticalFramesetBorderPseudo = NS_NewAtom(":vframeset-border"); + visibility = NS_NewAtom("visibility"); + vlink = NS_NewAtom("vlink"); + vspace = NS_NewAtom("vspace"); + wbr = NS_NewAtom("wbr"); + width = NS_NewAtom("width"); + wrap = NS_NewAtom("wrap"); + wrappedFramePseudo = NS_NewAtom(":wrapped-frame"); + zindex = NS_NewAtom("zindex"); } ++gRefCnt; } diff --git a/mozilla/layout/html/base/src/nsHTMLAtoms.h b/mozilla/layout/html/base/src/nsHTMLAtoms.h index 2a1bbd1da1d..2800a85a0fb 100644 --- a/mozilla/layout/html/base/src/nsHTMLAtoms.h +++ b/mozilla/layout/html/base/src/nsHTMLAtoms.h @@ -20,8 +20,8 @@ #include "nsIAtom.h" -#define NS_HTML_BASE_HREF "_BASE_HREF" -#define NS_HTML_BASE_TARGET "_BASE_TARGET" +#define NS_HTML_BASE_HREF "_base_href" +#define NS_HTML_BASE_TARGET "_base_target" /** * This class wraps up the creation (and destruction) of the standard diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp index b4c99a822d3..3f71887bf00 100644 --- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp @@ -456,9 +456,9 @@ nsGenericHTMLElement::ParseAttributeString(const nsString& aStr, PRInt32& aNameSpaceID) { // XXX need to validate/strip namespace prefix - nsAutoString upper; - aStr.ToUpperCase(upper); - aName = NS_NewAtom(upper); + nsAutoString lower; + aStr.ToLowerCase(lower); + aName = NS_NewAtom(lower); aNameSpaceID = kNameSpaceID_HTML; return NS_OK; diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index ad6ccb4f4fd..665842e1935 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -483,7 +483,7 @@ AddAttributes(const nsIParserNode& aNode, const nsString& key = aNode.GetKeyAt(i); k.Truncate(); k.Append(key); - k.ToUpperCase(); + k.ToLowerCase(); nsIAtom* keyAtom = NS_NewAtom(k); nsHTMLValue value; @@ -774,7 +774,7 @@ CreateContentObject(const nsIParserNode& aNode, nsAutoString tmp; if (eHTMLTag_userdefined == aNodeType) { tmp.Append(aNode.GetText()); - tmp.ToUpperCase(); + tmp.ToLowerCase(); } else { tmp.Append(NS_EnumToTag(aNodeType)); @@ -867,7 +867,7 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, const nsString& aTag) { // Find tag in tag table nsAutoString tmp(aTag); - tmp.ToUpperCase(); + tmp.ToLowerCase(); char cbuf[20]; tmp.ToCString(cbuf, sizeof(cbuf)); nsHTMLTag id = NS_TagToEnum(cbuf); @@ -1434,7 +1434,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, mDocument->SetRootContent(mRoot); // Make head part - nsIAtom* atom = NS_NewAtom("HEAD"); + nsIAtom* atom = NS_NewAtom("head"); if (nsnull == atom) { return NS_ERROR_OUT_OF_MEMORY; } @@ -1617,7 +1617,7 @@ HTMLContentSink::SetTitle(const nsString& aValue) mTitle->CompressWhitespace(PR_TRUE, PR_TRUE); mHTMLDocument->SetTitle(*mTitle); - nsIAtom* atom = NS_NewAtom("TITLE"); + nsIAtom* atom = NS_NewAtom("title"); nsIHTMLContent* it = nsnull; nsresult rv = NS_NewHTMLTitleElement(&it, atom); if (NS_OK == rv) { @@ -1745,7 +1745,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode) NS_IF_RELEASE(mCurrentForm); // set the current form - nsAutoString tmp("FORM"); + nsAutoString tmp("form"); nsIAtom* atom = NS_NewAtom(tmp); nsIHTMLContent* iContent = nsnull; nsresult rv = NS_NewHTMLFormElement(&iContent, atom); @@ -2572,7 +2572,7 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode) if (nsnull != mHead) { // Create content object - nsAutoString tmp("META"); + nsAutoString tmp("meta"); nsIAtom* atom = NS_NewAtom(tmp); if (nsnull == atom) { return NS_ERROR_OUT_OF_MEMORY; @@ -2620,7 +2620,7 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode) delete value; } - header.ToUpperCase(); + header.ToLowerCase(); nsIAtom* fieldAtom = NS_NewAtom(header); mDocument->SetHeaderData(fieldAtom, result); diff --git a/mozilla/layout/html/document/src/nsImageDocument.cpp b/mozilla/layout/html/document/src/nsImageDocument.cpp index db5f8976755..aed5e1dbfa2 100644 --- a/mozilla/layout/html/document/src/nsImageDocument.cpp +++ b/mozilla/layout/html/document/src/nsImageDocument.cpp @@ -271,7 +271,7 @@ nsImageDocument::CreateSyntheticDocument() body->SetDocument(this, PR_FALSE); nsIHTMLContent* center; - nsIAtom* centerAtom = NS_NewAtom("P"); + nsIAtom* centerAtom = NS_NewAtom("p"); rv = NS_NewHTMLParagraphElement(¢er, centerAtom); NS_RELEASE(centerAtom); if (NS_OK != rv) { @@ -280,7 +280,7 @@ nsImageDocument::CreateSyntheticDocument() center->SetDocument(this, PR_FALSE); nsIHTMLContent* image; - nsIAtom* imgAtom = NS_NewAtom("IMG"); + nsIAtom* imgAtom = NS_NewAtom("img"); rv = NS_NewHTMLImageElement(&image, imgAtom); NS_RELEASE(imgAtom); if (NS_OK != rv) { diff --git a/mozilla/layout/html/document/src/ua.css b/mozilla/layout/html/document/src/ua.css index 6948b6d6f1d..2b361bfd7ab 100644 --- a/mozilla/layout/html/document/src/ua.css +++ b/mozilla/layout/html/document/src/ua.css @@ -15,98 +15,98 @@ * Reserved. */ -HTML { +html { display: block; } -BODY { +body { display: block; line-height: normal; margin: 8px; } -FRAMESET { +frameset { overflow: hidden; } -/* Blocks */ +/* blocks */ -P { +p { display: block; margin-bottom: auto; margin-top: auto; } -ADDRESS { +address { display: block; font-style: italic; margin-bottom: 0; margin-top: 0; } -BLOCKQUOTE { +blockquote { display: block; margin-left: 40px; margin-right: 40px; margin-top: auto; margin-bottom: auto; } -CENTER { +center { display: block; text-align: center; margin-bottom: 0; margin-top: 0; } -DIV { +div { display: block; margin-bottom: 0; margin-top: 0; } -H1 { +h1 { display: block; font-size: xx-large; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H2 { +h2 { display: block; font-size: x-large; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H3 { +h3 { display: block; font-size: large; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H4 { +h4 { display: block; font-size: medium; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H5 { +h5 { display: block; font-size: small; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H6 { +h6 { display: block; font-size: x-small; font-weight: bold; margin-bottom: auto; margin-top: auto; } -LAYER { +layer { display: block; position: absolute; } -LISTING { +listing { display: block; font-family: monospace; font-size: medium; @@ -114,191 +114,191 @@ LISTING { margin-bottom: auto; margin-top: auto; } -PLAINTEXT, XMP, PRE { +plaintext, xmp, pre { display: block; font-family: monospace; white-space: pre; margin-bottom: auto; margin-top: auto; } -MULTICOL { +multicol { display: block; margin-bottom: auto; margin-top: auto; } -/* Tables */ +/* tables */ -TABLE { +table { display: table; /* border-style: outset; */ - border-color: #C0C0C0; + border-color: #c0c0c0; cell-spacing: 2px; cell-padding: 2px; margin-top: 0; margin-bottom: 0; background: transparent; } -TD, TH { +td, th { vertical-align: inherit; background: inherit; text-align: left; /* border-style: inset; */ - border-color: #C0C0C0; + border-color: #c0c0c0; display: table-cell; } -TH { +th { font-weight: bold; text-align: center; } -CAPTION { +caption { text-align: center; display: table-caption; } -TR { +tr { display: table-row; vertical-align: inherit; background: inherit; } -TBODY { +tbody { display: table-row-group; vertical-align: middle; background: inherit; } -THEAD { +thead { display: table-header-group; vertical-align: middle; background: inherit; } -TFOOT { +tfoot { display: table-footer-group; vertical-align: middle; background: inherit; } -COL { +col { display: table-column; } -COLGROUP { +colgroup { display: table-column-group; } -/* Spans */ +/* spans */ -A:link { +a:link { display: inline; color: blue; text-decoration: underline; cursor: pointer; } -A:visited { +a:visited { display: inline; color: purple; text-decoration: underline; cursor: pointer; } -A:active { +a:active { display: inline; color: lime; text-decoration: underline; cursor: pointer; } -A:out-of-date { +a:out-of-date { display: inline; color: red; text-decoration: underline; cursor: pointer; } -A:link IMG { +a:link img { display: inline; border: 2px solid blue; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -A:visited IMG { +a:visited img { display: inline; border: 2px solid purple; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -A:active IMG { +a:active img { display: inline; border: 2px solid lime; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -A:out-of-date IMG { +a:out-of-date img { display: inline; border: 2px solid red; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -B, STRONG { +b, strong { display: inline; font-weight: bolder; } -I, CITE, EM, VAR { +i, cite, em, var { display: inline; font-style: italic; } -TT, CODE, KBD, SAMP { +tt, code, kbd, samp { display: inline; font-family: monospace; } -U { +u { display: inline; text-decoration: underline; } -S, STRIKE { +s, strike { display: inline; text-decoration: line-through; } -BLINK { +blink { display: inline; text-decoration: blink; } -BIG { +big { display: inline; font-size: larger; } -SMALL { +small { display: inline; font-size: smaller; } -ABBR, ACRONYM, DEL, DFN, INS, Q, SPAN { +abbr, acronym, del, dfn, ins, q, span { display: inline; } -INS { text-decoration: underline; } -DEL { text-decoration: line-through; } -DFN { font-style: italic; } -SUB { +ins { text-decoration: underline; } +del { text-decoration: line-through; } +dfn { font-style: italic; } +sub { display: inline; vertical-align: sub; font-size: smaller; } -SUP { +sup { display: inline; vertical-align: super; font-size: smaller; } -ILAYER { +ilayer { position: absolute; display: inline; } -NOBR { +nobr { display: inline; white-space: nowrap; } -LEGEND { +legend { display: inline; padding-left: 2px; padding-right: 2px; border: 2px solid black; } -FIELDSET { +fieldset { display: block; border: 2px solid black; padding: 4px; @@ -306,14 +306,14 @@ FIELDSET { margin-right: 2px; } -/* Lists */ +/* lists */ -:BULLET { +:bullet { display: inline; margin-right: 8px; } -UL, MENU, DIR { +ul, menu, dir { display: block; margin-right: 0; margin-bottom: auto; @@ -322,7 +322,7 @@ UL, MENU, DIR { margin-left: 40px; } -OL { +ol { display: block; margin-right: 0; margin-bottom: auto; @@ -331,111 +331,111 @@ OL { margin-left: 40px; } -LI { +li { display: list-item; list-style-position: inside; } -UL LI, OL LI, MENU LI, DIR LI { +ul li, ol li, menu li, dir li { list-style-position: outside; } -/* Nested lists have no top/bottom margins */ -UL UL, UL OL, UL MENU, UL DIR, -MENU UL, MENU OL, MENU MENU, MENU DIR, -DIR UL, DIR OL, DIR MENU, DIR DIR, -OL UL, OL OL, OL MENU, OL DIR +/* nested lists have no top/bottom margins */ +ul ul, ul ol, ul menu, ul dir, +menu ul, menu ol, menu menu, menu dir, +dir ul, dir ol, dir menu, dir dir, +ol ul, ol ol, ol menu, ol dir { margin-top: 0; margin-bottom: 0; } /* 2 deep unordered lists use a circle */ -OL UL, UL UL, MENU UL, DIR UL, -OL MENU, UL MENU, MENU MENU, DIR MENU, -OL DIR, UL DIR, MENU DIR, DIR DIR +ol ul, ul ul, menu ul, dir ul, +ol menu, ul menu, menu menu, dir menu, +ol dir, ul dir, menu dir, dir dir { list-style-type: circle; } /* 3 deep (or more) unordered lists use a square */ -OL OL UL, OL UL UL, OL MENU UL, OL DIR UL, -OL OL MENU, OL UL MENU, OL MENU MENU, OL DIR MENU, -OL OL DIR, OL UL DIR, OL MENU DIR, OL DIR DIR, +ol ol ul, ol ul ul, ol menu ul, ol dir ul, +ol ol menu, ol ul menu, ol menu menu, ol dir menu, +ol ol dir, ol ul dir, ol menu dir, ol dir dir, -UL OL UL, UL UL UL, UL MENU UL, UL DIR UL, -UL OL MENU, UL UL MENU, UL MENU MENU, UL DIR MENU, -UL OL DIR, UL UL DIR, UL MENU DIR, UL DIR DIR, +ul ol ul, ul ul ul, ul menu ul, ul dir ul, +ul ol menu, ul ul menu, ul menu menu, ul dir menu, +ul ol dir, ul ul dir, ul menu dir, ul dir dir, -MENU OL UL, MENU UL UL, MENU MENU UL, MENU DIR UL, -MENU OL MENU, MENU UL MENU, MENU MENU MENU, MENU DIR MENU, -MENU OL DIR, MENU UL DIR, MENU MENU DIR, MENU DIR DIR, +menu ol ul, menu ul ul, menu menu ul, menu dir ul, +menu ol menu, menu ul menu, menu menu menu, menu dir menu, +menu ol dir, menu ul dir, menu menu dir, menu dir dir, -DIR OL UL, DIR UL UL, DIR MENU UL, DIR DIR UL, -DIR OL MENU, DIR UL MENU, DIR MENU MENU, DIR DIR MENU, -DIR OL DIR, DIR UL DIR, DIR MENU DIR, DIR DIR DIR +dir ol ul, dir ul ul, dir menu ul, dir dir ul, +dir ol menu, dir ul menu, dir menu menu, dir dir menu, +dir ol dir, dir ul dir, dir menu dir, dir dir dir { list-style-type: square; } -DL { +dl { display: block; margin-bottom: auto; margin-top: auto; } -DT { +dt { display: block; } -DD { +dd { display: block; margin-left: 40px; } -/* Leafs */ +/* leafs */ -EMBED { +embed { display: inline; } -HR { +hr { display: block; margin-top: 0; margin-bottom: 0; text-align: center; border: 1px -moz-bg-inset; } -BR { +br { display: inline; color: cyan; } -IMG { +img { display: inline; font-family: sans-serif; font-size: 8.5pt; } -SPACER { +spacer { display: inline; } -WBR { +wbr { display: inline; } -IFRAME { +iframe { display: inline; border: 2px solid black; } -INPUT { +input { vertical-align: bottom; border: 2px inset rgb(192, 192, 192); background-color: white; color: black; } -INPUT[type=radio] { +input[type=radio] { border: 2px inset rgb(192, 192, 192); background-color:white; color:black; width:12px; height:12px; } -INPUT[type=checkbox] { +input[type=checkbox] { border: 2px inset rgb(192, 192, 192); width:11px; height:11px; @@ -443,80 +443,80 @@ INPUT[type=checkbox] { color:black; } -INPUT[type=button] { +input[type=button] { border: 2px outset rgb(192, 192, 192); color:black; background-color: rgb(192, 192, 192); } -INPUT[type=submit] { +input[type=submit] { border: 1px outset rgb(156, 154, 156); background-color:rgb(206, 207, 206); color:black; } -INPUT[type=submit].ROLLOVER { +input[type=submit].rollover { } -INPUT[type=submit].PRESSED { +input[type=submit].pressed { border-style : inset; } -INPUT[type=submit].DISABLED { +input[type=submit].disabled { border-style : solid; } -INPUT[type=reset] { +input[type=reset] { border: 1px outset rgb(156, 154, 156); background-color:rgb(206, 207, 206); color:black; } -INPUT[type=reset].ROLLOVER { +input[type=reset].rollover { } -INPUT[type=reset].PRESSED { +input[type=reset].pressed { border-style : inset; } -INPUT[type=reset].DISABLED { +input[type=reset].disabled { border-style : solid; } -INPUT[type=file] { +input[type=file] { border: 1px outset rgb(156, 154, 156); background-color:rgb(206, 207, 206); color:black; } -INPUT[type=file].ROLLOVER { +input[type=file].rollover { } -INPUT[type=file].PRESSED { +input[type=file].pressed { border-style : inset; } -INPUT[type=file].DISABLED { +input[type=file].disabled { border-style : solid; } -:BUTTON-OUTLINE { +:button-outline { border: 1px solid black; } -:BUTTON-FOCUS { +:button-focus { border: 2px solid salmon; } -INPUT[type=text] { +input[type=text] { border: 2px inset rgb(192, 192, 192); margin-right:10px; background-color: white; color: black; } -INPUT[type=password] { +input[type=password] { border: 2px inset rgb(192, 192, 192); margin-right:10px; background-color: white; @@ -524,19 +524,19 @@ INPUT[type=password] { } -LABEL { +label { display: inline; vertical-align: bottom; background-color: white; padding-left: 3px; padding-right: 3px; } -BUTTON { +button { display: inline; vertical-align: bottom; cursor: default; } -BUTTON { +button { display: inline; vertical-align: bottom; /*background-color: white; */ @@ -547,117 +547,117 @@ BUTTON { padding: 2px; cursor: default; } -BUTTON.ROLLOVER { +button.rollover { border: 2px outset rgb(192,192,192); } -BUTTON.DISABLED { +button.disabled { border: 2px solid rgb(192,192,192); color: rgb(225,225,225); } -SELECT { +select { vertical-align: bottom; - border: 1px inset #C0C0C0; + border: 1px inset #c0c0c0; background-color: white; color:black; } -OPTION { +option { } -OPTION.SELECTED { +option.selected { border: 1px solid rgb(0,0,128); background-color: rgb(0,0,128); color: rgb(255,255,255); } -OPTION.SELECTEDFOCUS { +option.selectedfocus { border: 1px dotted white; background-color: rgb(0,0,128); color: rgb(255,255,255); } -TEXTAREA { +textarea { vertical-align: bottom; - border: 2px inset #C0C0C0; + border: 2px inset #c0c0c0; background-color:white; } -/* Misc */ +/* misc */ -APPLET { +applet { display: inline; } -AREA { +area { display: none; } -BASE { +base { display: none; } -BASEFONT { +basefont { display: none; } -HEAD { +head { display: none; } -MAP { +map { display: none; } -META { +meta { display: none; } -OBJECT { +object { display: inline; } -SCRIPT { +script { display: none; } -STYLE { +style { display: none; } -TITLE { +title { display: none; } -NOEMBED { +noembed { display: none; } -NOSCRIPT { +noscript { display: none; } -NOFRAMES { +noframes { display: none; } -PARAM { +param { display: none; } -/* Pseudo-element style */ +/* pseudo-element style */ -:SCROLLBAR-LOOK { +:scrollbar-look { background-color: #c0c0c0; /* border-color: inherit; */ /* border: 2px outset #c0c0c0; */ } -:SCROLLBAR-ARROW-LOOK { +:scrollbar-arrow-look { background-color: #c0c0c0; border-color: inherit; border: 2px outset #c0c0c0; } -:SCROLLBAR-THUMB-LOOK { +:scrollbar-thumb-look { background-color: #c0c0c0; border-color: inherit; border: 2px outset #c0c0c0; } -:SCROLLED-CONTENT { +:scrolled-content { background: inherit; padding: inherit; display: inherit; } -:WRAPPED-FRAME { +:wrapped-frame { display: inherit; } -:PLACEHOLDER-FRAME { +:placeholder-frame { display: inline; width: 0; height: 0; @@ -668,12 +668,12 @@ PARAM { background-color: inherit; } -:ROOT { +:root { display: block; background-color: inherit; } -:TABLE { +:table { display: table; border-style: inherit; border-color: inherit; @@ -684,75 +684,75 @@ PARAM { background: inherit; } -:TABLE-CELL { +:table-cell { display: table-cell; } -:TABLE-COLUMN { +:table-column { display: table-column; } -:TABLE-COLUMN-GROUP { +:table-column-group { display: table-column-group; } -:TABLE-OUTER { +:table-outer { display: table; } -:TABLE-ROW { +:table-row { display: table-row; } -:TABLE-ROW-GROUP { +:table-row-group { display: table-row-group; } -:CELL-CONTENT { +:cell-content { display: block; } -:FIELDSET-CONTENT { +:fieldset-content { display: block; } -:BUTTON-CONTENT { +:button-content { display: block; } -:LABEL-CONTENT { +:label-content { display: block; } -:MOZ-COMMENT { +:moz-comment { display: none; } -:DROPDOWN-VISIBLE { +:dropdown-visible { visibility: visible; } -:DROPDOWN-HIDDEN { +:dropdown-hidden { visibility: hidden; } -:COMBOBOX-TEXT { +:combobox-text { color: black; padding-left: 2px; } -:COMBOBOX-TEXTSELECTED { +:combobox-textselected { background-color: rgb(0,0,128); color: white; border: 1px solid rgb(0,0,128); } -:COMBOBOX-TEXTSELECTEDFOCUS { +:combobox-textselectedfocus { background-color: rgb(0,0,128); color: white; border: 1px dotted white; } -:MOZ-ANONYMOUS-BLOCK { +:moz-anonymous-block { display: block; } diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp index b14c1385457..56c9d53e998 100644 --- a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp @@ -328,7 +328,7 @@ nsButtonControlFrame::GetDesiredSize(nsIPresContext* aPresContext, } else { #ifdef NS_GFX_RENDER_FORM_ELEMENTS nsCOMPtr outlineStyle(mStyleContext); - nsCOMPtr sbAtom (NS_NewAtom(":BUTTON-OUTLINE")); + nsCOMPtr sbAtom (NS_NewAtom(":button-outline")); outlineStyle = aPresContext->ProbePseudoStyleContextFor(mContent, sbAtom, mStyleContext); const nsStyleSpacing* outline = (const nsStyleSpacing*)outlineStyle->GetStyleData(eStyleStruct_Spacing); @@ -432,11 +432,11 @@ nsButtonControlFrame::PaintButton(nsIPresContext& aPresContext, //nsIStyleContext* kidSC; nsCOMPtr outlineStyle(mStyleContext); - nsCOMPtr outlineAtom (NS_NewAtom(":BUTTON-OUTLINE")); + nsCOMPtr outlineAtom (NS_NewAtom(":button-outline")); outlineStyle = aPresContext.ProbePseudoStyleContextFor(mContent, outlineAtom, mStyleContext); nsCOMPtr focusStyle(mStyleContext); - nsCOMPtr focusAtom (NS_NewAtom(":BUTTON-FOCUS")); + nsCOMPtr focusAtom (NS_NewAtom(":button-focus")); focusStyle = aPresContext.ProbePseudoStyleContextFor(mContent, focusAtom, mStyleContext); nsFormControlHelper::PaintRectangularButton(aPresContext, diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 5587a8c3329..481db6672c4 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -306,7 +306,7 @@ NS_IMETHODIMP nsComboboxControlFrame::Reflow(nsIPresContext& aPresConte //nsIFrame* childFrame; if (1 == numChildren) { - nsIAtom * textBlockContentPseudo = NS_NewAtom(":COMBOBOX-TEXT"); + nsIAtom * textBlockContentPseudo = NS_NewAtom(":combobox-text"); aPresContext.ResolvePseudoStyleContextFor(mContent, textBlockContentPseudo, mStyleContext, &mBlockTextStyle); NS_RELEASE(textBlockContentPseudo); @@ -551,7 +551,7 @@ nsComboboxControlFrame::PaintComboboxControl(nsIPresContext& aPresContext, // Scrollbars //const nsStyleColor* myColor = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); - //nsIAtom * sbAtom = NS_NewAtom(":SCROLLBAR-ARROW-LOOK"); + //nsIAtom * sbAtom = NS_NewAtom(":scrollbar-arrow-look"); //nsIStyleContext* arrowStyle = aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, mStyleContext); //NS_RELEASE(sbAtom); @@ -704,15 +704,15 @@ nsComboboxControlFrame::ReResolveStyleContext(nsIPresContext* aPresContext, RefreshStyleContext(aPresContext, nsHTMLAtoms::dropDownBtnOut, mBtnOutStyleContext, mContent, mStyleContext); RefreshStyleContext(aPresContext, nsHTMLAtoms::dropDownBtnPressed, mBtnPressedStyleContext, mContent, mStyleContext); - nsIAtom * txtBlkContentPseudo = NS_NewAtom(":COMBOBOX-TEXT"); + nsIAtom * txtBlkContentPseudo = NS_NewAtom(":combobox-text"); RefreshStyleContext(aPresContext, txtBlkContentPseudo, mBlockTextStyle, mContent, mStyleContext); NS_IF_RELEASE(txtBlkContentPseudo); - nsIAtom * txtBlkSelContentPseudo = NS_NewAtom(":COMBOBOX-TEXTSELECTED"); + nsIAtom * txtBlkSelContentPseudo = NS_NewAtom(":combobox-textselected"); RefreshStyleContext(aPresContext, txtBlkSelContentPseudo, mBlockTextSelectedStyle, mContent, mStyleContext); NS_IF_RELEASE(txtBlkSelContentPseudo); - nsIAtom * txtBlkSelFocContentPseudo = NS_NewAtom(":COMBOBOX-TEXTSELECTEDFOCUS"); + nsIAtom * txtBlkSelFocContentPseudo = NS_NewAtom(":combobox-textselectedfocus"); RefreshStyleContext(aPresContext, txtBlkSelFocContentPseudo, mBlockTextSelectedFocusStyle, mContent, mStyleContext); NS_IF_RELEASE(txtBlkSelFocContentPseudo); diff --git a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp index d7fa42082ac..9cc89a918e7 100644 --- a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp @@ -738,16 +738,16 @@ nsSelectControlFrame::PaintSelectControl(nsIPresContext& aPresContext, /** * Resolve style for a pseudo frame within the given aParentContent & aParentContext. - * The tag should be uppercase and inclue the colon. - * ie: NS_NewAtom(":FIRST-LINE"); + * The tag should be lowercase and inclue the colon. + * ie: NS_NewAtom(":first-line"); */ - nsIAtom * sbAtom = NS_NewAtom(":SCROLLBAR-LOOK"); + nsIAtom * sbAtom = NS_NewAtom(":scrollbar-look"); nsIStyleContext* scrollbarStyle; aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, mStyleContext, &scrollbarStyle); NS_RELEASE(sbAtom); - sbAtom = NS_NewAtom(":SCROLLBAR-ARROW-LOOK"); + sbAtom = NS_NewAtom(":scrollbar-arrow-look"); nsIStyleContext* arrowStyle; aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, mStyleContext, &arrowStyle); diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index bdbfd61a485..34011f89db6 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -695,11 +695,11 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext, // Scrollbars const nsStyleColor* myColor = (const nsStyleColor*)aStyleContext->GetStyleData(eStyleStruct_Color); - nsIAtom * sbAtom = NS_NewAtom(":SCROLLBAR-LOOK"); + nsIAtom * sbAtom = NS_NewAtom(":scrollbar-look"); nsIStyleContext* scrollbarStyle; aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, aStyleContext, &scrollbarStyle); NS_RELEASE(sbAtom); - sbAtom = NS_NewAtom(":SCROLLBAR-ARROW-LOOK"); + sbAtom = NS_NewAtom(":scrollbar-arrow-look"); nsIStyleContext* arrowStyle; aPresContext.ResolvePseudoStyleContextFor(mContent, sbAtom, aStyleContext, &arrowStyle); NS_RELEASE(sbAtom); diff --git a/mozilla/layout/html/style/src/nsCSSAtoms.cpp b/mozilla/layout/html/style/src/nsCSSAtoms.cpp index 0c75595e424..34700f949e0 100644 --- a/mozilla/layout/html/style/src/nsCSSAtoms.cpp +++ b/mozilla/layout/html/style/src/nsCSSAtoms.cpp @@ -41,21 +41,21 @@ static nsrefcnt gRefCnt; void nsCSSAtoms::AddrefAtoms() { if (0 == gRefCnt) { - activePseudo = NS_NewAtom(":ACTIVE"); + activePseudo = NS_NewAtom(":active"); - firstChildPseudo = NS_NewAtom(":FIRST-CHILD"); - focusPseudo = NS_NewAtom(":FOCUS"); + firstChildPseudo = NS_NewAtom(":first-child"); + focusPseudo = NS_NewAtom(":focus"); - hoverPseudo = NS_NewAtom(":HOVER"); + hoverPseudo = NS_NewAtom(":hover"); - langPseudo = NS_NewAtom(":LANG"); - linkPseudo = NS_NewAtom(":LINK"); + langPseudo = NS_NewAtom(":lang"); + linkPseudo = NS_NewAtom(":link"); - outOfDatePseudo = NS_NewAtom(":OUT-OF-DATE"); + outOfDatePseudo = NS_NewAtom(":out-of-date"); universalSelector = NS_NewAtom("*"); - visitedPseudo = NS_NewAtom(":VISITED"); + visitedPseudo = NS_NewAtom(":visited"); } ++gRefCnt; } diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp index b3f57c6762a..46915dcf456 100644 --- a/mozilla/layout/html/style/src/nsCSSParser.cpp +++ b/mozilla/layout/html/style/src/nsCSSParser.cpp @@ -1121,7 +1121,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, aSelector.SetTag(mToken.mIdent); } else { - mToken.mIdent.ToUpperCase(buffer); + mToken.mIdent.ToLowerCase(buffer); aSelector.SetTag(buffer); } } @@ -1130,7 +1130,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, mToken.mIdent.Left(nameSpace, colon); mToken.mIdent.Right(buffer, (mToken.mIdent.Length() - (colon + 1))); if (! mCaseSensitive) { - buffer.ToUpperCase(); + buffer.ToLowerCase(); } // XXX lookup namespace, set it // deal with * namespace (== unknown) @@ -1181,7 +1181,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, buffer.Truncate(); buffer.Append(':'); buffer.Append(mToken.mIdent); - buffer.ToUpperCase(); + buffer.ToLowerCase(); nsIAtom* pseudo = NS_NewAtom(buffer); if (IsPseudoClass(pseudo)) { // XXX parse lang pseudo class @@ -1225,7 +1225,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, mToken.AppendToString(aSource); nsAutoString attr(mToken.mIdent); if (! mCaseSensitive) { - attr.ToUpperCase(); + attr.ToLowerCase(); } if (! GetToken(aErrorCode, PR_FALSE)) { // premature EOF return PR_FALSE; diff --git a/mozilla/layout/html/tests/TestAttributes.cpp b/mozilla/layout/html/tests/TestAttributes.cpp index 8db6780ff95..d1c4e240fb6 100644 --- a/mozilla/layout/html/tests/TestAttributes.cpp +++ b/mozilla/layout/html/tests/TestAttributes.cpp @@ -33,11 +33,11 @@ #include "nsINameSpaceManager.h" void testAttributes(nsIHTMLContent* content) { - nsIAtom* sBORDER = NS_NewAtom("BORDER"); - nsIAtom* sWIDTH = NS_NewAtom("WIDTH"); - nsIAtom* sHEIGHT = NS_NewAtom("HEIGHT"); - nsIAtom* sSRC = NS_NewAtom("SRC"); - nsIAtom* sBAD = NS_NewAtom("BADATTRIBUTE"); + nsIAtom* sBORDER = NS_NewAtom("border"); + nsIAtom* sWIDTH = NS_NewAtom("width"); + nsIAtom* sHEIGHT = NS_NewAtom("height"); + nsIAtom* sSRC = NS_NewAtom("src"); + nsIAtom* sBAD = NS_NewAtom("badattribute"); nsString sempty(""); nsString sfoo_gif("foo.gif"); @@ -252,7 +252,7 @@ int main(int argc, char** argv) // Create a simple container. nsIHTMLContent* container; - nsIAtom* li = NS_NewAtom("LI"); + nsIAtom* li = NS_NewAtom("li"); rv = NS_NewHTMLLIElement(&container,li); if (NS_OK != rv) { diff --git a/mozilla/layout/html/tests/TestInlineFrame.cpp b/mozilla/layout/html/tests/TestInlineFrame.cpp index 5a7bbef4e93..b45bab7e72d 100644 --- a/mozilla/layout/html/tests/TestInlineFrame.cpp +++ b/mozilla/layout/html/tests/TestInlineFrame.cpp @@ -262,7 +262,7 @@ TestReflowUnmapped(nsIPresContext* presContext) { // Create an HTML container nsIHTMLContent* b; - NS_NewHTMLContainer(&b, NS_NewAtom("SPAN")); + NS_NewHTMLContainer(&b, NS_NewAtom("span")); // Append three fixed width elements. b->AppendChildTo(new FixedSizeContent(100, 100)); @@ -357,7 +357,7 @@ TestChildrenThatDontFit(nsIPresContext* presContext) { // Create an HTML container nsIHTMLContent* b; - NS_NewHTMLContainer(&b, NS_NewAtom("SPAN")); + NS_NewHTMLContainer(&b, NS_NewAtom("span")); // Add one fixed width element. b->AppendChildTo(new FixedSizeContent(100, 100)); @@ -527,7 +527,7 @@ TestOverflow(nsIPresContext* presContext) { // Create an HTML container nsIHTMLContent* b; - NS_NewHTMLContainer(&b, NS_NewAtom("SPAN")); + NS_NewHTMLContainer(&b, NS_NewAtom("span")); // Append three fixed width elements. b->AppendChildTo(new FixedSizeContent(100, 100)); @@ -639,7 +639,7 @@ TestPushingPulling(nsIPresContext* presContext) { // Create an HTML container nsIHTMLContent* b; - NS_NewHTMLContainer(&b, NS_NewAtom("SPAN")); + NS_NewHTMLContainer(&b, NS_NewAtom("span")); // Append three fixed width elements. b->AppendChildTo(new FixedSizeContent(100, 100)); @@ -1060,7 +1060,7 @@ TestSplittableChildren(nsIPresContext* presContext) { // Create an HTML container nsIHTMLContent* b; - NS_NewHTMLContainer(&b, NS_NewAtom("SPAN")); + NS_NewHTMLContainer(&b, NS_NewAtom("span")); // Append three fixed width elements that can split b->AppendChildTo(new FixedSizeContent(100, 100, PR_TRUE)); @@ -1419,7 +1419,7 @@ TestMaxElementSize(nsIPresContext* presContext) { // Create an HTML container nsIHTMLContent* b; - NS_NewHTMLContainer(&b, NS_NewAtom("SPAN")); + NS_NewHTMLContainer(&b, NS_NewAtom("span")); // Append three fixed width elements. b->AppendChildTo(new FixedSizeContent(100, 100)); diff --git a/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp b/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp index 85bedb3c3a1..09614a77968 100644 --- a/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp +++ b/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp @@ -167,7 +167,7 @@ void BasicTest::CreateCorrectContent(int aRows, int aCols) } nsIHTMLContent* body; - nsIAtom* atom = NS_NewAtom("BODY"); + nsIAtom* atom = NS_NewAtom("body"); rv = NS_NewBodyPart(&body, atom); if (NS_OK != rv) { fprintf(out, "NS_NewBodyPart failed\n"); @@ -179,23 +179,23 @@ void BasicTest::CreateCorrectContent(int aRows, int aCols) nsIHTMLContent* row; nsIHTMLContent* cell; - nsIAtom* tatom = NS_NewAtom("TABLE"); + nsIAtom* tatom = NS_NewAtom("table"); rv = NS_NewTablePart(&table, tatom); NS_RELEASE(tatom); if (NS_OK == rv) { PRInt32 rowIndex; for (rowIndex = 0; (NS_OK == rv) && (rowIndex < aRows); rowIndex++) { - nsIAtom* tratom = NS_NewAtom("TR"); + nsIAtom* tratom = NS_NewAtom("tr"); rv = NS_NewTableRowPart(&row, tratom); NS_RELEASE(tratom); if (NS_OK == rv) { PRInt32 colIndex; for (colIndex = 0; (NS_OK == rv) && (colIndex < aCols); colIndex++) { - nsIAtom* tdatom = NS_NewAtom("TD"); + nsIAtom* tdatom = NS_NewAtom("td"); rv = NS_NewTableCellPart(&cell, tdatom); NS_RELEASE(tdatom); if (NS_OK == rv) { - rv = AppendSimpleSpan (cell, "P", "test"); + rv = AppendSimpleSpan (cell, "p", "test"); } row->AppendChildTo(cell); NS_RELEASE(cell); @@ -223,7 +223,7 @@ void BasicTest::CreateCorrectFullContent(int aRows, int aCols) } nsIHTMLContent* body; - nsIAtom* atom = NS_NewAtom("BODY"); + nsIAtom* atom = NS_NewAtom("body"); rv = NS_NewBodyPart(&body, atom); if (NS_OK != rv) { fprintf(out, "NS_NewBodyPart failed\n"); @@ -238,25 +238,25 @@ void BasicTest::CreateCorrectFullContent(int aRows, int aCols) nsIHTMLContent* row; nsIHTMLContent* cell; - nsIAtom* tatom = NS_NewAtom("TABLE"); + nsIAtom* tatom = NS_NewAtom("table"); rv = NS_NewTablePart(&table, tatom); NS_RELEASE(tatom); // add caption - nsIAtom* captionAtom = NS_NewAtom("CAPTION"); + nsIAtom* captionAtom = NS_NewAtom("caption"); rv = NS_NewTableCaptionPart(&caption, captionAtom); NS_RELEASE(captionAtom); table->AppendChildTo(caption); // add column group PRInt32 colIndex; - nsIAtom* colGroupAtom = NS_NewAtom("COLGROUP"); + nsIAtom* colGroupAtom = NS_NewAtom("colgroup"); rv = NS_NewTableColGroupPart(&colGroup, colGroupAtom); NS_RELEASE(colGroupAtom); table->AppendChildTo(colGroup); // add columns - nsIAtom* colAtom = NS_NewAtom("COL"); + nsIAtom* colAtom = NS_NewAtom("col"); for (colIndex = 0; (NS_OK == rv) && (colIndex < aCols); colIndex++) { rv = NS_NewTableColPart(&col, colAtom); colGroup->AppendChildTo(col); @@ -267,12 +267,12 @@ void BasicTest::CreateCorrectFullContent(int aRows, int aCols) if (NS_OK == rv) { PRInt32 rowIndex; for (rowIndex = 0; (NS_OK == rv) && (rowIndex < aRows); rowIndex++) { - nsIAtom* tratom = NS_NewAtom("TR"); + nsIAtom* tratom = NS_NewAtom("tr"); rv = NS_NewTableRowPart(&row, tratom); NS_RELEASE(tratom); if (NS_OK == rv) { for (colIndex = 0; (NS_OK == rv) && (colIndex < aCols); colIndex++) { - nsIAtom* tdatom = NS_NewAtom("TD"); + nsIAtom* tdatom = NS_NewAtom("td"); rv = NS_NewTableCellPart(&cell, tdatom); NS_RELEASE(tdatom); if (NS_OK == rv) { @@ -304,7 +304,7 @@ void BasicTest::CreateOutOfOrderContent(int aRows, int aCols) } nsIHTMLContent* body; - nsIAtom* atom = NS_NewAtom("BODY"); + nsIAtom* atom = NS_NewAtom("body"); rv = NS_NewBodyPart(&body, atom); if (NS_OK != rv) { fprintf(out, "NS_NewBodyPart failed\n"); @@ -319,7 +319,7 @@ void BasicTest::CreateOutOfOrderContent(int aRows, int aCols) nsIHTMLContent* row; nsIHTMLContent* cell; - nsIAtom* tatom = NS_NewAtom("TABLE"); + nsIAtom* tatom = NS_NewAtom("table"); rv = NS_NewTablePart(&table, tatom); NS_RELEASE(tatom); @@ -327,16 +327,16 @@ void BasicTest::CreateOutOfOrderContent(int aRows, int aCols) if (NS_OK == rv) { PRInt32 rowIndex; for (rowIndex = 0; (NS_OK == rv) && (rowIndex < aRows); rowIndex++) { - nsIAtom* tratom = NS_NewAtom("TR"); + nsIAtom* tratom = NS_NewAtom("tr"); rv = NS_NewTableRowPart(&row, tratom); NS_RELEASE(tratom); if (NS_OK == rv) { for (PRInt32 colIndex = 0; (NS_OK == rv) && (colIndex < aCols); colIndex++) { - nsIAtom* tdatom = NS_NewAtom("TD"); + nsIAtom* tdatom = NS_NewAtom("td"); rv = NS_NewTableCellPart(&cell, tdatom); NS_RELEASE(tdatom); if (NS_OK == rv) { - rv = AppendSimpleSpan (cell, "P", "test"); + rv = AppendSimpleSpan (cell, "p", "test"); } row->AppendChildTo(cell); NS_RELEASE(cell); @@ -344,7 +344,7 @@ void BasicTest::CreateOutOfOrderContent(int aRows, int aCols) { // add column after cell[1,0], force implicit column group to be built PRInt32 colIndex; - nsIAtom* colGroupAtom = NS_NewAtom("COLGROUP"); + nsIAtom* colGroupAtom = NS_NewAtom("colgroup"); rv = NS_NewTableColGroupPart(&colGroup, colGroupAtom); NS_RELEASE(colGroupAtom); table->AppendChildTo(colGroup); @@ -360,13 +360,13 @@ void BasicTest::CreateOutOfOrderContent(int aRows, int aCols) root->AppendChildTo(body); // add caption in middle - nsIAtom* captionAtom = NS_NewAtom("CAPTION"); + nsIAtom* captionAtom = NS_NewAtom("caption"); rv = NS_NewTableCaptionPart(&caption, captionAtom); NS_RELEASE(captionAtom); table->AppendChildTo(caption); // add columns - nsIAtom* colAtom = NS_NewAtom("COL"); + nsIAtom* colAtom = NS_NewAtom("col"); for (PRInt32 colIndex = 0; (NS_OK == rv) && (colIndex < aCols); colIndex++) { rv = NS_NewTableColPart(&col, colAtom); colGroup->AppendChildTo(col); @@ -374,7 +374,7 @@ void BasicTest::CreateOutOfOrderContent(int aRows, int aCols) NS_RELEASE(colAtom); // add caption at end - captionAtom = NS_NewAtom("CAPTION"); + captionAtom = NS_NewAtom("caption"); rv = NS_NewTableCaptionPart(&caption, captionAtom); NS_RELEASE(captionAtom); table->AppendChildTo(caption); diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index b3f57c6762a..46915dcf456 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -1121,7 +1121,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, aSelector.SetTag(mToken.mIdent); } else { - mToken.mIdent.ToUpperCase(buffer); + mToken.mIdent.ToLowerCase(buffer); aSelector.SetTag(buffer); } } @@ -1130,7 +1130,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, mToken.mIdent.Left(nameSpace, colon); mToken.mIdent.Right(buffer, (mToken.mIdent.Length() - (colon + 1))); if (! mCaseSensitive) { - buffer.ToUpperCase(); + buffer.ToLowerCase(); } // XXX lookup namespace, set it // deal with * namespace (== unknown) @@ -1181,7 +1181,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, buffer.Truncate(); buffer.Append(':'); buffer.Append(mToken.mIdent); - buffer.ToUpperCase(); + buffer.ToLowerCase(); nsIAtom* pseudo = NS_NewAtom(buffer); if (IsPseudoClass(pseudo)) { // XXX parse lang pseudo class @@ -1225,7 +1225,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode, mToken.AppendToString(aSource); nsAutoString attr(mToken.mIdent); if (! mCaseSensitive) { - attr.ToUpperCase(); + attr.ToLowerCase(); } if (! GetToken(aErrorCode, PR_FALSE)) { // premature EOF return PR_FALSE; diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css index 6948b6d6f1d..2b361bfd7ab 100644 --- a/mozilla/layout/style/ua.css +++ b/mozilla/layout/style/ua.css @@ -15,98 +15,98 @@ * Reserved. */ -HTML { +html { display: block; } -BODY { +body { display: block; line-height: normal; margin: 8px; } -FRAMESET { +frameset { overflow: hidden; } -/* Blocks */ +/* blocks */ -P { +p { display: block; margin-bottom: auto; margin-top: auto; } -ADDRESS { +address { display: block; font-style: italic; margin-bottom: 0; margin-top: 0; } -BLOCKQUOTE { +blockquote { display: block; margin-left: 40px; margin-right: 40px; margin-top: auto; margin-bottom: auto; } -CENTER { +center { display: block; text-align: center; margin-bottom: 0; margin-top: 0; } -DIV { +div { display: block; margin-bottom: 0; margin-top: 0; } -H1 { +h1 { display: block; font-size: xx-large; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H2 { +h2 { display: block; font-size: x-large; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H3 { +h3 { display: block; font-size: large; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H4 { +h4 { display: block; font-size: medium; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H5 { +h5 { display: block; font-size: small; font-weight: bold; margin-bottom: auto; margin-top: auto; } -H6 { +h6 { display: block; font-size: x-small; font-weight: bold; margin-bottom: auto; margin-top: auto; } -LAYER { +layer { display: block; position: absolute; } -LISTING { +listing { display: block; font-family: monospace; font-size: medium; @@ -114,191 +114,191 @@ LISTING { margin-bottom: auto; margin-top: auto; } -PLAINTEXT, XMP, PRE { +plaintext, xmp, pre { display: block; font-family: monospace; white-space: pre; margin-bottom: auto; margin-top: auto; } -MULTICOL { +multicol { display: block; margin-bottom: auto; margin-top: auto; } -/* Tables */ +/* tables */ -TABLE { +table { display: table; /* border-style: outset; */ - border-color: #C0C0C0; + border-color: #c0c0c0; cell-spacing: 2px; cell-padding: 2px; margin-top: 0; margin-bottom: 0; background: transparent; } -TD, TH { +td, th { vertical-align: inherit; background: inherit; text-align: left; /* border-style: inset; */ - border-color: #C0C0C0; + border-color: #c0c0c0; display: table-cell; } -TH { +th { font-weight: bold; text-align: center; } -CAPTION { +caption { text-align: center; display: table-caption; } -TR { +tr { display: table-row; vertical-align: inherit; background: inherit; } -TBODY { +tbody { display: table-row-group; vertical-align: middle; background: inherit; } -THEAD { +thead { display: table-header-group; vertical-align: middle; background: inherit; } -TFOOT { +tfoot { display: table-footer-group; vertical-align: middle; background: inherit; } -COL { +col { display: table-column; } -COLGROUP { +colgroup { display: table-column-group; } -/* Spans */ +/* spans */ -A:link { +a:link { display: inline; color: blue; text-decoration: underline; cursor: pointer; } -A:visited { +a:visited { display: inline; color: purple; text-decoration: underline; cursor: pointer; } -A:active { +a:active { display: inline; color: lime; text-decoration: underline; cursor: pointer; } -A:out-of-date { +a:out-of-date { display: inline; color: red; text-decoration: underline; cursor: pointer; } -A:link IMG { +a:link img { display: inline; border: 2px solid blue; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -A:visited IMG { +a:visited img { display: inline; border: 2px solid purple; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -A:active IMG { +a:active img { display: inline; border: 2px solid lime; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -A:out-of-date IMG { +a:out-of-date img { display: inline; border: 2px solid red; font-family: sans-serif; font-size: 8.5pt; text-decoration: none; } -B, STRONG { +b, strong { display: inline; font-weight: bolder; } -I, CITE, EM, VAR { +i, cite, em, var { display: inline; font-style: italic; } -TT, CODE, KBD, SAMP { +tt, code, kbd, samp { display: inline; font-family: monospace; } -U { +u { display: inline; text-decoration: underline; } -S, STRIKE { +s, strike { display: inline; text-decoration: line-through; } -BLINK { +blink { display: inline; text-decoration: blink; } -BIG { +big { display: inline; font-size: larger; } -SMALL { +small { display: inline; font-size: smaller; } -ABBR, ACRONYM, DEL, DFN, INS, Q, SPAN { +abbr, acronym, del, dfn, ins, q, span { display: inline; } -INS { text-decoration: underline; } -DEL { text-decoration: line-through; } -DFN { font-style: italic; } -SUB { +ins { text-decoration: underline; } +del { text-decoration: line-through; } +dfn { font-style: italic; } +sub { display: inline; vertical-align: sub; font-size: smaller; } -SUP { +sup { display: inline; vertical-align: super; font-size: smaller; } -ILAYER { +ilayer { position: absolute; display: inline; } -NOBR { +nobr { display: inline; white-space: nowrap; } -LEGEND { +legend { display: inline; padding-left: 2px; padding-right: 2px; border: 2px solid black; } -FIELDSET { +fieldset { display: block; border: 2px solid black; padding: 4px; @@ -306,14 +306,14 @@ FIELDSET { margin-right: 2px; } -/* Lists */ +/* lists */ -:BULLET { +:bullet { display: inline; margin-right: 8px; } -UL, MENU, DIR { +ul, menu, dir { display: block; margin-right: 0; margin-bottom: auto; @@ -322,7 +322,7 @@ UL, MENU, DIR { margin-left: 40px; } -OL { +ol { display: block; margin-right: 0; margin-bottom: auto; @@ -331,111 +331,111 @@ OL { margin-left: 40px; } -LI { +li { display: list-item; list-style-position: inside; } -UL LI, OL LI, MENU LI, DIR LI { +ul li, ol li, menu li, dir li { list-style-position: outside; } -/* Nested lists have no top/bottom margins */ -UL UL, UL OL, UL MENU, UL DIR, -MENU UL, MENU OL, MENU MENU, MENU DIR, -DIR UL, DIR OL, DIR MENU, DIR DIR, -OL UL, OL OL, OL MENU, OL DIR +/* nested lists have no top/bottom margins */ +ul ul, ul ol, ul menu, ul dir, +menu ul, menu ol, menu menu, menu dir, +dir ul, dir ol, dir menu, dir dir, +ol ul, ol ol, ol menu, ol dir { margin-top: 0; margin-bottom: 0; } /* 2 deep unordered lists use a circle */ -OL UL, UL UL, MENU UL, DIR UL, -OL MENU, UL MENU, MENU MENU, DIR MENU, -OL DIR, UL DIR, MENU DIR, DIR DIR +ol ul, ul ul, menu ul, dir ul, +ol menu, ul menu, menu menu, dir menu, +ol dir, ul dir, menu dir, dir dir { list-style-type: circle; } /* 3 deep (or more) unordered lists use a square */ -OL OL UL, OL UL UL, OL MENU UL, OL DIR UL, -OL OL MENU, OL UL MENU, OL MENU MENU, OL DIR MENU, -OL OL DIR, OL UL DIR, OL MENU DIR, OL DIR DIR, +ol ol ul, ol ul ul, ol menu ul, ol dir ul, +ol ol menu, ol ul menu, ol menu menu, ol dir menu, +ol ol dir, ol ul dir, ol menu dir, ol dir dir, -UL OL UL, UL UL UL, UL MENU UL, UL DIR UL, -UL OL MENU, UL UL MENU, UL MENU MENU, UL DIR MENU, -UL OL DIR, UL UL DIR, UL MENU DIR, UL DIR DIR, +ul ol ul, ul ul ul, ul menu ul, ul dir ul, +ul ol menu, ul ul menu, ul menu menu, ul dir menu, +ul ol dir, ul ul dir, ul menu dir, ul dir dir, -MENU OL UL, MENU UL UL, MENU MENU UL, MENU DIR UL, -MENU OL MENU, MENU UL MENU, MENU MENU MENU, MENU DIR MENU, -MENU OL DIR, MENU UL DIR, MENU MENU DIR, MENU DIR DIR, +menu ol ul, menu ul ul, menu menu ul, menu dir ul, +menu ol menu, menu ul menu, menu menu menu, menu dir menu, +menu ol dir, menu ul dir, menu menu dir, menu dir dir, -DIR OL UL, DIR UL UL, DIR MENU UL, DIR DIR UL, -DIR OL MENU, DIR UL MENU, DIR MENU MENU, DIR DIR MENU, -DIR OL DIR, DIR UL DIR, DIR MENU DIR, DIR DIR DIR +dir ol ul, dir ul ul, dir menu ul, dir dir ul, +dir ol menu, dir ul menu, dir menu menu, dir dir menu, +dir ol dir, dir ul dir, dir menu dir, dir dir dir { list-style-type: square; } -DL { +dl { display: block; margin-bottom: auto; margin-top: auto; } -DT { +dt { display: block; } -DD { +dd { display: block; margin-left: 40px; } -/* Leafs */ +/* leafs */ -EMBED { +embed { display: inline; } -HR { +hr { display: block; margin-top: 0; margin-bottom: 0; text-align: center; border: 1px -moz-bg-inset; } -BR { +br { display: inline; color: cyan; } -IMG { +img { display: inline; font-family: sans-serif; font-size: 8.5pt; } -SPACER { +spacer { display: inline; } -WBR { +wbr { display: inline; } -IFRAME { +iframe { display: inline; border: 2px solid black; } -INPUT { +input { vertical-align: bottom; border: 2px inset rgb(192, 192, 192); background-color: white; color: black; } -INPUT[type=radio] { +input[type=radio] { border: 2px inset rgb(192, 192, 192); background-color:white; color:black; width:12px; height:12px; } -INPUT[type=checkbox] { +input[type=checkbox] { border: 2px inset rgb(192, 192, 192); width:11px; height:11px; @@ -443,80 +443,80 @@ INPUT[type=checkbox] { color:black; } -INPUT[type=button] { +input[type=button] { border: 2px outset rgb(192, 192, 192); color:black; background-color: rgb(192, 192, 192); } -INPUT[type=submit] { +input[type=submit] { border: 1px outset rgb(156, 154, 156); background-color:rgb(206, 207, 206); color:black; } -INPUT[type=submit].ROLLOVER { +input[type=submit].rollover { } -INPUT[type=submit].PRESSED { +input[type=submit].pressed { border-style : inset; } -INPUT[type=submit].DISABLED { +input[type=submit].disabled { border-style : solid; } -INPUT[type=reset] { +input[type=reset] { border: 1px outset rgb(156, 154, 156); background-color:rgb(206, 207, 206); color:black; } -INPUT[type=reset].ROLLOVER { +input[type=reset].rollover { } -INPUT[type=reset].PRESSED { +input[type=reset].pressed { border-style : inset; } -INPUT[type=reset].DISABLED { +input[type=reset].disabled { border-style : solid; } -INPUT[type=file] { +input[type=file] { border: 1px outset rgb(156, 154, 156); background-color:rgb(206, 207, 206); color:black; } -INPUT[type=file].ROLLOVER { +input[type=file].rollover { } -INPUT[type=file].PRESSED { +input[type=file].pressed { border-style : inset; } -INPUT[type=file].DISABLED { +input[type=file].disabled { border-style : solid; } -:BUTTON-OUTLINE { +:button-outline { border: 1px solid black; } -:BUTTON-FOCUS { +:button-focus { border: 2px solid salmon; } -INPUT[type=text] { +input[type=text] { border: 2px inset rgb(192, 192, 192); margin-right:10px; background-color: white; color: black; } -INPUT[type=password] { +input[type=password] { border: 2px inset rgb(192, 192, 192); margin-right:10px; background-color: white; @@ -524,19 +524,19 @@ INPUT[type=password] { } -LABEL { +label { display: inline; vertical-align: bottom; background-color: white; padding-left: 3px; padding-right: 3px; } -BUTTON { +button { display: inline; vertical-align: bottom; cursor: default; } -BUTTON { +button { display: inline; vertical-align: bottom; /*background-color: white; */ @@ -547,117 +547,117 @@ BUTTON { padding: 2px; cursor: default; } -BUTTON.ROLLOVER { +button.rollover { border: 2px outset rgb(192,192,192); } -BUTTON.DISABLED { +button.disabled { border: 2px solid rgb(192,192,192); color: rgb(225,225,225); } -SELECT { +select { vertical-align: bottom; - border: 1px inset #C0C0C0; + border: 1px inset #c0c0c0; background-color: white; color:black; } -OPTION { +option { } -OPTION.SELECTED { +option.selected { border: 1px solid rgb(0,0,128); background-color: rgb(0,0,128); color: rgb(255,255,255); } -OPTION.SELECTEDFOCUS { +option.selectedfocus { border: 1px dotted white; background-color: rgb(0,0,128); color: rgb(255,255,255); } -TEXTAREA { +textarea { vertical-align: bottom; - border: 2px inset #C0C0C0; + border: 2px inset #c0c0c0; background-color:white; } -/* Misc */ +/* misc */ -APPLET { +applet { display: inline; } -AREA { +area { display: none; } -BASE { +base { display: none; } -BASEFONT { +basefont { display: none; } -HEAD { +head { display: none; } -MAP { +map { display: none; } -META { +meta { display: none; } -OBJECT { +object { display: inline; } -SCRIPT { +script { display: none; } -STYLE { +style { display: none; } -TITLE { +title { display: none; } -NOEMBED { +noembed { display: none; } -NOSCRIPT { +noscript { display: none; } -NOFRAMES { +noframes { display: none; } -PARAM { +param { display: none; } -/* Pseudo-element style */ +/* pseudo-element style */ -:SCROLLBAR-LOOK { +:scrollbar-look { background-color: #c0c0c0; /* border-color: inherit; */ /* border: 2px outset #c0c0c0; */ } -:SCROLLBAR-ARROW-LOOK { +:scrollbar-arrow-look { background-color: #c0c0c0; border-color: inherit; border: 2px outset #c0c0c0; } -:SCROLLBAR-THUMB-LOOK { +:scrollbar-thumb-look { background-color: #c0c0c0; border-color: inherit; border: 2px outset #c0c0c0; } -:SCROLLED-CONTENT { +:scrolled-content { background: inherit; padding: inherit; display: inherit; } -:WRAPPED-FRAME { +:wrapped-frame { display: inherit; } -:PLACEHOLDER-FRAME { +:placeholder-frame { display: inline; width: 0; height: 0; @@ -668,12 +668,12 @@ PARAM { background-color: inherit; } -:ROOT { +:root { display: block; background-color: inherit; } -:TABLE { +:table { display: table; border-style: inherit; border-color: inherit; @@ -684,75 +684,75 @@ PARAM { background: inherit; } -:TABLE-CELL { +:table-cell { display: table-cell; } -:TABLE-COLUMN { +:table-column { display: table-column; } -:TABLE-COLUMN-GROUP { +:table-column-group { display: table-column-group; } -:TABLE-OUTER { +:table-outer { display: table; } -:TABLE-ROW { +:table-row { display: table-row; } -:TABLE-ROW-GROUP { +:table-row-group { display: table-row-group; } -:CELL-CONTENT { +:cell-content { display: block; } -:FIELDSET-CONTENT { +:fieldset-content { display: block; } -:BUTTON-CONTENT { +:button-content { display: block; } -:LABEL-CONTENT { +:label-content { display: block; } -:MOZ-COMMENT { +:moz-comment { display: none; } -:DROPDOWN-VISIBLE { +:dropdown-visible { visibility: visible; } -:DROPDOWN-HIDDEN { +:dropdown-hidden { visibility: hidden; } -:COMBOBOX-TEXT { +:combobox-text { color: black; padding-left: 2px; } -:COMBOBOX-TEXTSELECTED { +:combobox-textselected { background-color: rgb(0,0,128); color: white; border: 1px solid rgb(0,0,128); } -:COMBOBOX-TEXTSELECTEDFOCUS { +:combobox-textselectedfocus { background-color: rgb(0,0,128); color: white; border: 1px dotted white; } -:MOZ-ANONYMOUS-BLOCK { +:moz-anonymous-block { display: block; } diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp index acb38d64dff..e240b4bbc45 100644 --- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp @@ -203,7 +203,7 @@ nsXMLContentSink::WillBuildModel(void) // hierarchy. In the future we might want to get rid of it // or at least make it invisible from the perspective of the // DOM. - nsIAtom *tagAtom = NS_NewAtom("XML"); + nsIAtom *tagAtom = NS_NewAtom("xml"); nsIXMLContent *content; result = NS_NewXMLElement(&content, tagAtom); NS_RELEASE(tagAtom); @@ -427,9 +427,6 @@ nsXMLContentSink::AddAttributes(const nsIParserNode& aNode, const nsString& key = aNode.GetKeyAt(i); name.Truncate(); name.Append(key); - if (aIsHTML) { - name.ToUpperCase(); - } nsIAtom* nameSpacePrefix = CutNameSpacePrefix(name); nsIAtom* nameAtom = NS_NewAtom(name); @@ -568,7 +565,6 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode) isHTML = IsHTMLNameSpace(nameSpaceID); if (isHTML) { - tag.ToUpperCase(); // HTML is case-insensitive nsIAtom* tagAtom = NS_NewAtom(tag); if (nsHTMLAtoms::script == tagAtom) { result = ProcessStartSCRIPTTag(aNode); @@ -649,7 +645,6 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode) } if (isHTML) { - tag.ToUpperCase(); nsIAtom* tagAtom = NS_NewAtom(tag); if (nsHTMLAtoms::script == tagAtom) { result = ProcessEndSCRIPTTag(aNode); @@ -989,7 +984,6 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode) if (NS_OK != result) { return result; } - media.ToUpperCase(); if (type.Equals(kCSSType)) { // Use the SRC attribute value to load the URL @@ -1082,7 +1076,6 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode) if (NS_OK != result) { return result; } - media.ToUpperCase(); // XXX At some point, we need to have a registry based mechanism // for dealing with loading stylesheets attached to XML documents diff --git a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp index 332c628d65b..146cbea5447 100644 --- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp @@ -726,7 +726,7 @@ nsProgressMeterFrame :: ReResolveStyleContext ( nsIPresContext* aPresContext, ns } if ( old != mStyleContext ) { - nsCOMPtr barPseudo ( dont_AddRef(NS_NewAtom(":PROGRESSMETER-STRIPE")) ); + nsCOMPtr barPseudo ( dont_AddRef(NS_NewAtom(":progressmeter-stripe")) ); RefreshStyleContext(aPresContext, barPseudo, &mBarStyle, mContent, mStyleContext); } diff --git a/mozilla/layout/xul/base/src/nsToolboxFrame.cpp b/mozilla/layout/xul/base/src/nsToolboxFrame.cpp index 0792f03bfed..4e046a74641 100644 --- a/mozilla/layout/xul/base/src/nsToolboxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsToolboxFrame.cpp @@ -138,10 +138,10 @@ nsToolboxFrame :: ReResolveStyleContext ( nsIPresContext* aPresContext, nsIStyle } if ( old != mStyleContext ) { - nsCOMPtr grippyRolloverPseudo ( dont_AddRef(NS_NewAtom(":TOOLBOX-ROLLOVER")) ); + nsCOMPtr grippyRolloverPseudo ( dont_AddRef(NS_NewAtom(":toolbox-rollover")) ); RefreshStyleContext(aPresContext, grippyRolloverPseudo, &mGrippyRolloverStyle, mContent, mStyleContext); - nsCOMPtr grippyNormalPseudo ( dont_AddRef(NS_NewAtom(":TOOLBOX-NORMAL")) ); + nsCOMPtr grippyNormalPseudo ( dont_AddRef(NS_NewAtom(":toolbox-normal")) ); RefreshStyleContext(aPresContext, grippyNormalPseudo, &mGrippyNormalStyle, mContent, mStyleContext); } diff --git a/mozilla/rdf/content/src/nsRDFDocument.cpp b/mozilla/rdf/content/src/nsRDFDocument.cpp index 42a7403e82c..47bcdd77a6e 100644 --- a/mozilla/rdf/content/src/nsRDFDocument.cpp +++ b/mozilla/rdf/content/src/nsRDFDocument.cpp @@ -1801,10 +1801,6 @@ RDFDocumentImpl::SplitProperty(nsIRDFResource* aProperty, uri.Right(tag, count); uri.Cut(index + 1, count); - // XXX XUL atoms seem to all be in lower case. HTML atoms are in - // upper case. This sucks. - //tag.ToUpperCase(); - nsresult rv; PRInt32 nameSpaceID; rv = mNameSpaceManager->GetNameSpaceID(uri, nameSpaceID); @@ -1813,9 +1809,6 @@ RDFDocumentImpl::SplitProperty(nsIRDFResource* aProperty, if (NS_SUCCEEDED(rv) && nameSpaceID != kNameSpaceID_Unknown) { *aNameSpaceID = nameSpaceID; - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - *aTag = NS_NewAtom(tag); return NS_OK; } @@ -1828,10 +1821,6 @@ RDFDocumentImpl::SplitProperty(nsIRDFResource* aProperty, if (NS_SUCCEEDED(rv) && nameSpaceID != kNameSpaceID_Unknown) { *aNameSpaceID = nameSpaceID; - - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - *aTag = NS_NewAtom(tag); return NS_OK; } diff --git a/mozilla/rdf/content/src/nsRDFHTMLBuilder.cpp b/mozilla/rdf/content/src/nsRDFHTMLBuilder.cpp index 6b724bc6e6f..4deefabe47f 100644 --- a/mozilla/rdf/content/src/nsRDFHTMLBuilder.cpp +++ b/mozilla/rdf/content/src/nsRDFHTMLBuilder.cpp @@ -95,7 +95,7 @@ RDFHTMLBuilderImpl::RDFHTMLBuilderImpl(void) NS_INIT_REFCNT(); if (nsnull == kIdAtom) { - kIdAtom = NS_NewAtom("ID"); + kIdAtom = NS_NewAtom("id"); } else { NS_ADDREF(kIdAtom); @@ -261,7 +261,7 @@ RDFHTMLBuilderImpl::CreateRootContent(nsIRDFResource* aResource) goto done; rv = NS_ERROR_OUT_OF_MEMORY; - if ((tag = NS_NewAtom("DOCUMENT")) == nsnull) + if ((tag = NS_NewAtom("document")) == nsnull) goto done; if (NS_FAILED(rv = NS_NewRDFGenericElement(&root, kNameSpaceID_None, tag))) @@ -272,7 +272,7 @@ RDFHTMLBuilderImpl::CreateRootContent(nsIRDFResource* aResource) NS_RELEASE(tag); rv = NS_ERROR_OUT_OF_MEMORY; - if ((tag = NS_NewAtom("BODY")) == nsnull) + if ((tag = NS_NewAtom("body")) == nsnull) goto done; // PR_TRUE indicates that children should be recursively generated on demand diff --git a/mozilla/rdf/content/src/nsRDFResourceElement.cpp b/mozilla/rdf/content/src/nsRDFResourceElement.cpp index cd1e076d928..4dfe550b2cc 100644 --- a/mozilla/rdf/content/src/nsRDFResourceElement.cpp +++ b/mozilla/rdf/content/src/nsRDFResourceElement.cpp @@ -262,7 +262,7 @@ RDFResourceElementImpl::RDFResourceElementImpl(nsIRDFResource* aResource, NS_ADDREF(aTag); if (nsnull == kIdAtom) { - kIdAtom = NS_NewAtom("ID"); + kIdAtom = NS_NewAtom("id"); nsresult rv; nsINameSpaceManager* mgr; diff --git a/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp b/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp index 1dd1c5f2162..3636fabeff9 100644 --- a/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp +++ b/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp @@ -261,8 +261,8 @@ RDFTreeBuilderImpl::RDFTreeBuilderImpl(void) if (gRefCnt == 0) { kContentsGeneratedAtom = NS_NewAtom("contentsGenerated"); - kIdAtom = NS_NewAtom("ID"); - kOpenAtom = NS_NewAtom("OPEN"); + kIdAtom = NS_NewAtom("id"); + kOpenAtom = NS_NewAtom("open"); kResourceAtom = NS_NewAtom("resource"); kTreeAtom = NS_NewAtom("tree"); @@ -465,7 +465,7 @@ RDFTreeBuilderImpl::CreateRootContent(nsIRDFResource* aResource) return rv; // Create the DOCUMENT element - if ((tag = dont_AddRef(NS_NewAtom("DOCUMENT"))) == nsnull) + if ((tag = dont_AddRef(NS_NewAtom("document"))) == nsnull) return NS_ERROR_OUT_OF_MEMORY; nsCOMPtr root; @@ -478,7 +478,7 @@ RDFTreeBuilderImpl::CreateRootContent(nsIRDFResource* aResource) // Create the BODY element nsCOMPtr body; - if ((tag = dont_AddRef(NS_NewAtom("BODY"))) == nsnull) + if ((tag = dont_AddRef(NS_NewAtom("body"))) == nsnull) return NS_ERROR_OUT_OF_MEMORY; if (NS_FAILED(rv = NS_NewRDFGenericElement(getter_AddRefs(body), diff --git a/mozilla/rdf/content/src/nsRDFXULBuilder.cpp b/mozilla/rdf/content/src/nsRDFXULBuilder.cpp index f2b58923ce2..ee9b44f4dc7 100644 --- a/mozilla/rdf/content/src/nsRDFXULBuilder.cpp +++ b/mozilla/rdf/content/src/nsRDFXULBuilder.cpp @@ -232,7 +232,7 @@ static const char kRDFNameSpaceURI[] } kContentsGeneratedAtom = NS_NewAtom("contentsGenerated"); - kIdAtom = NS_NewAtom("ID"); + kIdAtom = NS_NewAtom("id"); kDataSourcesAtom = NS_NewAtom("datasources"); kTreeAtom = NS_NewAtom("tree"); diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp index 9ef1697975c..075b64fe41b 100644 --- a/mozilla/rdf/content/src/nsXULDocument.cpp +++ b/mozilla/rdf/content/src/nsXULDocument.cpp @@ -1807,7 +1807,7 @@ XULDocumentImpl::SplitProperty(nsIRDFResource* aProperty, // XXX XUL atoms seem to all be in lower case. HTML atoms are in // upper case. This sucks. - //tag.ToUpperCase(); + //tag.ToUpperCase(); // All XML is case sensitive even HTML in XML nsresult rv; PRInt32 nameSpaceID; @@ -1817,9 +1817,6 @@ XULDocumentImpl::SplitProperty(nsIRDFResource* aProperty, if (NS_SUCCEEDED(rv) && nameSpaceID != kNameSpaceID_Unknown) { *aNameSpaceID = nameSpaceID; - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - *aTag = NS_NewAtom(tag); return NS_OK; } @@ -1833,9 +1830,6 @@ XULDocumentImpl::SplitProperty(nsIRDFResource* aProperty, if (NS_SUCCEEDED(rv) && nameSpaceID != kNameSpaceID_Unknown) { *aNameSpaceID = nameSpaceID; - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - *aTag = NS_NewAtom(tag); return NS_OK; } diff --git a/mozilla/rdf/datasource/src/nsXULContentSink.cpp b/mozilla/rdf/datasource/src/nsXULContentSink.cpp index 77326b2062a..62ac8c7c666 100644 --- a/mozilla/rdf/datasource/src/nsXULContentSink.cpp +++ b/mozilla/rdf/datasource/src/nsXULContentSink.cpp @@ -1002,9 +1002,6 @@ XULContentSinkImpl::AddAttributes(const nsIParserNode& aNode, const nsString& key = aNode.GetKeyAt(i); SplitQualifiedName(key, nameSpaceID, attr); - if (nameSpaceID == kNameSpaceID_HTML) - attr.ToUpperCase(); - // Don't add xmlns: declarations, these are really just // processing instructions. if (nameSpaceID == kNameSpaceID_XMLNS) @@ -1052,10 +1049,6 @@ XULContentSinkImpl::OpenTag(const nsIParserNode& aNode) SplitQualifiedName(aNode.GetText(), nameSpaceID, tag); - // HTML tags all need to be upper-cased - if (nameSpaceID == kNameSpaceID_HTML) - tag.ToUpperCase(); - // Figure out the URI of this object, and create an RDF node for it. nsresult rv; diff --git a/mozilla/rdf/src/nsRDFElement.cpp b/mozilla/rdf/src/nsRDFElement.cpp new file mode 100644 index 00000000000..966069c95a3 --- /dev/null +++ b/mozilla/rdf/src/nsRDFElement.cpp @@ -0,0 +1,1449 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * The Original Code is Mozilla Communicator client code. + * + * The Initial Developer of the Original Code is Netscape Communications + * Corporation. Portions created by Netscape are Copyright (C) 1998 + * Netscape Communications Corporation. All Rights Reserved. + */ + +/* + + A "pseudo content element" that acts as a proxy to RDF. + + Unfortunately, there is no one right way to transform RDF into a + document model. Ideally, one would like to use something like XSL to + define how to do it in a declarative, user-definable way. But since + we don't have XSL yet, that's not an option. So here we have a + hard-coded implementation that does the job. + + TO DO + + 1) In the absence of XSL, at least factor out the strategy used to + build the content model so that multiple models can be build + (e.g., table-like HTML vs. XUI tree control, etc.) + + This involves both hacking the code that generates children for + presentation, and the code that manipulates children via the DOM, + which leads us to the next item... + + 2) Implement DOM interfaces. + + */ + + +// #define the following if you want properties to show up as +// attributes on an element. I know, this sucks, but I'm just not +// really sure if this is necessary... +//#define CREATE_PROPERTIES_AS_ATTRIBUTES + +#include "nsDOMEvent.h" +#include "nsHashtable.h" +#include "nsIAtom.h" +#include "nsIDOMNodeList.h" +#include "nsIDOMScriptObjectFactory.h" +#include "nsIDocument.h" +#include "nsIEventListenerManager.h" +#include "nsIEventStateManager.h" +#include "nsIRDFCursor.h" +#include "nsIRDFDataBase.h" +#include "nsIRDFDocument.h" +#include "nsIRDFNode.h" +#include "nsIRDFResourceManager.h" +#include "nsIServiceManager.h" +#include "nsISupportsArray.h" +#include "nsRDFCID.h" +#include "nsRDFElement.h" +#include "nsINameSpaceManager.h" + +//////////////////////////////////////////////////////////////////////// + +static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); +static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); +static NS_DEFINE_IID(kIDOMEventReceiverIID, NS_IDOMEVENTRECEIVER_IID); +static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); +static NS_DEFINE_IID(kIDOMNodeListIID, NS_IDOMNODELIST_IID); +static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); +static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID); +static NS_DEFINE_IID(kIRDFContentIID, NS_IRDFCONTENT_IID); +static NS_DEFINE_IID(kIRDFDataBaseIID, NS_IRDFDATABASE_IID); +static NS_DEFINE_IID(kIRDFDocumentIID, NS_IRDFDOCUMENT_IID); +static NS_DEFINE_IID(kIRDFResourceManagerIID, NS_IRDFRESOURCEMANAGER_IID); +static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); +static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); +static NS_DEFINE_IID(kIXMLContentIID, NS_IXMLCONTENT_IID); + +static NS_DEFINE_CID(kRDFResourceManagerCID, NS_RDFRESOURCEMANAGER_CID); + + + +//////////////////////////////////////////////////////////////////////// +// RDFDOMNodeListImpl +// +// Helper class to implement the nsIDOMNodeList interface. It's +// probably wrong in some sense, as it uses the "naked" content +// interface to look for kids. (I assume in general this is bad +// because there may be pseudo-elements created for presentation +// that aren't visible to the DOM.) +// + +class RDFDOMNodeListImpl : public nsIDOMNodeList { +private: + nsRDFElement* mElement; + +public: + RDFDOMNodeListImpl(nsRDFElement* element) : mElement(element) { + NS_IF_ADDREF(mElement); + } + + virtual ~RDFDOMNodeListImpl(void) { + NS_IF_RELEASE(mElement); + } + + // nsISupports interface + NS_DECL_ISUPPORTS + + NS_DECL_IDOMNODELIST +}; + +NS_IMPL_ISUPPORTS(RDFDOMNodeListImpl, kIDOMNodeListIID); + +NS_IMETHODIMP +RDFDOMNodeListImpl::GetLength(PRUint32* aLength) +{ + PRInt32 count; + nsresult rv; + if (NS_FAILED(rv = mElement->ChildCount(count))) + return rv; + *aLength = count; + return NS_OK; +} + + +NS_IMETHODIMP +RDFDOMNodeListImpl::Item(PRUint32 aIndex, nsIDOMNode** aReturn) +{ + // XXX naive. probably breaks when there are pseudo elements or something. + nsresult rv; + nsIContent* contentChild; + if (NS_FAILED(rv = mElement->ChildAt(aIndex, contentChild))) + return rv; + + rv = contentChild->QueryInterface(kIDOMNodeIID, (void**) aReturn); + NS_RELEASE(contentChild); + + return rv; +} + + +//////////////////////////////////////////////////////////////////////// +// nsGenericAttribute + +struct nsGenericAttribute +{ + nsGenericAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, const nsString& aValue) + : mNameSpaceID(aNameSpaceID), + mName(aName), + mValue(aValue) + { + NS_IF_ADDREF(mName); + } + + ~nsGenericAttribute(void) + { + NS_IF_RELEASE(mName); + } + + PRInt32 mNameSpaceID; + nsIAtom* mName; + nsString mValue; +}; + +//////////////////////////////////////////////////////////////////////// +// nsRDFElement + +nsresult +NS_NewRDFElement(nsIRDFContent** result) +{ + NS_PRECONDITION(result, "null ptr"); + if (! result) + return NS_ERROR_NULL_POINTER; + + *result = NS_STATIC_CAST(nsIRDFContent*, new nsRDFElement()); + if (! *result) + return NS_ERROR_OUT_OF_MEMORY; + + NS_ADDREF(*result); + return NS_OK; +} + +nsRDFElement::nsRDFElement(void) + : mDocument(nsnull), + mNameSpacePrefix(nsnull), + mNameSpaceID(kNameSpaceID_Unknown), + mScriptObject(nsnull), + mResource(nsnull), + mChildren(nsnull), + mChildrenMustBeGenerated(PR_TRUE), + mParent(nsnull), + mAttributes(nsnull) +{ + NS_INIT_REFCNT(); +} + +nsRDFElement::~nsRDFElement() +{ + if (nsnull != mAttributes) { + PRInt32 count = mAttributes->Count(); + PRInt32 index; + for (index = 0; index < count; index++) { + nsGenericAttribute* attr = (nsGenericAttribute*)mAttributes->ElementAt(index); + delete attr; + } + delete mAttributes; + } + // mDocument is not refcounted + //NS_IF_RELEASE(mScriptObject); XXX don't forget! + NS_IF_RELEASE(mChildren); + NS_IF_RELEASE(mNameSpacePrefix); + NS_IF_RELEASE(mResource); +} + +NS_IMPL_ADDREF(nsRDFElement); +NS_IMPL_RELEASE(nsRDFElement); + +NS_IMETHODIMP +nsRDFElement::QueryInterface(REFNSIID iid, void** result) +{ + if (! result) + return NS_ERROR_NULL_POINTER; + + if (iid.Equals(kIRDFContentIID) || + iid.Equals(kIXMLContentIID) || + iid.Equals(kIContentIID) || + iid.Equals(kISupportsIID)) { + *result = NS_STATIC_CAST(nsIRDFContent*, this); + } + else if (iid.Equals(kIDOMElementIID) || + iid.Equals(kIDOMNodeIID)) { + *result = NS_STATIC_CAST(nsIDOMElement*, this); + } + else if (iid.Equals(kIScriptObjectOwnerIID)) { + *result = NS_STATIC_CAST(nsIScriptObjectOwner*, this); + } + else if (iid.Equals(kIDOMEventReceiverIID)) { + *result = NS_STATIC_CAST(nsIDOMEventReceiver*, this); + } + else if (iid.Equals(kIJSScriptObjectIID)) { + *result = NS_STATIC_CAST(nsIJSScriptObject*, this); + } + else { + *result = nsnull; + return NS_NOINTERFACE; + } + + // if we get here, we know one of the above IIDs was ok. + AddRef(); + return NS_OK; +} + +//////////////////////////////////////////////////////////////////////// +// nsIDOMNode interface + +NS_IMETHODIMP +nsRDFElement::GetNodeName(nsString& aNodeName) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetNodeValue(nsString& aNodeValue) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::SetNodeValue(const nsString& aNodeValue) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetNodeType(PRUint16* aNodeType) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetParentNode(nsIDOMNode** aParentNode) +{ + if (!mParent) + return NS_ERROR_NOT_INITIALIZED; + + return mParent->QueryInterface(kIDOMNodeIID, (void**) aParentNode); +} + + +NS_IMETHODIMP +nsRDFElement::GetChildNodes(nsIDOMNodeList** aChildNodes) +{ + nsresult rv; + if (mChildrenMustBeGenerated) { + if (NS_FAILED(rv = GenerateChildren())) + return rv; + } + + RDFDOMNodeListImpl* list = new RDFDOMNodeListImpl(this); + if (! list) + return NS_ERROR_OUT_OF_MEMORY; + + return list->QueryInterface(kIDOMNodeListIID, (void**) aChildNodes); +} + + +NS_IMETHODIMP +nsRDFElement::GetFirstChild(nsIDOMNode** aFirstChild) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetLastChild(nsIDOMNode** aLastChild) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetPreviousSibling(nsIDOMNode** aPreviousSibling) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetNextSibling(nsIDOMNode** aNextSibling) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetAttributes(nsIDOMNamedNodeMap** aAttributes) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::HasChildNodes(PRBool* aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; + +#if 0 + nsRDFElement* it = new nsRDFElement(); + if (! it) + return NS_ERROR_OUT_OF_MEMORY; + + return it->QueryInterface(kIDOMNodeIID, (void**) aReturn); +#endif +} + + +//////////////////////////////////////////////////////////////////////// +// nsIDOMElement interface + +NS_IMETHODIMP +nsRDFElement::GetTagName(nsString& aTagName) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetDOMAttribute(const nsString& aName, nsString& aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::SetDOMAttribute(const nsString& aName, const nsString& aValue) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::RemoveAttribute(const nsString& aName) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetAttributeNode(const nsString& aName, nsIDOMAttr** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aReturn) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +NS_IMETHODIMP +nsRDFElement::Normalize() +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + + +//////////////////////////////////////////////////////////////////////// +// nsIDOMEventReceiver interface + +NS_IMETHODIMP +nsRDFElement::AddEventListener(nsIDOMEventListener *aListener, const nsIID& aIID) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::RemoveEventListener(nsIDOMEventListener *aListener, const nsIID& aIID) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::GetListenerManager(nsIEventListenerManager** aInstancePtrResult) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + + +//////////////////////////////////////////////////////////////////////// +// nsIScriptObjectOwner interface + +NS_IMETHODIMP +nsRDFElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::SetScriptObject(void *aScriptObject) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +//////////////////////////////////////////////////////////////////////// +// nsIJSScriptObject interface + +PRBool +nsRDFElement::AddProperty(JSContext *aContext, jsval aID, jsval *aVp) +{ + return PR_FALSE; +} + +PRBool +nsRDFElement::DeleteProperty(JSContext *aContext, jsval aID, jsval *aVp) +{ + return PR_FALSE; +} + +PRBool +nsRDFElement::GetProperty(JSContext *aContext, jsval aID, jsval *aVp) +{ + return PR_FALSE; +} + +PRBool +nsRDFElement::SetProperty(JSContext *aContext, jsval aID, jsval *aVp) +{ + return PR_FALSE; +} + +PRBool +nsRDFElement::EnumerateProperty(JSContext *aContext) +{ + return PR_FALSE; +} + + +PRBool +nsRDFElement::Resolve(JSContext *aContext, jsval aID) +{ + return PR_FALSE; +} + + +PRBool +nsRDFElement::Convert(JSContext *aContext, jsval aID) +{ + return PR_FALSE; +} + + +void +nsRDFElement::Finalize(JSContext *aContext) +{ +} + + + +//////////////////////////////////////////////////////////////////////// +// nsIContent interface +// +// Just to say this again (I said it in the header file), none of +// the manipulators for nsIContent will do anything to the RDF +// graph. These are assumed to be used only by the content model +// constructor, who is presumed to be _using_ the RDF graph to +// construct this content model. +// +// You have been warned. +// + +NS_IMETHODIMP +nsRDFElement::GetDocument(nsIDocument*& aResult) const +{ + nsIDocument* doc; + nsresult rv = mDocument->QueryInterface(kIDocumentIID, (void**) &doc); + aResult = doc; // implicit AddRef() from QI + return rv; +} + +NS_IMETHODIMP +nsRDFElement::SetDocument(nsIDocument* aDocument, PRBool aDeep) +{ + nsresult rv; + + if (aDocument) { + nsIRDFDocument* doc; + if (NS_FAILED(rv = aDocument->QueryInterface(kIRDFDocumentIID, + (void**) &doc))) + return rv; + + mDocument = doc; + NS_RELEASE(doc); // not refcounted + } + + if (aDeep && mChildren) { + for (PRInt32 i = mChildren->Count() - 1; i >= 0; --i) { + // XXX this entire block could be more rigorous about + // dealing with failure. + nsISupports* obj = mChildren->ElementAt(i); + + PR_ASSERT(obj); + if (! obj) + continue; + + nsIContent* child; + if (NS_SUCCEEDED(obj->QueryInterface(kIContentIID, (void**) &child))) { + child->SetDocument(aDocument, aDeep); + NS_RELEASE(child); + } + + NS_RELEASE(obj); + } + } + + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::GetParent(nsIContent*& aResult) const +{ + if (!mParent) + return NS_ERROR_NOT_INITIALIZED; + + aResult = mParent; + NS_ADDREF(aResult); + + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::SetParent(nsIContent* aParent) +{ + mParent = aParent; // no refcount + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::CanContainChildren(PRBool& aResult) const +{ + // XXX Hmm -- not sure if this is unilaterally true... + aResult = PR_TRUE; + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::ChildCount(PRInt32& aResult) const +{ + nsresult rv; + if (mChildrenMustBeGenerated) { + if (NS_FAILED(rv = GenerateChildren())) + return rv; + } + + aResult = mChildren->Count(); + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::ChildAt(PRInt32 aIndex, nsIContent*& aResult) const +{ + nsresult rv; + if (mChildrenMustBeGenerated) { + if (NS_FAILED(rv = GenerateChildren())) + return rv; + } + + nsISupports* obj = mChildren->ElementAt(aIndex); + nsIContent* content; + rv = obj->QueryInterface(kIContentIID, (void**) &content); + obj->Release(); + + aResult = content; + return rv; +} + +NS_IMETHODIMP +nsRDFElement::IndexOf(nsIContent* aPossibleChild, PRInt32& aResult) const +{ + nsresult rv; + if (mChildrenMustBeGenerated) { + if (NS_FAILED(rv = GenerateChildren())) + return rv; + } + aResult = mChildren->IndexOf(aPossibleChild); + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::InsertChildAt(nsIContent* aKid, PRInt32 aIndex, PRBool aNotify) +{ + NS_PRECONDITION(aKid, "null ptr"); + if (! aKid) + return NS_ERROR_NULL_POINTER; + + NS_PRECONDITION(mChildren, "uninitialized"); + if (! mChildren) + return NS_ERROR_NOT_INITIALIZED; + + if (! mChildren->InsertElementAt(aKid, aIndex)) { + PR_ASSERT(0); + return NS_ERROR_ILLEGAL_VALUE; + } + aKid->SetParent(this); + if (aNotify) { + // XXX deal with aNotify + } + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::ReplaceChildAt(nsIContent* aKid, PRInt32 aIndex, PRBool aNotify) +{ + NS_PRECONDITION(aKid, "null ptr"); + if (! aKid) + return NS_ERROR_NULL_POINTER; + + NS_PRECONDITION(mChildren, "uninitialized"); + if (! mChildren) + return NS_ERROR_NOT_INITIALIZED; + + if (! mChildren->ReplaceElementAt(aKid, aIndex)) { + PR_ASSERT(0); + return NS_ERROR_ILLEGAL_VALUE; + } + aKid->SetParent(this); + if (aNotify) { + // XXX deal with aNotify + } + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::AppendChildTo(nsIContent* aKid, PRBool aNotify) +{ + NS_PRECONDITION(aKid, "null ptr"); + if (! aKid) + return NS_ERROR_NULL_POINTER; + + NS_PRECONDITION(mChildren, "uninitialized"); + if (! mChildren) + return NS_ERROR_NOT_INITIALIZED; + + mChildren->AppendElement(aKid); + aKid->SetParent(this); + if (aNotify) { + // XXX deal with aNotify + } + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::RemoveChildAt(PRInt32 aIndex, PRBool aNotify) +{ + NS_PRECONDITION(mChildren, "uninitialized"); + if (! mChildren) + return NS_ERROR_NOT_INITIALIZED; + + // XXX probably need to SetParent(nsnull) on the guy. + + if (! mChildren->RemoveElementAt(aIndex)) { + PR_ASSERT(0); + return NS_ERROR_ILLEGAL_VALUE; + } + if (aNotify) { + // XXX deal with aNotify + } + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::IsSynthetic(PRBool& aResult) +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::GetTag(nsIAtom*& aResult) const +{ + // XXX the problem with this is that we only have a + // fully-qualified URI, not "just" the tag. And I think the style + // system ain't gonna work right with that. So this is a complete + // hack to parse what probably _was_ the tag out. + nsAutoString s = mTag; + PRInt32 index; + + if ((index = s.RFind('#')) >= 0) + s.Cut(0, index + 1); + else if ((index = s.RFind('/')) >= 0) + s.Cut(0, index + 1); + +// s.ToLowerCase(); // because that's how CSS works XXX ONLY FOR HTML CONTENT, XML (as well as HTML in XML is case sensitive) + + aResult = NS_NewAtom(s); + return NS_OK; +} + + +// XXX attribute code swiped from nsGenericContainerElement +// this class could probably just use nsGenericContainerElement +// needed to maintain attribute namespace ID as well as ordering +NS_IMETHODIMP +nsRDFElement::SetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, + const nsString& aValue, + PRBool aNotify) +{ + NS_ASSERTION(kNameSpaceID_Unknown != aNameSpaceID, "must have name space ID"); + if (kNameSpaceID_Unknown == aNameSpaceID) { + return NS_ERROR_ILLEGAL_VALUE; + } + NS_ASSERTION(nsnull != aName, "must have attribute name"); + if (nsnull == aName) { + return NS_ERROR_NULL_POINTER; + } + + nsresult rv = NS_ERROR_OUT_OF_MEMORY; + + if (nsnull == mAttributes) { + mAttributes = new nsVoidArray(); + } + if (nsnull != mAttributes) { + nsGenericAttribute* attr; + PRInt32 index; + PRInt32 count = mAttributes->Count(); + for (index = 0; index < count; index++) { + attr = (nsGenericAttribute*)mAttributes->ElementAt(index); + if ((aNameSpaceID == attr->mNameSpaceID) && (aName == attr->mName)) { + attr->mValue = aValue; + rv = NS_OK; + break; + } + } + + if (index >= count) { // didn't find it + attr = new nsGenericAttribute(aNameSpaceID, aName, aValue); + if (nsnull != attr) { + mAttributes->AppendElement(attr); + rv = NS_OK; + } + } + // XXX notify doc? + } + + return rv; +} + + +NS_IMETHODIMP +nsRDFElement::GetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, nsString& aResult) const +{ + NS_ASSERTION(nsnull != aName, "must have attribute name"); + if (nsnull == aName) { + return NS_ERROR_NULL_POINTER; + } + + nsresult rv = NS_CONTENT_ATTR_NOT_THERE; + + if (nsnull != mAttributes) { + PRInt32 count = mAttributes->Count(); + PRInt32 index; + for (index = 0; index < count; index++) { + const nsGenericAttribute* attr = (const nsGenericAttribute*)mAttributes->ElementAt(index); + if ((attr->mNameSpaceID == aNameSpaceID) && (attr->mName == aName)) { + aResult = attr->mValue; + if (0 < aResult.Length()) { + rv = NS_CONTENT_ATTR_HAS_VALUE; + } + else { + rv = NS_CONTENT_ATTR_NO_VALUE; + } + break; + } + } + } + +#if defined(CREATE_PROPERTIES_AS_ATTRIBUTES) + // XXX I'm not sure if we should support properties as attributes + // or not... + nsIRDFResourceManager* mgr = nsnull; + if (NS_FAILED(rv = nsServiceManager::GetService(kRDFResourceManagerCID, + kIRDFResourceManagerIID, + (nsISupports**) &mgr))) + return rv; + + nsIRDFDataBase* db = nsnull; + nsIRDFNode* property = nsnull; + nsIRDFNode* value = nsnull; + + if (NS_FAILED(rv = mDocument->GetDataBase(db))) + goto done; + + if (NS_FAILED(rv = mgr->GetNode(aName, property))) + goto done; + + // XXX Only returns the first value. yer screwed for + // multi-attributes, I guess. + + if (NS_FAILED(rv = db->GetTarget(mResource, property, PR_TRUE, value))) + goto done; + + rv = value->GetStringValue(aResult); + +done: + NS_IF_RELEASE(property); + NS_IF_RELEASE(value); + NS_IF_RELEASE(db); + nsServiceManager::ReleaseService(kRDFResourceManagerCID, mgr); + +#endif // defined(CREATE_PROPERTIES_AS_ATTRIBUTES) + return rv; +} + +NS_IMETHODIMP +nsRDFElement::UnsetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify) +{ + NS_ASSERTION(nsnull != aName, "must have attribute name"); + if (nsnull == aName) { + return NS_ERROR_NULL_POINTER; + } + + nsresult rv = NS_OK; + + if (nsnull != mAttributes) { + PRInt32 count = mAttributes->Count(); + PRInt32 index; + for (index = 0; index < count; index++) { + nsGenericAttribute* attr = (nsGenericAttribute*)mAttributes->ElementAt(index); + if ((attr->mNameSpaceID == aNameSpaceID) && (attr->mName == aName)) { + mAttributes->RemoveElementAt(index); + delete attr; + break; + } + } + +// XXX notify document?? + } + + return rv; +} + +NS_IMETHODIMP +nsRDFElement::GetAttributeNameAt(PRInt32 aIndex, + PRInt32& aNameSpaceID, + nsIAtom*& aName) const +{ + if (nsnull != mAttributes) { + nsGenericAttribute* attr = (nsGenericAttribute*)mAttributes->ElementAt(aIndex); + if (nsnull != attr) { + aNameSpaceID = attr->mNameSpaceID; + aName = attr->mName; + NS_IF_ADDREF(aName); + return NS_OK; + } + } + aNameSpaceID = kNameSpaceID_None; + aName = nsnull; + return NS_ERROR_ILLEGAL_VALUE; + +#if defined(CREATE_PROPERTIES_AS_ATTRIBUTES) + // XXX I'm not sure if we should support attributes or not... + + nsIRDFResourceManager* mgr = nsnull; + if (NS_FAILED(rv = nsServiceManager::GetService(kRDFResourceManagerCID, + kIRDFResourceManagerIID, + (nsISupports**) &mgr))) + return rv; + + nsIRDFDataBase* db = nsnull; + nsIRDFCursor* properties = nsnull; + PRBool moreProperties; + + if (NS_FAILED(rv = mDocument->GetDataBase(db))) + goto done; + + if (NS_FAILED(rv = db->ArcLabelsOut(mResource, properties))) + goto done; + + while (NS_SUCCEEDED(rv = properties->HasMoreElements(moreProperties)) && moreProperties) { + nsIRDFNode* property = nsnull; + PRBool tv; + + if (NS_FAILED(rv = properties->GetNext(property, tv /* ignored */))) + break; + + nsAutoString uri; + if (NS_SUCCEEDED(rv = property->GetStringValue(uri))) { + nsIAtom* atom = NS_NewAtom(uri); + if (atom) { + aArray->AppendElement(atom); + ++aResult; + } else { + rv = NS_ERROR_OUT_OF_MEMORY; + } + } + + NS_RELEASE(property); + + if (NS_FAILED(rv)) + break; + } + +done: + NS_IF_RELEASE(properties); + NS_IF_RELEASE(db); + nsServiceManager::ReleaseService(kRDFResourceManagerCID, mgr); + + return rv; +#endif // defined(CREATE_PROPERTIES_AS_ATTRIBUTES) +} + +NS_IMETHODIMP +nsRDFElement::GetAttributeCount(PRInt32& aResult) const +{ + nsresult rv = NS_OK; + if (nsnull != mAttributes) { + aResult = mAttributes->Count(); + } + else { + aResult = 0; + } + +#if defined(CREATE_PROPERTIES_AS_ATTRIBUTES) + PR_ASSERT(0); // XXX need to write this... +#endif // defined(CREATE_PROPERTIES_AS_ATTRIBUTES) + + return rv; +} + + +static void +rdf_Indent(FILE* out, PRInt32 aIndent) +{ + for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out); +} + +NS_IMETHODIMP +nsRDFElement::List(FILE* out, PRInt32 aIndent) const +{ + nsresult rv; + + { + nsIAtom* tag; + if (NS_FAILED(rv = GetTag(tag))) + return rv; + + rdf_Indent(out, aIndent); + fputs("[RDF ", out); + fputs(tag->GetUnicode(), out); + + NS_RELEASE(tag); + } + + { + PRInt32 nattrs; + + if (NS_SUCCEEDED(rv = GetAttributeCount(nattrs))) { + for (PRInt32 i = 0; i < nattrs; ++i) { + nsIAtom* attr = nsnull; + PRInt32 nameSpaceID; + GetAttributeNameAt(i, nameSpaceID, attr); + + + nsAutoString v; + GetAttribute(nameSpaceID, attr, v); + + nsAutoString s; + attr->ToString(s); + NS_RELEASE(attr); + + fputs(" ", out); + fputs(s, out); + fputs("=", out); + fputs(v, out); + } + } + + if (NS_FAILED(rv)) + return rv; + } + + fputs("]\n", out); + + { + PRInt32 nchildren; + if (NS_FAILED(rv = ChildCount(nchildren))) + return rv; + + for (PRInt32 i = 0; i < nchildren; ++i) { + nsIContent* child; + if (NS_FAILED(rv = ChildAt(i, child))) + return rv; + + rv = child->List(out, aIndent + 1); + NS_RELEASE(child); + + if (NS_FAILED(rv)) + return rv; + } + } + + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::BeginConvertToXIF(nsXIFConverter& aConverter) const +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::ConvertContentToXIF(nsXIFConverter& aConverter) const +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::FinishConvertToXIF(nsXIFConverter& aConverter) const +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsRDFElement::SizeOf(nsISizeOfHandler* aHandler) const +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + + +NS_IMETHODIMP +nsRDFElement::HandleDOMEvent(nsIPresContext& aPresContext, + nsEvent* aEvent, + nsIDOMEvent** aDOMEvent, + PRUint32 aFlags, + nsEventStatus& aEventStatus) +{ + return NS_OK; +} + + + +NS_IMETHODIMP +nsRDFElement::RangeAdd(nsIDOMRange& aRange) +{ + // rdf content does not yet support DOM ranges + return NS_OK; +} + + + +NS_IMETHODIMP +nsRDFElement::RangeRemove(nsIDOMRange& aRange) +{ + // rdf content does not yet support DOM ranges + return NS_OK; +} + + +NS_IMETHODIMP +nsRDFElement::GetRangeList(nsVoidArray*& aResult) const +{ + // rdf content does not yet support DOM ranges + return NS_OK; +} + + +//////////////////////////////////////////////////////////////////////// +// nsIXMLContent + +NS_IMETHODIMP +nsRDFElement::SetNameSpacePrefix(nsIAtom* aNameSpacePrefix) +{ + NS_IF_RELEASE(mNameSpacePrefix); + mNameSpacePrefix = aNameSpacePrefix; + NS_IF_ADDREF(mNameSpacePrefix); + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::GetNameSpacePrefix(nsIAtom*& aNameSpacePrefix) const +{ + aNameSpacePrefix = mNameSpacePrefix; + NS_IF_ADDREF(mNameSpacePrefix); + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::SetNameSpaceID(PRInt32 aNameSpaceID) +{ + mNameSpaceID = aNameSpaceID; + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::GetNameSpaceID(PRInt32& aNameSpaceID) const +{ + aNameSpaceID = mNameSpaceID; + return NS_OK; +} + + +//////////////////////////////////////////////////////////////////////// +// nsIRDFContent + +NS_IMETHODIMP +nsRDFElement::Init(nsIRDFDocument* doc, + const nsString& aTag, + nsIRDFResource* resource, + PRBool childrenMustBeGenerated) +{ + NS_PRECONDITION(doc, "null ptr"); + + // XXX Not using this because of a hack in nsRDFTreeDocument: need + // to expose generic XML elements! + //NS_PRECONDITION(resource, "null ptr"); + + if (!doc /* || !resource // XXX ibid */) + return NS_ERROR_NULL_POINTER; + + mTag = aTag; + + mDocument = doc; // not refcounted + + mResource = resource; + NS_IF_ADDREF(mResource); + + mChildrenMustBeGenerated = childrenMustBeGenerated; + + nsresult rv; + if (NS_FAILED(rv = NS_NewISupportsArray(&mChildren))) + return rv; + + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::SetResource(const nsString& aURI) +{ + if (mResource) + return NS_ERROR_ALREADY_INITIALIZED; + + nsresult rv; + + nsIRDFResourceManager* mgr = nsnull; + if (NS_FAILED(rv = nsServiceManager::GetService(kRDFResourceManagerCID, + kIRDFResourceManagerIID, + (nsISupports**) &mgr))) + return rv; + + rv = mgr->GetUnicodeResource(aURI, &mResource); // implicit AddRef() + nsServiceManager::ReleaseService(kRDFResourceManagerCID, mgr); + + return rv; +} + +NS_IMETHODIMP +nsRDFElement::GetResource(nsString& rURI) const +{ + if (! mResource) + return NS_ERROR_NOT_INITIALIZED; + + const char* s; + nsresult rv; + if (NS_FAILED(rv = mResource->GetValue(&s))) + return rv; + + rURI = s; + return NS_OK; +} + + +NS_IMETHODIMP +nsRDFElement::SetResource(nsIRDFResource* aResource) +{ + NS_PRECONDITION(aResource, "null ptr"); + NS_PRECONDITION(!mResource, "already initialized"); + + if (!aResource) + return NS_ERROR_NULL_POINTER; + + if (mResource) + return NS_ERROR_ALREADY_INITIALIZED; + + mResource = aResource; + NS_ADDREF(mResource); + return NS_OK; +} + + +NS_IMETHODIMP +nsRDFElement::GetResource(nsIRDFResource*& aResource) +{ + if (! mResource) + return NS_ERROR_NOT_INITIALIZED; + + aResource = mResource; + NS_ADDREF(aResource); + return NS_OK; +} + +NS_IMETHODIMP +nsRDFElement::SetProperty(const nsString& aPropertyURI, const nsString& aValue) +{ + if (!mResource || !mDocument) + return NS_ERROR_NOT_INITIALIZED; + + const char* s; + mResource->GetValue(&s); + nsAutoString resource = s; + +#ifdef DEBUG_waterson + char buf[256]; + printf("assert [\n"); + printf(" %s\n", resource.ToCString(buf, sizeof(buf))); + printf(" %s\n", aPropertyURI.ToCString(buf, sizeof(buf))); + printf(" %s\n", aValue.ToCString(buf, sizeof(buf))); + printf("]\n"); +#endif + + nsresult rv; + nsIRDFResourceManager* mgr = nsnull; + + if (NS_FAILED(rv = nsServiceManager::GetService(kRDFResourceManagerCID, + kIRDFResourceManagerIID, + (nsISupports**) &mgr))) + return rv; + + nsIRDFResource* property = nsnull; + nsIRDFLiteral* value = nsnull; + nsIRDFDataBase* db = nsnull; + + if (NS_FAILED(rv = mgr->GetUnicodeResource(aPropertyURI, &property))) + goto done; + + // XXX assume it's a literal? + if (NS_FAILED(rv = mgr->GetLiteral(aValue, &value))) + goto done; + + if (NS_FAILED(rv = mDocument->GetDataBase(db))) + goto done; + + rv = db->Assert(mResource, property, value, PR_TRUE); + +done: + NS_IF_RELEASE(db); + NS_IF_RELEASE(value); + NS_IF_RELEASE(property); + nsServiceManager::ReleaseService(kRDFResourceManagerCID, mgr); + + return rv; +} + +NS_IMETHODIMP +nsRDFElement::GetProperty(const nsString& aPropertyURI, nsString& rValue) const +{ + PR_ASSERT(0); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +//////////////////////////////////////////////////////////////////////// +// Implementation methods + + +nsresult +nsRDFElement::GenerateChildren(void) const +{ + nsresult rv; + + if (!mResource || !mDocument) + return NS_ERROR_NOT_INITIALIZED; + + // XXX hack because we can't use "mutable" + nsRDFElement* unconstThis = NS_CONST_CAST(nsRDFElement*, this); + + if (! unconstThis->mChildren) { + if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren))) + return rv; + } + else { + unconstThis->mChildren->Clear(); + } + + // Clear this value *first*, so we can re-enter the nsIContent + // getters if needed. + unconstThis->mChildrenMustBeGenerated = PR_FALSE; + + if (NS_FAILED(rv = mDocument->CreateChildren(unconstThis))) { + // Well, maybe it was a transient error. This'll let use try + // again some time in the future. + unconstThis->mChildrenMustBeGenerated = PR_TRUE; + return rv; + } + + return NS_OK; +} + diff --git a/mozilla/rdf/src/nsRDFHTMLDocument.cpp b/mozilla/rdf/src/nsRDFHTMLDocument.cpp new file mode 100644 index 00000000000..2ebc1a4f477 --- /dev/null +++ b/mozilla/rdf/src/nsRDFHTMLDocument.cpp @@ -0,0 +1,206 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * The Original Code is Mozilla Communicator client code. + * + * The Initial Developer of the Original Code is Netscape Communications + * Corporation. Portions created by Netscape are Copyright (C) 1998 + * Netscape Communications Corporation. All Rights Reserved. + */ + +/* + + This builds an HTML-like model, complete with text nodes, that can + be displayed in a vanilla HTML content viewer. You can apply CSS2 + styles to the text, etc. + + */ + +#include "nsIRDFContent.h" +#include "nsIRDFCursor.h" +#include "nsIRDFDataBase.h" +#include "nsIRDFNode.h" +#include "nsIRDFResourceManager.h" +#include "nsIServiceManager.h" +#include "nsINameSpaceManager.h" +#include "nsISupportsArray.h" +#include "nsRDFDocument.h" +#include "rdfutil.h" + +//////////////////////////////////////////////////////////////////////// + +static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID); +static NS_DEFINE_IID(kIRDFLiteralIID, NS_IRDFLITERAL_IID); + +//////////////////////////////////////////////////////////////////////// + +class RDFHTMLDocumentImpl : public nsRDFDocument { +public: + RDFHTMLDocumentImpl(); + virtual ~RDFHTMLDocumentImpl(); + +protected: + nsresult AddTreeChild(nsIRDFContent* parent, + const nsString& tag, + nsIRDFResource* property, + nsIRDFResource* value); + + nsresult AddLeafChild(nsIRDFContent* parent, + const nsString& tag, + nsIRDFResource* property, + nsIRDFLiteral* value); + + virtual nsresult AddChild(nsIRDFContent* parent, + nsIRDFResource* property, + nsIRDFNode* value); +}; + +//////////////////////////////////////////////////////////////////////// + +static nsIAtom* kIdAtom; + +RDFHTMLDocumentImpl::RDFHTMLDocumentImpl(void) +{ + if (nsnull == kIdAtom) { + kIdAtom = NS_NewAtom("id"); + } + else { + NS_ADDREF(kIdAtom); + } +} + +RDFHTMLDocumentImpl::~RDFHTMLDocumentImpl(void) +{ + nsrefcnt refcnt; + NS_RELEASE2(kIdAtom, refcnt); +} + +nsresult +RDFHTMLDocumentImpl::AddTreeChild(nsIRDFContent* parent, + const nsString& tag, + nsIRDFResource* property, + nsIRDFResource* value) +{ + // If it's a tree property, then create a child element whose + // value is the value of the property. We'll also attach an "ID=" + // attribute to the new child; e.g., + // + // + // + // + // + // ... + // + + nsresult rv; + const char* p; + nsAutoString s; + nsIRDFContent* child = nsnull; + + // PR_TRUE indicates that we want the child to dynamically + // generate its own kids. + if (NS_FAILED(rv = NewChild(tag, value, child, PR_TRUE))) + goto done; + + if (NS_FAILED(rv = value->GetValue(&p))) + goto done; + + s = p; + + if (NS_FAILED(rv = child->SetAttribute(kNameSpaceID_HTML, kIdAtom, s, PR_FALSE))) + goto done; + + rv = parent->AppendChildTo(child, PR_TRUE); + +done: + NS_IF_RELEASE(child); + return rv; +} + + +nsresult +RDFHTMLDocumentImpl::AddLeafChild(nsIRDFContent* parent, + const nsString& tag, + nsIRDFResource* property, + nsIRDFLiteral* value) +{ + // Otherwise, it's not a tree property. So we'll just create a + // new element for the property, and a simple text node for + // its value; e.g., + // + // + // value + // ... + // + + nsresult rv; + nsIRDFContent* child = nsnull; + + if (NS_FAILED(rv = NewChild(tag, property, child, PR_FALSE))) + goto done; + + if (NS_FAILED(rv = AttachTextNode(child, value))) + goto done; + + rv = parent->AppendChildTo(child, PR_TRUE); + +done: + NS_IF_RELEASE(child); + return rv; +} + +nsresult +RDFHTMLDocumentImpl::AddChild(nsIRDFContent* parent, + nsIRDFResource* property, + nsIRDFNode* value) +{ + nsresult rv; + + // The tag we'll use for the new child will be the string value of + // the property. + const char* s; + if (NS_FAILED(rv = property->GetValue(&s))) + return rv; + + nsAutoString tag = s; + + nsIRDFResource* valueResource; + if (NS_SUCCEEDED(rv = value->QueryInterface(kIRDFResourceIID, (void**) &valueResource))) { + if (IsTreeProperty(property) || rdf_IsContainer(mResourceMgr, mDB, valueResource)) { + rv = AddTreeChild(parent, tag, property, valueResource); + NS_RELEASE(valueResource); + return rv; + } + NS_RELEASE(valueResource); + } + + nsIRDFLiteral* valueLiteral; + if (NS_SUCCEEDED(rv = value->QueryInterface(kIRDFLiteralIID, (void**) &valueLiteral))) { + rv = AddLeafChild(parent, tag, property, valueLiteral); + NS_RELEASE(valueLiteral); + } + return rv; +} + + +//////////////////////////////////////////////////////////////////////// + +nsresult NS_NewRDFHTMLDocument(nsIRDFDocument** result) +{ + nsIRDFDocument* doc = new RDFHTMLDocumentImpl(); + if (! doc) + return NS_ERROR_OUT_OF_MEMORY; + + NS_ADDREF(doc); + *result = doc; + return NS_OK; +} diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 8fe9eb2a345..7c432ced7fa 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -3041,7 +3041,7 @@ nsBrowserWindow::DispatchStyleMenu(PRInt32 aID) nsAutoString defaultStyle; nsIDocument* doc = shell->GetDocument(); if (nsnull != doc) { - nsIAtom* defStyleAtom = NS_NewAtom("DEFAULT-STYLE"); + nsIAtom* defStyleAtom = NS_NewAtom("default-style"); doc->GetHeaderData(defStyleAtom, defaultStyle); NS_RELEASE(defStyleAtom); NS_RELEASE(doc); @@ -3080,7 +3080,7 @@ nsBrowserWindow::DispatchStyleMenu(PRInt32 aID) nsIDocument* doc = shell->GetDocument(); if (nsnull != doc) { nsAutoString defaultStyle; - nsIAtom* defStyleAtom = NS_NewAtom("DEFAULT-STYLE"); + nsIAtom* defStyleAtom = NS_NewAtom("default-style"); doc->GetHeaderData(defStyleAtom, defaultStyle); NS_RELEASE(defStyleAtom); NS_RELEASE(doc); diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp index 7c18ee28afc..a0a8a5475df 100644 --- a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp +++ b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp @@ -161,12 +161,12 @@ nsWebCrawler::nsWebCrawler(nsViewerApp* aViewer) mHeight = -1; mMaxPages = -1; mRecord = nsnull; - mLinkTag = NS_NewAtom("A"); - mFrameTag = NS_NewAtom("FRAME"); - mIFrameTag = NS_NewAtom("IFRAME"); - mHrefAttr = NS_NewAtom("HREF"); - mSrcAttr = NS_NewAtom("SRC"); - mBaseHrefAttr = NS_NewAtom("_BASE_HREF"); + mLinkTag = NS_NewAtom("a"); + mFrameTag = NS_NewAtom("frame"); + mIFrameTag = NS_NewAtom("iframe"); + mHrefAttr = NS_NewAtom("href"); + mSrcAttr = NS_NewAtom("src"); + mBaseHrefAttr = NS_NewAtom("_base_href"); mVisited = new AtomHashTable(); mVerbose = nsnull; mRegressing = PR_FALSE; diff --git a/mozilla/widget/src/xpwidgets/nsHTItem.cpp b/mozilla/widget/src/xpwidgets/nsHTItem.cpp index 0fa88718090..605228980a0 100644 --- a/mozilla/widget/src/xpwidgets/nsHTItem.cpp +++ b/mozilla/widget/src/xpwidgets/nsHTItem.cpp @@ -36,8 +36,8 @@ nsHTItem::nsHTItem(nsIContent* pContent, nsHierarchicalDataModel* pDataModel) mIndentationLevel = 0; if (nsnull == kOpenAtom) { - kOpenAtom = NS_NewAtom("OPEN"); - kSelectedAtom = NS_NewAtom("OPEN"); + kOpenAtom = NS_NewAtom("open"); + kSelectedAtom = NS_NewAtom("open"); } else { NS_ADDREF(kOpenAtom);