From d8e813d08bc93cc50342d19f31486b71f8a9342b Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sun, 10 Jun 2007 19:27:57 +0000 Subject: [PATCH] Remove duplicated "is this an event attr?" code. Bug 383714, patch by Ryan Jones , r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@227750 18797224-902f-48f8-a5cc-f745e15eee43 --- .../base/src/nsHTMLContentSerializer.cpp | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp index f6bf436f86a..acc14d7782c 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp @@ -21,6 +21,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Ryan Jones * * Alternatively, the contents of this file may be used under the terms of * either of the GNU General Public License Version 2 or later (the "GPL"), @@ -454,29 +455,8 @@ nsHTMLContentSerializer::IsJavaScript(nsIAtom* aAttrNameAtom, const nsAString& a return PR_FALSE; } - PRBool result = - (aAttrNameAtom == nsGkAtoms::onblur) || (aAttrNameAtom == nsGkAtoms::onchange) - || (aAttrNameAtom == nsGkAtoms::onclick) || (aAttrNameAtom == nsGkAtoms::ondblclick) - || (aAttrNameAtom == nsGkAtoms::onfocus) || (aAttrNameAtom == nsGkAtoms::onkeydown) - || (aAttrNameAtom == nsGkAtoms::onkeypress) || (aAttrNameAtom == nsGkAtoms::onkeyup) - || (aAttrNameAtom == nsGkAtoms::onload) || (aAttrNameAtom == nsGkAtoms::onmousedown) - || (aAttrNameAtom == nsGkAtoms::onpageshow) || (aAttrNameAtom == nsGkAtoms::onpagehide) - || (aAttrNameAtom == nsGkAtoms::onmousemove) || (aAttrNameAtom == nsGkAtoms::onmouseout) - || (aAttrNameAtom == nsGkAtoms::onmouseover) || (aAttrNameAtom == nsGkAtoms::onmouseup) - || (aAttrNameAtom == nsGkAtoms::onreset) || (aAttrNameAtom == nsGkAtoms::onselect) - || (aAttrNameAtom == nsGkAtoms::onsubmit) || (aAttrNameAtom == nsGkAtoms::onunload) - || (aAttrNameAtom == nsGkAtoms::onabort) || (aAttrNameAtom == nsGkAtoms::onerror) - || (aAttrNameAtom == nsGkAtoms::onpaint) || (aAttrNameAtom == nsGkAtoms::onresize) - || (aAttrNameAtom == nsGkAtoms::onscroll) || (aAttrNameAtom == nsGkAtoms::onbroadcast) - || (aAttrNameAtom == nsGkAtoms::onclose) || (aAttrNameAtom == nsGkAtoms::oncontextmenu) - || (aAttrNameAtom == nsGkAtoms::oncommand) || (aAttrNameAtom == nsGkAtoms::oncommandupdate) - || (aAttrNameAtom == nsGkAtoms::ondragdrop) || (aAttrNameAtom == nsGkAtoms::ondragenter) - || (aAttrNameAtom == nsGkAtoms::ondragexit) || (aAttrNameAtom == nsGkAtoms::ondraggesture) - || (aAttrNameAtom == nsGkAtoms::ondragover) || (aAttrNameAtom == nsGkAtoms::ondragstart) - || (aAttrNameAtom == nsGkAtoms::ondragleave) || (aAttrNameAtom == nsGkAtoms::ondrop) - || (aAttrNameAtom == nsGkAtoms::ondragend) || (aAttrNameAtom == nsGkAtoms::ondrag) - || (aAttrNameAtom == nsGkAtoms::oninput); - return result; + return nsContentUtils::IsEventAttributeName(aAttrNameAtom, + EventNameType_HTML); } nsresult