From 1da42403ec84fcbb634a816bec0618e47d5e0b70 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 5 Sep 2020 18:44:16 +0000 Subject: Issue #1525 - Kill marquee element (uplift) --- accessible/base/ARIAMap.cpp | 10 - accessible/mac/mozAccessible.mm | 3 - .../tests/mochitest/attributes/test_obj.html | 6 - accessible/tests/mochitest/role/test_aria.html | 6 - dom/base/crashtests/1251361.html | 33 - dom/base/crashtests/371466-1.xhtml | 24 - dom/base/crashtests/535926-1.html | 28 - dom/base/nsGkAtomList.h | 1 - dom/base/test/test_bug840098.html | 2 +- dom/base/test/test_caretPositionFromPoint.html | 2 +- dom/base/test/test_mutationobservers.html | 913 --------------------- .../checkout/deqp/temp_externs/webkit_css.js | 456 ---------- dom/html/HTMLDivElement.cpp | 34 - dom/html/test/test_bug389797.html | 1 - dom/html/test/test_documentAll.html | 2 +- dom/security/test/csp/file_bug1312272.html | 13 - .../csp/file_strict_dynamic_script_events_xbl.html | 14 - dom/security/test/csp/test_strict_dynamic.html | 7 - dom/tests/browser/browser_bug396843.js | 1 - dom/tests/mochitest/bugs/mochitest.ini | 1 - .../mochitest/bugs/test_bug1160342_marquee.html | 337 -------- dom/tests/mochitest/bugs/test_bug396843.html | 1 - dom/xbl/crashtests/342954-1.xhtml | 46 -- dom/xbl/crashtests/342954-2-xbl.xml | 19 - dom/xbl/crashtests/342954-2.xhtml | 29 - dom/xbl/crashtests/477878-1.html | 4 - editor/libeditor/HTMLEditUtils.cpp | 1 - layout/base/crashtests/265027-1.html | 19 - layout/base/crashtests/265986-1.html | 10 - layout/base/crashtests/265999-1.html | 8 - layout/base/crashtests/367498-2.html | 14 - layout/base/crashtests/404491-1.html | 5 - layout/base/crashtests/580129-1.html | 19 - layout/base/crashtests/580494-1.html | 1 - layout/base/crashtests/597924-1.html | 16 - layout/generic/crashtests/265867-1.html | 11 - layout/generic/crashtests/348510-1.html | 7 - layout/generic/crashtests/348510-2.html | 7 - layout/generic/crashtests/363722-1.html | 9 - layout/generic/crashtests/363722-2.html | 10 - layout/generic/crashtests/370866-1.xhtml | 14 - layout/generic/crashtests/379917-1.xhtml | 35 - layout/generic/crashtests/398332-3.html | 4 - layout/generic/crashtests/421671.html | 202 ----- layout/generic/crashtests/619021.html | 5 - layout/generic/crashtests/724235.html | 28 - layout/reftests/bidi/logicalmarquee.html | 11 - layout/reftests/bidi/marquee-ref.html | 11 - layout/reftests/bidi/reftest-stylo.list | 3 - layout/reftests/bidi/reftest.list | 3 - layout/reftests/bidi/visualmarquee.html | 11 - layout/reftests/marquee/1160342-1.html | 10 - layout/reftests/marquee/1160342-2.html | 10 - layout/reftests/marquee/1160342-ref.html | 10 - layout/reftests/marquee/166591-dynamic-1-ref.html | 6 - layout/reftests/marquee/166591-dynamic-1.html | 11 - layout/reftests/marquee/336736-1-ref.html | 5 - layout/reftests/marquee/336736-1a.html | 13 - layout/reftests/marquee/336736-1b.html | 13 - layout/reftests/marquee/406073-1-ref.html | 11 - layout/reftests/marquee/406073-1.html | 23 - layout/reftests/marquee/407016-2-ref.html | 5 - layout/reftests/marquee/407016-2.html | 7 - layout/reftests/marquee/413027-4-ref.html | 10 - layout/reftests/marquee/413027-4.html | 15 - layout/reftests/marquee/425247-1-ref.html | 9 - layout/reftests/marquee/425247-1.html | 9 - layout/reftests/marquee/425247-2-ref.html | 9 - layout/reftests/marquee/425247-2.html | 9 - layout/reftests/marquee/429849-1-ref.html | 10 - layout/reftests/marquee/429849-1.html | 10 - layout/reftests/marquee/reftest-stylo.list | 16 - layout/reftests/marquee/reftest.list | 11 - layout/reftests/moz.build | 2 - layout/reftests/reftest-stylo.list | 3 - layout/reftests/reftest.list | 3 - layout/reftests/writing-mode/reftest-stylo.list | 2 - layout/reftests/writing-mode/reftest.list | 2 - .../writing-mode/ua-style-sheet-size-1-ref.html | 22 - .../writing-mode/ua-style-sheet-size-1.html | 19 - .../writing-mode/ua-style-sheet-size-2-ref.html | 22 - .../writing-mode/ua-style-sheet-size-2.html | 19 - layout/style/contenteditable.css | 9 - layout/style/moz.build | 1 - layout/style/nsCSSParser.cpp | 24 +- layout/style/res/html.css | 17 - layout/style/xbl-marquee/jar.mn | 8 - layout/style/xbl-marquee/moz.build | 7 - layout/style/xbl-marquee/xbl-marquee.css | 12 - layout/style/xbl-marquee/xbl-marquee.xml | 733 ----------------- .../nu/validator/htmlparser/impl/ElementName.java | 2 - parser/html/nsHtml5AtomList.h | 1 - parser/html/nsHtml5ElementName.h | 1 - parser/htmlparser/nsHTMLTagList.h | 1 - .../mozlog/mozlog/formatters/html/xmlgen.py | 2 +- .../tests/dom/nodes/Node-cloneNode.html | 1 - .../tests/tools/html5lib/html5lib/constants.py | 2 - .../tests/tools/html5lib/html5lib/html5parser.py | 19 - .../tests/testdata/tree-construction/tests1.dat | 280 ------- .../tests/testdata/tree-construction/tests19.dat | 12 - .../tools/html5lib/html5lib/treebuilders/_base.py | 4 +- testing/web-platform/tests/tools/py/py/_xmlgen.py | 2 +- 102 files changed, 18 insertions(+), 3903 deletions(-) delete mode 100644 dom/base/crashtests/1251361.html delete mode 100644 dom/base/crashtests/371466-1.xhtml delete mode 100644 dom/base/crashtests/535926-1.html delete mode 100644 dom/base/test/test_mutationobservers.html delete mode 100644 dom/canvas/test/webgl-conf/checkout/deqp/temp_externs/webkit_css.js delete mode 100644 dom/security/test/csp/file_bug1312272.html delete mode 100644 dom/security/test/csp/file_strict_dynamic_script_events_xbl.html delete mode 100644 dom/tests/mochitest/bugs/test_bug1160342_marquee.html delete mode 100644 dom/xbl/crashtests/342954-1.xhtml delete mode 100644 dom/xbl/crashtests/342954-2-xbl.xml delete mode 100644 dom/xbl/crashtests/342954-2.xhtml delete mode 100644 dom/xbl/crashtests/477878-1.html delete mode 100644 layout/base/crashtests/265027-1.html delete mode 100644 layout/base/crashtests/265986-1.html delete mode 100644 layout/base/crashtests/265999-1.html delete mode 100644 layout/base/crashtests/367498-2.html delete mode 100644 layout/base/crashtests/404491-1.html delete mode 100644 layout/base/crashtests/580129-1.html delete mode 100644 layout/base/crashtests/580494-1.html delete mode 100644 layout/base/crashtests/597924-1.html delete mode 100644 layout/generic/crashtests/265867-1.html delete mode 100644 layout/generic/crashtests/348510-1.html delete mode 100644 layout/generic/crashtests/348510-2.html delete mode 100644 layout/generic/crashtests/363722-1.html delete mode 100644 layout/generic/crashtests/363722-2.html delete mode 100644 layout/generic/crashtests/370866-1.xhtml delete mode 100644 layout/generic/crashtests/379917-1.xhtml delete mode 100644 layout/generic/crashtests/398332-3.html delete mode 100644 layout/generic/crashtests/421671.html delete mode 100644 layout/generic/crashtests/619021.html delete mode 100644 layout/generic/crashtests/724235.html delete mode 100644 layout/reftests/bidi/logicalmarquee.html delete mode 100644 layout/reftests/bidi/marquee-ref.html delete mode 100644 layout/reftests/bidi/visualmarquee.html delete mode 100644 layout/reftests/marquee/1160342-1.html delete mode 100644 layout/reftests/marquee/1160342-2.html delete mode 100644 layout/reftests/marquee/1160342-ref.html delete mode 100644 layout/reftests/marquee/166591-dynamic-1-ref.html delete mode 100644 layout/reftests/marquee/166591-dynamic-1.html delete mode 100644 layout/reftests/marquee/336736-1-ref.html delete mode 100644 layout/reftests/marquee/336736-1a.html delete mode 100644 layout/reftests/marquee/336736-1b.html delete mode 100644 layout/reftests/marquee/406073-1-ref.html delete mode 100644 layout/reftests/marquee/406073-1.html delete mode 100644 layout/reftests/marquee/407016-2-ref.html delete mode 100644 layout/reftests/marquee/407016-2.html delete mode 100644 layout/reftests/marquee/413027-4-ref.html delete mode 100644 layout/reftests/marquee/413027-4.html delete mode 100644 layout/reftests/marquee/425247-1-ref.html delete mode 100644 layout/reftests/marquee/425247-1.html delete mode 100644 layout/reftests/marquee/425247-2-ref.html delete mode 100644 layout/reftests/marquee/425247-2.html delete mode 100644 layout/reftests/marquee/429849-1-ref.html delete mode 100644 layout/reftests/marquee/429849-1.html delete mode 100644 layout/reftests/marquee/reftest-stylo.list delete mode 100644 layout/reftests/marquee/reftest.list delete mode 100644 layout/reftests/writing-mode/ua-style-sheet-size-1-ref.html delete mode 100644 layout/reftests/writing-mode/ua-style-sheet-size-1.html delete mode 100644 layout/reftests/writing-mode/ua-style-sheet-size-2-ref.html delete mode 100644 layout/reftests/writing-mode/ua-style-sheet-size-2.html delete mode 100644 layout/style/xbl-marquee/jar.mn delete mode 100644 layout/style/xbl-marquee/moz.build delete mode 100644 layout/style/xbl-marquee/xbl-marquee.css delete mode 100644 layout/style/xbl-marquee/xbl-marquee.xml diff --git a/accessible/base/ARIAMap.cpp b/accessible/base/ARIAMap.cpp index c29d37873..3a89cf9ed 100644 --- a/accessible/base/ARIAMap.cpp +++ b/accessible/base/ARIAMap.cpp @@ -347,16 +347,6 @@ static const nsRoleMapEntry sWAIRoleMaps[] = eLandmark, kNoReqStates }, - { // marquee - &nsGkAtoms::marquee, - roles::ANIMATION, - kUseMapRole, - eNoValue, - eNoAction, - eOffLiveAttr, - kGenericAccType, - kNoReqStates - }, { // math &nsGkAtoms::math, roles::FLAT_EQUATION, diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm index 07868fea6..a02779ef2 100644 --- a/accessible/mac/mozAccessible.mm +++ b/accessible/mac/mozAccessible.mm @@ -732,8 +732,6 @@ using namespace mozilla::a11y; return @"AXDocument"; if (roleAtom == nsGkAtoms::log_) return @"AXApplicationLog"; - if (roleAtom == nsGkAtoms::marquee) - return @"AXApplicationMarquee"; if (roleAtom == nsGkAtoms::math) return @"AXDocumentMath"; if (roleAtom == nsGkAtoms::note_) @@ -869,7 +867,6 @@ static const RoleDescrMap sRoleDescrMap[] = { { @"AXApplicationAlert", NS_LITERAL_STRING("alert") }, { @"AXApplicationAlertDialog", NS_LITERAL_STRING("alertDialog") }, { @"AXApplicationLog", NS_LITERAL_STRING("log") }, - { @"AXApplicationMarquee", NS_LITERAL_STRING("marquee") }, { @"AXApplicationStatus", NS_LITERAL_STRING("status") }, { @"AXApplicationTimer", NS_LITERAL_STRING("timer") }, { @"AXContentSeparator", NS_LITERAL_STRING("separator") }, diff --git a/accessible/tests/mochitest/attributes/test_obj.html b/accessible/tests/mochitest/attributes/test_obj.html index 9e147e1d1..0706dd408 100644 --- a/accessible/tests/mochitest/attributes/test_obj.html +++ b/accessible/tests/mochitest/attributes/test_obj.html @@ -62,7 +62,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558036 testAbsentAttrs("live3", {"live" : ""}); testAttrs("log", {"live" : "polite"}, true); testAttrs("logAssertive", {"live" : "assertive"}, true); - testAttrs("marquee", {"live" : "off"}, true); testAttrs("status", {"live" : "polite"}, true); testAttrs("timer", {"live" : "off"}, true); testAbsentAttrs("tablist", {"live" : "polite"}); @@ -72,7 +71,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558036 testAttrs("live2Child", {"container-live" : "polite"}, true); testAttrs("logChild", {"container-live" : "polite"}, true); testAttrs("logAssertiveChild", {"container-live" : "assertive"}, true); - testAttrs("marqueeChild", {"container-live" : "off"}, true); testAttrs("statusChild", {"container-live" : "polite"}, true); testAttrs("timerChild", {"container-live" : "off"}, true); testAbsentAttrs("tablistChild", {"container-live" : "polite"}); @@ -80,13 +78,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558036 // container-live-role object attribute testAttrs("log", {"container-live-role" : "log"}, true); testAttrs("logAssertive", {"container-live-role" : "log"}, true); - testAttrs("marquee", {"container-live-role" : "marquee"}, true); testAttrs("status", {"container-live-role" : "status"}, true); testAttrs("timer", {"container-live-role" : "timer"}, true); testAttrs("logChild", {"container-live-role" : "log"}, true); testAttrs("logAssertive", {"container-live-role" : "log"}, true); testAttrs("logAssertiveChild", {"container-live-role" : "log"}, true); - testAttrs("marqueeChild", {"container-live-role" : "marquee"}, true); testAttrs("statusChild", {"container-live-role" : "status"}, true); testAttrs("timerChild", {"container-live-role" : "timer"}, true); testAbsentAttrs("tablistChild", {"container-live-role" : "tablist"}); @@ -230,11 +226,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558036
excuse
me
-
excuse
me
excuse
excuse
me
excuse
me
-
excuse
me
excuse
me
tablist
tab
excuse
me
diff --git a/accessible/tests/mochitest/role/test_aria.html b/accessible/tests/mochitest/role/test_aria.html index 22021fa57..482ce4327 100644 --- a/accessible/tests/mochitest/role/test_aria.html +++ b/accessible/tests/mochitest/role/test_aria.html @@ -41,7 +41,6 @@ testRole("aria_listbox", ROLE_LISTBOX); testRole("aria_listitem", ROLE_LISTITEM); testRole("aria_log", ROLE_TEXT); // weak role - testRole("aria_marquee", ROLE_ANIMATION); testRole("aria_math", ROLE_FLAT_EQUATION); testRole("aria_menu", ROLE_MENUPOPUP); testRole("aria_menubar", ROLE_MENUBAR); @@ -89,9 +88,6 @@ testRole("log_table", ROLE_TABLE); testRole("timer_div", ROLE_SECTION); - // other roles that are forms of "live regions" - testRole("marquee_h1", ROLE_ANIMATION); - // strong landmark testRole("application", ROLE_APPLICATION); testRole("form", ROLE_FORM); @@ -219,7 +215,6 @@ - @@ -263,7 +258,6 @@
Table based log
-

marquee

timer
diff --git a/dom/base/crashtests/1251361.html b/dom/base/crashtests/1251361.html deleted file mode 100644 index 57c76121f..000000000 --- a/dom/base/crashtests/1251361.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/dom/base/crashtests/371466-1.xhtml b/dom/base/crashtests/371466-1.xhtml deleted file mode 100644 index 8da0b22b1..000000000 --- a/dom/base/crashtests/371466-1.xhtml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - -
Foo


-marquee +
div

diff --git a/dom/base/test/test_mutationobservers.html b/dom/base/test/test_mutationobservers.html deleted file mode 100644 index a6de89595..000000000 --- a/dom/base/test/test_mutationobservers.html +++ /dev/null @@ -1,913 +0,0 @@ - - - - - - Test for Bug 641821 - - - - -Mozilla Bug 641821 -

- -
-
-
-
-
- - diff --git a/dom/canvas/test/webgl-conf/checkout/deqp/temp_externs/webkit_css.js b/dom/canvas/test/webgl-conf/checkout/deqp/temp_externs/webkit_css.js deleted file mode 100644 index 60841f8e2..000000000 --- a/dom/canvas/test/webgl-conf/checkout/deqp/temp_externs/webkit_css.js +++ /dev/null @@ -1,456 +0,0 @@ -/* - * Copyright 2008 The Closure Compiler Authors - * - * Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @fileoverview Definitions for WebKit's custom CSS properties. Copied from: - * {@link - * http://trac.webkit.org/browser/trunk/Source/WebCore/css/CSSPropertyNames.in} - * - * If you make changes to this file, notice that every property appears - * twice: once as an uppercase name and once as a lowercase name. - * WebKit allows both. The uppercase version is preferred. - * - * @externs - * @author nicksantos@google.com (Nick Santos) - */ - -/** @type {string} */ CSSProperties.prototype.WebkitAlignContent; -/** @type {string} */ CSSProperties.prototype.WebkitAlignItems; -/** @type {string} */ CSSProperties.prototype.WebkitAlignSelf; -/** @type {string} */ CSSProperties.prototype.WebkitAnimation; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationDelay; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationDirection; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationDuration; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationFillMode; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationIterationCount; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationName; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationPlayState; -/** @type {string} */ CSSProperties.prototype.WebkitAnimationTimingFunction; -/** @type {string} */ CSSProperties.prototype.WebkitAppearance; -/** @type {string} */ CSSProperties.prototype.WebkitAppRegion; -/** @type {string} */ CSSProperties.prototype.WebkitAspectRatio; -/** @type {string} */ CSSProperties.prototype.WebkitBackfaceVisibility; -/** @type {string} */ CSSProperties.prototype.WebkitBackgroundClip; -/** @type {string} */ CSSProperties.prototype.WebkitBackgroundComposite; -/** @type {string} */ CSSProperties.prototype.WebkitBackgroundOrigin; -/** @type {string} */ CSSProperties.prototype.WebkitBackgroundSize; -/** @type {string} */ CSSProperties.prototype.WebkitBinding; -/** @type {string} */ CSSProperties.prototype.WebkitBlendMode; -/** @type {string} */ CSSProperties.prototype.WebkitBorderAfter; -/** @type {string} */ CSSProperties.prototype.WebkitBorderAfterColor; -/** @type {string} */ CSSProperties.prototype.WebkitBorderAfterStyle; -/** @type {string} */ CSSProperties.prototype.WebkitBorderAfterWidth; -/** @type {string} */ CSSProperties.prototype.WebkitBorderBefore; -/** @type {string} */ CSSProperties.prototype.WebkitBorderBeforeColor; -/** @type {string} */ CSSProperties.prototype.WebkitBorderBeforeStyle; -/** @type {string} */ CSSProperties.prototype.WebkitBorderBeforeWidth; -/** @type {string} */ CSSProperties.prototype.WebkitBorderBottomLeftRadius; -/** @type {string} */ CSSProperties.prototype.WebkitBorderBottomRightRadius; -/** @type {string} */ CSSProperties.prototype.WebkitBorderEnd; -/** @type {string} */ CSSProperties.prototype.WebkitBorderEndColor; -/** @type {string} */ CSSProperties.prototype.WebkitBorderEndStyle; -/** @type {string} */ CSSProperties.prototype.WebkitBorderEndWidth; -/** @type {string} */ CSSProperties.prototype.WebkitBorderFit; -/** @type {string} */ CSSProperties.prototype.WebkitBorderHorizontalSpacing; -/** @type {string} */ CSSProperties.prototype.WebkitBorderImage; -/** @type {string} */ CSSProperties.prototype.WebkitBorderRadius; -/** @type {string} */ CSSProperties.prototype.WebkitBorderStart; -/** @type {string} */ CSSProperties.prototype.WebkitBorderStartColor; -/** @type {string} */ CSSProperties.prototype.WebkitBorderStartStyle; -/** @type {string} */ CSSProperties.prototype.WebkitBorderStartWidth; -/** @type {string} */ CSSProperties.prototype.WebkitBorderTopLeftRadius; -/** @type {string} */ CSSProperties.prototype.WebkitBorderTopRightRadius; -/** @type {string} */ CSSProperties.prototype.WebkitBorderVerticalSpacing; -/** @type {string} */ CSSProperties.prototype.WebkitBoxAlign; -/** @type {string} */ CSSProperties.prototype.WebkitBoxDecorationBreak; -/** @type {string} */ CSSProperties.prototype.WebkitBoxDirection; -/** @type {string} */ CSSProperties.prototype.WebkitBoxFlex; -/** @type {string} */ CSSProperties.prototype.WebkitBoxFlexGroup; -/** @type {string} */ CSSProperties.prototype.WebkitBoxLines; -/** @type {string} */ CSSProperties.prototype.WebkitBoxOrdinalGroup; -/** @type {string} */ CSSProperties.prototype.WebkitBoxOrient; -/** @type {string} */ CSSProperties.prototype.WebkitBoxPack; -/** @type {string} */ CSSProperties.prototype.WebkitBoxReflect; -/** @type {string} */ CSSProperties.prototype.WebkitBoxShadow; -/** @type {string} */ CSSProperties.prototype.WebkitBoxSizing; -/** @type {string} */ CSSProperties.prototype.WebkitColorCorrection; -/** @type {string} */ CSSProperties.prototype.WebkitColumnAxis; -/** @type {string} */ CSSProperties.prototype.WebkitColumnBreakAfter; -/** @type {string} */ CSSProperties.prototype.WebkitColumnBreakBefore; -/** @type {string} */ CSSProperties.prototype.WebkitColumnBreakInside; -/** @type {string} */ CSSProperties.prototype.WebkitColumnCount; -/** @type {string} */ CSSProperties.prototype.WebkitColumnGap; -/** @type {string} */ CSSProperties.prototype.WebkitColumnProgression; -/** @type {string} */ CSSProperties.prototype.WebkitColumnRule; -/** @type {string} */ CSSProperties.prototype.WebkitColumnRuleColor; -/** @type {string} */ CSSProperties.prototype.WebkitColumnRuleStyle; -/** @type {string} */ CSSProperties.prototype.WebkitColumnRuleWidth; -/** @type {string} */ CSSProperties.prototype.WebkitColumns; -/** @type {string} */ CSSProperties.prototype.WebkitColumnSpan; -/** @type {string} */ CSSProperties.prototype.WebkitColumnWidth; -/** @type {string} */ CSSProperties.prototype.WebkitDashboardRegion; -/** @type {string} */ CSSProperties.prototype.WebkitFilter; -/** @type {string} */ CSSProperties.prototype.WebkitFlex; -/** @type {string} */ CSSProperties.prototype.WebkitFlexBasis; -/** @type {string} */ CSSProperties.prototype.WebkitFlexDirection; -/** @type {string} */ CSSProperties.prototype.WebkitFlexFlow; -/** @type {string} */ CSSProperties.prototype.WebkitFlexGrow; -/** @type {string} */ CSSProperties.prototype.WebkitFlexShrink; -/** @type {string} */ CSSProperties.prototype.WebkitFlexWrap; -/** @type {string} */ CSSProperties.prototype.WebkitFlowFrom; -/** @type {string} */ CSSProperties.prototype.WebkitFlowInto; -/** @type {string} */ CSSProperties.prototype.WebkitFontSizeDelta; -/** @type {string} */ CSSProperties.prototype.WebkitFontSmoothing; -/** @type {string} */ CSSProperties.prototype.WebkitGridColumn; -/** @type {string} */ CSSProperties.prototype.WebkitGridColumns; -/** @type {string} */ CSSProperties.prototype.WebkitGridRow; -/** @type {string} */ CSSProperties.prototype.WebkitGridRows; -/** @type {string} */ CSSProperties.prototype.WebkitHighlight; -/** @type {string} */ CSSProperties.prototype.WebkitHyphenateCharacter; -/** @type {string} */ CSSProperties.prototype.WebkitHyphenateLimitAfter; -/** @type {string} */ CSSProperties.prototype.WebkitHyphenateLimitBefore; -/** @type {string} */ CSSProperties.prototype.WebkitHyphenateLimitLines; -/** @type {string} */ CSSProperties.prototype.WebkitHyphens; -/** @type {string} */ CSSProperties.prototype.WebkitJustifyContent; -/** @type {string} */ CSSProperties.prototype.WebkitLineAlign; -/** @type {string} */ CSSProperties.prototype.WebkitLineBoxContain; -/** @type {string} */ CSSProperties.prototype.WebkitLineBreak; -/** @type {string} */ CSSProperties.prototype.WebkitLineClamp; -/** @type {string} */ CSSProperties.prototype.WebkitLineGrid; -/** @type {string} */ CSSProperties.prototype.WebkitLineSnap; -/** @type {string} */ CSSProperties.prototype.WebkitLocale; -/** @type {string} */ CSSProperties.prototype.WebkitLogicalHeight; -/** @type {string} */ CSSProperties.prototype.WebkitLogicalWidth; -/** @type {string} */ CSSProperties.prototype.WebkitMarginAfter; -/** @type {string} */ CSSProperties.prototype.WebkitMarginAfterCollapse; -/** @type {string} */ CSSProperties.prototype.WebkitMarginBefore; -/** @type {string} */ CSSProperties.prototype.WebkitMarginBeforeCollapse; -/** @type {string} */ CSSProperties.prototype.WebkitMarginBottomCollapse; -/** @type {string} */ CSSProperties.prototype.WebkitMarginCollapse; -/** @type {string} */ CSSProperties.prototype.WebkitMarginEnd; -/** @type {string} */ CSSProperties.prototype.WebkitMarginStart; -/** @type {string} */ CSSProperties.prototype.WebkitMarginTopCollapse; -/** @type {string} */ CSSProperties.prototype.WebkitMarquee; -/** @type {string} */ CSSProperties.prototype.WebkitMarqueeDirection; -/** @type {string} */ CSSProperties.prototype.WebkitMarqueeIncrement; -/** @type {string} */ CSSProperties.prototype.WebkitMarqueeRepetition; -/** @type {string} */ CSSProperties.prototype.WebkitMarqueeSpeed; -/** @type {string} */ CSSProperties.prototype.WebkitMarqueeStyle; -/** @type {string} */ CSSProperties.prototype.WebkitMask; -/** @type {string} */ CSSProperties.prototype.WebkitMaskAttachment; -/** @type {string} */ CSSProperties.prototype.WebkitMaskBoxImage; -/** @type {string} */ CSSProperties.prototype.WebkitMaskBoxImageOutset; -/** @type {string} */ CSSProperties.prototype.WebkitMaskBoxImageRepeat; -/** @type {string} */ CSSProperties.prototype.WebkitMaskBoxImageSlice; -/** @type {string} */ CSSProperties.prototype.WebkitMaskBoxImageSource; -/** @type {string} */ CSSProperties.prototype.WebkitMaskBoxImageWidth; -/** @type {string} */ CSSProperties.prototype.WebkitMaskClip; -/** @type {string} */ CSSProperties.prototype.WebkitMaskComposite; -/** @type {string} */ CSSProperties.prototype.WebkitMaskImage; -/** @type {string} */ CSSProperties.prototype.WebkitMaskOrigin; -/** @type {string} */ CSSProperties.prototype.WebkitMaskPosition; -/** @type {string} */ CSSProperties.prototype.WebkitMaskPositionX; -/** @type {string} */ CSSProperties.prototype.WebkitMaskPositionY; -/** @type {string} */ CSSProperties.prototype.WebkitMaskRepeat; -/** @type {string} */ CSSProperties.prototype.WebkitMaskRepeatX; -/** @type {string} */ CSSProperties.prototype.WebkitMaskRepeatY; -/** @type {string} */ CSSProperties.prototype.WebkitMaskSize; -/** @type {string} */ -CSSProperties.prototype.WebkitMatchNearestMailBlockquoteColor; -/** @type {string} */ CSSProperties.prototype.WebkitMaxLogicalHeight; -/** @type {string} */ CSSProperties.prototype.WebkitMaxLogicalWidth; -/** @type {string} */ CSSProperties.prototype.WebkitMinLogicalHeight; -/** @type {string} */ CSSProperties.prototype.WebkitMinLogicalWidth; -/** @type {string} */ CSSProperties.prototype.WebkitNbspMode; -/** @type {string} */ CSSProperties.prototype.WebkitOrder; -/** @type {string} */ CSSProperties.prototype.WebkitOverflowScrolling; -/** @type {string} */ CSSProperties.prototype.WebkitPaddingAfter; -/** @type {string} */ CSSProperties.prototype.WebkitPaddingBefore; -/** @type {string} */ CSSProperties.prototype.WebkitPaddingEnd; -/** @type {string} */ CSSProperties.prototype.WebkitPaddingStart; -/** @type {string} */ CSSProperties.prototype.WebkitPerspective; -/** @type {string} */ CSSProperties.prototype.WebkitPerspectiveOrigin; -/** @type {string} */ CSSProperties.prototype.WebkitPerspectiveOriginX; -/** @type {string} */ CSSProperties.prototype.WebkitPerspectiveOriginY; -/** @type {string} */ CSSProperties.prototype.WebkitPrintColorAdjust; -/** @type {string} */ CSSProperties.prototype.WebkitRegionBreakAfter; -/** @type {string} */ CSSProperties.prototype.WebkitRegionBreakBefore; -/** @type {string} */ CSSProperties.prototype.WebkitRegionBreakInside; -/** @type {string} */ CSSProperties.prototype.WebkitRegionOverflow; -/** @type {string} */ CSSProperties.prototype.WebkitRtlOrdering; -/** @type {string} */ CSSProperties.prototype.WebkitRubyPosition; -/** @type {string} */ CSSProperties.prototype.WebkitShapeInside; -/** @type {string} */ CSSProperties.prototype.WebkitShapeMargin; -/** @type {string} */ CSSProperties.prototype.WebkitShapeOutside; -/** @type {string} */ CSSProperties.prototype.WebkitShapePadding; -/** @type {string} */ CSSProperties.prototype.WebkitTapHighlightColor; -/** @type {string} */ CSSProperties.prototype.WebkitTextAlignLast; -/** @type {string} */ CSSProperties.prototype.WebkitTextCombine; -/** @type {string} */ CSSProperties.prototype.WebkitTextDecorationLine; -/** @type {string} */ CSSProperties.prototype.WebkitTextDecorationsInEffect; -/** @type {string} */ CSSProperties.prototype.WebkitTextDecorationStyle; -/** @type {string} */ CSSProperties.prototype.WebkitTextEmphasis; -/** @type {string} */ CSSProperties.prototype.WebkitTextEmphasisColor; -/** @type {string} */ CSSProperties.prototype.WebkitTextEmphasisPosition; -/** @type {string} */ CSSProperties.prototype.WebkitTextEmphasisStyle; -/** @type {string} */ CSSProperties.prototype.WebkitTextFillColor; -/** @type {string} */ CSSProperties.prototype.WebkitTextOrientation; -/** @type {string} */ CSSProperties.prototype.WebkitTextSecurity; -/** @type {string} */ CSSProperties.prototype.WebkitTextSizeAdjust; -/** @type {string} */ CSSProperties.prototype.WebkitTextStroke; -/** @type {string} */ CSSProperties.prototype.WebkitTextStrokeColor; -/** @type {string} */ CSSProperties.prototype.WebkitTextStrokeWidth; -/** @type {string} */ CSSProperties.prototype.WebkitTransform; -/** @type {string} */ CSSProperties.prototype.WebkitTransformOrigin; -/** @type {string} */ CSSProperties.prototype.WebkitTransformOriginX; -/** @type {string} */ CSSProperties.prototype.WebkitTransformOriginY; -/** @type {string} */ CSSProperties.prototype.WebkitTransformOriginZ; -/** @type {string} */ CSSProperties.prototype.WebkitTransformStyle; -/** @type {string} */ CSSProperties.prototype.WebkitTransition; -/** @type {string} */ CSSProperties.prototype.WebkitTransitionDelay; -/** @type {string} */ CSSProperties.prototype.WebkitTransitionDuration; -/** @type {string} */ CSSProperties.prototype.WebkitTransitionProperty; -/** @type {string} */ CSSProperties.prototype.WebkitTransitionRepeatCount; -/** @type {string} */ CSSProperties.prototype.WebkitTransitionTimingFunction; -/** @type {string} */ CSSProperties.prototype.WebkitUserDrag; -/** @type {string} */ CSSProperties.prototype.WebkitUserModify; -/** @type {string} */ CSSProperties.prototype.WebkitUserSelect; -/** @type {string} */ CSSProperties.prototype.WebkitWrap; -/** @type {string} */ CSSProperties.prototype.WebkitWrapFlow; -/** @type {string} */ CSSProperties.prototype.WebkitWrapThrough; -/** @type {string} */ CSSProperties.prototype.WebkitWritingMode; - -// WebKit also adds bindings for the lowercase versions of these properties. -// The uppercase version is preferred. - -/** @type {string} */ CSSProperties.prototype.webkitAlignContent; -/** @type {string} */ CSSProperties.prototype.webkitAlignItems; -/** @type {string} */ CSSProperties.prototype.webkitAlignSelf; -/** @type {string} */ CSSProperties.prototype.webkitAnimation; -/** @type {string} */ CSSProperties.prototype.webkitAnimationDelay; -/** @type {string} */ CSSProperties.prototype.webkitAnimationDirection; -/** @type {string} */ CSSProperties.prototype.webkitAnimationDuration; -/** @type {string} */ CSSProperties.prototype.webkitAnimationFillMode; -/** @type {string} */ CSSProperties.prototype.webkitAnimationIterationCount; -/** @type {string} */ CSSProperties.prototype.webkitAnimationName; -/** @type {string} */ CSSProperties.prototype.webkitAnimationPlayState; -/** @type {string} */ CSSProperties.prototype.webkitAnimationTimingFunction; -/** @type {string} */ CSSProperties.prototype.webkitAppearance; -/** @type {string} */ CSSProperties.prototype.webkitAppRegion; -/** @type {string} */ CSSProperties.prototype.webkitAspectRatio; -/** @type {string} */ CSSProperties.prototype.webkitBackfaceVisibility; -/** @type {string} */ CSSProperties.prototype.webkitBackgroundClip; -/** @type {string} */ CSSProperties.prototype.webkitBackgroundComposite; -/** @type {string} */ CSSProperties.prototype.webkitBackgroundOrigin; -/** @type {string} */ CSSProperties.prototype.webkitBackgroundSize; -/** @type {string} */ CSSProperties.prototype.webkitBinding; -/** @type {string} */ CSSProperties.prototype.webkitBlendMode; -/** @type {string} */ CSSProperties.prototype.webkitBorderAfter; -/** @type {string} */ CSSProperties.prototype.webkitBorderAfterColor; -/** @type {string} */ CSSProperties.prototype.webkitBorderAfterStyle; -/** @type {string} */ CSSProperties.prototype.webkitBorderAfterWidth; -/** @type {string} */ CSSProperties.prototype.webkitBorderBefore; -/** @type {string} */ CSSProperties.prototype.webkitBorderBeforeColor; -/** @type {string} */ CSSProperties.prototype.webkitBorderBeforeStyle; -/** @type {string} */ CSSProperties.prototype.webkitBorderBeforeWidth; -/** @type {string} */ CSSProperties.prototype.webkitBorderBottomLeftRadius; -/** @type {string} */ CSSProperties.prototype.webkitBorderBottomRightRadius; -/** @type {string} */ CSSProperties.prototype.webkitBorderEnd; -/** @type {string} */ CSSProperties.prototype.webkitBorderEndColor; -/** @type {string} */ CSSProperties.prototype.webkitBorderEndStyle; -/** @type {string} */ CSSProperties.prototype.webkitBorderEndWidth; -/** @type {string} */ CSSProperties.prototype.webkitBorderFit; -/** @type {string} */ CSSProperties.prototype.webkitBorderHorizontalSpacing; -/** @type {string} */ CSSProperties.prototype.webkitBorderImage; -/** @type {string} */ CSSProperties.prototype.webkitBorderRadius; -/** @type {string} */ CSSProperties.prototype.webkitBorderStart; -/** @type {string} */ CSSProperties.prototype.webkitBorderStartColor; -/** @type {string} */ CSSProperties.prototype.webkitBorderStartStyle; -/** @type {string} */ CSSProperties.prototype.webkitBorderStartWidth; -/** @type {string} */ CSSProperties.prototype.webkitBorderTopLeftRadius; -/** @type {string} */ CSSProperties.prototype.webkitBorderTopRightRadius; -/** @type {string} */ CSSProperties.prototype.webkitBorderVerticalSpacing; -/** @type {string} */ CSSProperties.prototype.webkitBoxAlign; -/** @type {string} */ CSSProperties.prototype.webkitBoxDecorationBreak; -/** @type {string} */ CSSProperties.prototype.webkitBoxDirection; -/** @type {string} */ CSSProperties.prototype.webkitBoxFlex; -/** @type {string} */ CSSProperties.prototype.webkitBoxFlexGroup; -/** @type {string} */ CSSProperties.prototype.webkitBoxLines; -/** @type {string} */ CSSProperties.prototype.webkitBoxOrdinalGroup; -/** @type {string} */ CSSProperties.prototype.webkitBoxOrient; -/** @type {string} */ CSSProperties.prototype.webkitBoxPack; -/** @type {string} */ CSSProperties.prototype.webkitBoxReflect; -/** @type {string} */ CSSProperties.prototype.webkitBoxShadow; -/** @type {string} */ CSSProperties.prototype.webkitBoxSizing; -/** @type {string} */ CSSProperties.prototype.webkitColorCorrection; -/** @type {string} */ CSSProperties.prototype.webkitColumnAxis; -/** @type {string} */ CSSProperties.prototype.webkitColumnBreakAfter; -/** @type {string} */ CSSProperties.prototype.webkitColumnBreakBefore; -/** @type {string} */ CSSProperties.prototype.webkitColumnBreakInside; -/** @type {string} */ CSSProperties.prototype.webkitColumnCount; -/** @type {string} */ CSSProperties.prototype.webkitColumnGap; -/** @type {string} */ CSSProperties.prototype.webkitColumnProgression; -/** @type {string} */ CSSProperties.prototype.webkitColumnRule; -/** @type {string} */ CSSProperties.prototype.webkitColumnRuleColor; -/** @type {string} */ CSSProperties.prototype.webkitColumnRuleStyle; -/** @type {string} */ CSSProperties.prototype.webkitColumnRuleWidth; -/** @type {string} */ CSSProperties.prototype.webkitColumns; -/** @type {string} */ CSSProperties.prototype.webkitColumnSpan; -/** @type {string} */ CSSProperties.prototype.webkitColumnWidth; -/** @type {string} */ CSSProperties.prototype.webkitDashboardRegion; -/** @type {string} */ CSSProperties.prototype.webkitFilter; -/** @type {string} */ CSSProperties.prototype.webkitFlex; -/** @type {string} */ CSSProperties.prototype.webkitFlexBasis; -/** @type {string} */ CSSProperties.prototype.webkitFlexDirection; -/** @type {string} */ CSSProperties.prototype.webkitFlexFlow; -/** @type {string} */ CSSProperties.prototype.webkitFlexGrow; -/** @type {string} */ CSSProperties.prototype.webkitFlexShrink; -/** @type {string} */ CSSProperties.prototype.webkitFlexWrap; -/** @type {string} */ CSSProperties.prototype.webkitFlowFrom; -/** @type {string} */ CSSProperties.prototype.webkitFlowInto; -/** @type {string} */ CSSProperties.prototype.webkitFontSizeDelta; -/** @type {string} */ CSSProperties.prototype.webkitFontSmoothing; -/** @type {string} */ CSSProperties.prototype.webkitGridColumn; -/** @type {string} */ CSSProperties.prototype.webkitGridColumns; -/** @type {string} */ CSSProperties.prototype.webkitGridRow; -/** @type {string} */ CSSProperties.prototype.webkitGridRows; -/** @type {string} */ CSSProperties.prototype.webkitHighlight; -/** @type {string} */ CSSProperties.prototype.webkitHyphenateCharacter; -/** @type {string} */ CSSProperties.prototype.webkitHyphenateLimitAfter; -/** @type {string} */ CSSProperties.prototype.webkitHyphenateLimitBefore; -/** @type {string} */ CSSProperties.prototype.webkitHyphenateLimitLines; -/** @type {string} */ CSSProperties.prototype.webkitHyphens; -/** @type {string} */ CSSProperties.prototype.webkitJustifyContent; -/** @type {string} */ CSSProperties.prototype.webkitLineAlign; -/** @type {string} */ CSSProperties.prototype.webkitLineBoxContain; -/** @type {string} */ CSSProperties.prototype.webkitLineBreak; -/** @type {string} */ CSSProperties.prototype.webkitLineClamp; -/** @type {string} */ CSSProperties.prototype.webkitLineGrid; -/** @type {string} */ CSSProperties.prototype.webkitLineSnap; -/** @type {string} */ CSSProperties.prototype.webkitLocale; -/** @type {string} */ CSSProperties.prototype.webkitLogicalHeight; -/** @type {string} */ CSSProperties.prototype.webkitLogicalWidth; -/** @type {string} */ CSSProperties.prototype.webkitMarginAfter; -/** @type {string} */ CSSProperties.prototype.webkitMarginAfterCollapse; -/** @type {string} */ CSSProperties.prototype.webkitMarginBefore; -/** @type {string} */ CSSProperties.prototype.webkitMarginBeforeCollapse; -/** @type {string} */ CSSProperties.prototype.webkitMarginBottomCollapse; -/** @type {string} */ CSSProperties.prototype.webkitMarginCollapse; -/** @type {string} */ CSSProperties.prototype.webkitMarginEnd; -/** @type {string} */ CSSProperties.prototype.webkitMarginStart; -/** @type {string} */ CSSProperties.prototype.webkitMarginTopCollapse; -/** @type {string} */ CSSProperties.prototype.webkitMarquee; -/** @type {string} */ CSSProperties.prototype.webkitMarqueeDirection; -/** @type {string} */ CSSProperties.prototype.webkitMarqueeIncrement; -/** @type {string} */ CSSProperties.prototype.webkitMarqueeRepetition; -/** @type {string} */ CSSProperties.prototype.webkitMarqueeSpeed; -/** @type {string} */ CSSProperties.prototype.webkitMarqueeStyle; -/** @type {string} */ CSSProperties.prototype.webkitMask; -/** @type {string} */ CSSProperties.prototype.webkitMaskAttachment; -/** @type {string} */ CSSProperties.prototype.webkitMaskBoxImage; -/** @type {string} */ CSSProperties.prototype.webkitMaskBoxImageOutset; -/** @type {string} */ CSSProperties.prototype.webkitMaskBoxImageRepeat; -/** @type {string} */ CSSProperties.prototype.webkitMaskBoxImageSlice; -/** @type {string} */ CSSProperties.prototype.webkitMaskBoxImageSource; -/** @type {string} */ CSSProperties.prototype.webkitMaskBoxImageWidth; -/** @type {string} */ CSSProperties.prototype.webkitMaskClip; -/** @type {string} */ CSSProperties.prototype.webkitMaskComposite; -/** @type {string} */ CSSProperties.prototype.webkitMaskImage; -/** @type {string} */ CSSProperties.prototype.webkitMaskOrigin; -/** @type {string} */ CSSProperties.prototype.webkitMaskPosition; -/** @type {string} */ CSSProperties.prototype.webkitMaskPositionX; -/** @type {string} */ CSSProperties.prototype.webkitMaskPositionY; -/** @type {string} */ CSSProperties.prototype.webkitMaskRepeat; -/** @type {string} */ CSSProperties.prototype.webkitMaskRepeatX; -/** @type {string} */ CSSProperties.prototype.webkitMaskRepeatY; -/** @type {string} */ CSSProperties.prototype.webkitMaskSize; -/** @type {string} */ -CSSProperties.prototype.webkitMatchNearestMailBlockquoteColor; -/** @type {string} */ CSSProperties.prototype.webkitMaxLogicalHeight; -/** @type {string} */ CSSProperties.prototype.webkitMaxLogicalWidth; -/** @type {string} */ CSSProperties.prototype.webkitMinLogicalHeight; -/** @type {string} */ CSSProperties.prototype.webkitMinLogicalWidth; -/** @type {string} */ CSSProperties.prototype.webkitNbspMode; -/** @type {string} */ CSSProperties.prototype.webkitOrder; -/** @type {string} */ CSSProperties.prototype.webkitOverflowScrolling; -/** @type {string} */ CSSProperties.prototype.webkitPaddingAfter; -/** @type {string} */ CSSProperties.prototype.webkitPaddingBefore; -/** @type {string} */ CSSProperties.prototype.webkitPaddingEnd; -/** @type {string} */ CSSProperties.prototype.webkitPaddingStart; -/** @type {string} */ CSSProperties.prototype.webkitPerspective; -/** @type {string} */ CSSProperties.prototype.webkitPerspectiveOrigin; -/** @type {string} */ CSSProperties.prototype.webkitPerspectiveOriginX; -/** @type {string} */ CSSProperties.prototype.webkitPerspectiveOriginY; -/** @type {string} */ CSSProperties.prototype.webkitPrintColorAdjust; -/** @type {string} */ CSSProperties.prototype.webkitRegionBreakAfter; -/** @type {string} */ CSSProperties.prototype.webkitRegionBreakBefore; -/** @type {string} */ CSSProperties.prototype.webkitRegionBreakInside; -/** @type {string} */ CSSProperties.prototype.webkitRegionOverflow; -/** @type {string} */ CSSProperties.prototype.webkitRtlOrdering; -/** @type {string} */ CSSProperties.prototype.webkitRubyPosition; -/** @type {string} */ CSSProperties.prototype.webkitShapeInside; -/** @type {string} */ CSSProperties.prototype.webkitShapeMargin; -/** @type {string} */ CSSProperties.prototype.webkitShapeOutside; -/** @type {string} */ CSSProperties.prototype.webkitShapePadding; -/** @type {string} */ CSSProperties.prototype.webkitTapHighlightColor; -/** @type {string} */ CSSProperties.prototype.webkitTextAlignLast; -/** @type {string} */ CSSProperties.prototype.webkitTextCombine; -/** @type {string} */ CSSProperties.prototype.webkitTextDecorationLine; -/** @type {string} */ CSSProperties.prototype.webkitTextDecorationsInEffect; -/** @type {string} */ CSSProperties.prototype.webkitTextDecorationStyle; -/** @type {string} */ CSSProperties.prototype.webkitTextEmphasis; -/** @type {string} */ CSSProperties.prototype.webkitTextEmphasisColor; -/** @type {string} */ CSSProperties.prototype.webkitTextEmphasisPosition; -/** @type {string} */ CSSProperties.prototype.webkitTextEmphasisStyle; -/** @type {string} */ CSSProperties.prototype.webkitTextFillColor; -/** @type {string} */ CSSProperties.prototype.webkitTextOrientation; -/** @type {string} */ CSSProperties.prototype.webkitTextSecurity; -/** @type {string} */ CSSProperties.prototype.webkitTextSizeAdjust; -/** @type {string} */ CSSProperties.prototype.webkitTextStroke; -/** @type {string} */ CSSProperties.prototype.webkitTextStrokeColor; -/** @type {string} */ CSSProperties.prototype.webkitTextStrokeWidth; -/** @type {string} */ CSSProperties.prototype.webkitTransform; -/** @type {string} */ CSSProperties.prototype.webkitTransformOrigin; -/** @type {string} */ CSSProperties.prototype.webkitTransformOriginX; -/** @type {string} */ CSSProperties.prototype.webkitTransformOriginY; -/** @type {string} */ CSSProperties.prototype.webkitTransformOriginZ; -/** @type {string} */ CSSProperties.prototype.webkitTransformStyle; -/** @type {string} */ CSSProperties.prototype.webkitTransition; -/** @type {string} */ CSSProperties.prototype.webkitTransitionDelay; -/** @type {string} */ CSSProperties.prototype.webkitTransitionDuration; -/** @type {string} */ CSSProperties.prototype.webkitTransitionProperty; -/** @type {string} */ CSSProperties.prototype.webkitTransitionRepeatCount; -/** @type {string} */ CSSProperties.prototype.webkitTransitionTimingFunction; -/** @type {string} */ CSSProperties.prototype.webkitUserDrag; -/** @type {string} */ CSSProperties.prototype.webkitUserModify; -/** @type {string} */ CSSProperties.prototype.webkitUserSelect; -/** @type {string} */ CSSProperties.prototype.webkitWrap; -/** @type {string} */ CSSProperties.prototype.webkitWrapFlow; -/** @type {string} */ CSSProperties.prototype.webkitWrapThrough; -/** @type {string} */ CSSProperties.prototype.webkitWritingMode; - -/** - * @constructor - * @param {number} x - * @param {number} y - */ -function WebKitPoint(x, y) {} - -/** @type {number} */ -WebKitPoint.prototype.x; - -/** @type {number} */ -WebKitPoint.prototype.y; diff --git a/dom/html/HTMLDivElement.cpp b/dom/html/HTMLDivElement.cpp index b56187e29..d5b587241 100644 --- a/dom/html/HTMLDivElement.cpp +++ b/dom/html/HTMLDivElement.cpp @@ -34,20 +34,6 @@ HTMLDivElement::ParseAttribute(int32_t aNamespaceID, nsAttrValue& aResult) { if (aNamespaceID == kNameSpaceID_None) { - if (mNodeInfo->Equals(nsGkAtoms::marquee)) { - if ((aAttribute == nsGkAtoms::width) || - (aAttribute == nsGkAtoms::height)) { - return aResult.ParseSpecialIntValue(aValue); - } - if (aAttribute == nsGkAtoms::bgcolor) { - return aResult.ParseColor(aValue); - } - if ((aAttribute == nsGkAtoms::hspace) || - (aAttribute == nsGkAtoms::vspace)) { - return aResult.ParseIntWithBounds(aValue, 0); - } - } - if (mNodeInfo->Equals(nsGkAtoms::div) && aAttribute == nsGkAtoms::align) { return ParseDivAlignValue(aValue, aResult); @@ -66,15 +52,6 @@ HTMLDivElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData); } -static void -MapMarqueeAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData) -{ - nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData); - nsGenericHTMLElement::MapImageSizeAttributesInto(aAttributes, aData); - nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData); - nsGenericHTMLElement::MapBGColorInto(aAttributes, aData); -} - NS_IMETHODIMP_(bool) HTMLDivElement::IsAttributeMapped(const nsIAtom* aAttribute) const { @@ -85,14 +62,6 @@ HTMLDivElement::IsAttributeMapped(const nsIAtom* aAttribute) const }; return FindAttributeDependence(aAttribute, map); } - if (mNodeInfo->Equals(nsGkAtoms::marquee)) { - static const MappedAttributeEntry* const map[] = { - sImageMarginSizeAttributeMap, - sBackgroundColorAttributeMap, - sCommonAttributeMap - }; - return FindAttributeDependence(aAttribute, map); - } return nsGenericHTMLElement::IsAttributeMapped(aAttribute); } @@ -103,9 +72,6 @@ HTMLDivElement::GetAttributeMappingFunction() const if (mNodeInfo->Equals(nsGkAtoms::div)) { return &MapAttributesIntoRule; } - if (mNodeInfo->Equals(nsGkAtoms::marquee)) { - return &MapMarqueeAttributesIntoRule; - } return nsGenericHTMLElement::GetAttributeMappingFunction(); } diff --git a/dom/html/test/test_bug389797.html b/dom/html/test/test_bug389797.html index 884348b12..373528c71 100644 --- a/dom/html/test/test_bug389797.html +++ b/dom/html/test/test_bug389797.html @@ -168,7 +168,6 @@ HTML_TAG("listing", "Pre"); HTML_TAG("main", ""); HTML_TAG("map", "Map"); HTML_TAG("mark", ""); -HTML_TAG("marquee", "Div"); HTML_TAG("menu", "Menu"); HTML_TAG("meta", "Meta"); HTML_TAG("meter", "Meter"); diff --git a/dom/html/test/test_documentAll.html b/dom/html/test/test_documentAll.html index ec877acec..9db77d2fe 100644 --- a/dom/html/test/test_documentAll.html +++ b/dom/html/test/test_documentAll.html @@ -117,7 +117,7 @@ var elementNames = 'input','ins','isindex','kbd','keygen','label','li','legend','link','menu', 'multicol','noscript','noframes','object','spacer','table','td','td','th', 'thead','tfoot','tr','textarea','select','option','spacer','param', - 'marquee','hr','title','hx','tt','u','ul','var','wbr','sub','sup','cite', + 'hr','title','hx','tt','u','ul','var','wbr','sub','sup','cite', 'code','q','nobr','ol','p','pre','s','samp','small','body','html','map', 'bdo','legend','listing','style','script','tbody','caption','meta', 'optgroup','button','span','strike','strong','td'].sort(); diff --git a/dom/security/test/csp/file_bug1312272.html b/dom/security/test/csp/file_bug1312272.html deleted file mode 100644 index 18e0e5589..000000000 --- a/dom/security/test/csp/file_bug1312272.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - marquee inline script tests for Bug 1312272 - - -bug 1312272 - - - diff --git a/dom/security/test/csp/file_strict_dynamic_script_events_xbl.html b/dom/security/test/csp/file_strict_dynamic_script_events_xbl.html deleted file mode 100644 index 701ef3226..000000000 --- a/dom/security/test/csp/file_strict_dynamic_script_events_xbl.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - Bug 1316826 - 'strict-dynamic' blocking DOM event handlers - - -
blocked
- - - Bug 1316826 - - - - diff --git a/dom/security/test/csp/test_strict_dynamic.html b/dom/security/test/csp/test_strict_dynamic.html index 00e75143f..8f1b53f31 100644 --- a/dom/security/test/csp/test_strict_dynamic.html +++ b/dom/security/test/csp/test_strict_dynamic.html @@ -78,13 +78,6 @@ var tests = [ file: "file_strict_dynamic_script_events.html", policy: "script-src 'strict-dynamic' 'nonce-foo'" }, - { - // marquee is a special snowflake. Extra test for xbl things. - desc: "strict-dynamic with DOM events should be blocked (XBL)", - result: "blocked", - file: "file_strict_dynamic_script_events_xbl.html", - policy: "script-src 'strict-dynamic' 'nonce-foo'" - }, { desc: "strict-dynamic with JS URLs should be blocked", result: "blocked", diff --git a/dom/tests/browser/browser_bug396843.js b/dom/tests/browser/browser_bug396843.js index 84d7e3b83..a2281d1b8 100644 --- a/dom/tests/browser/browser_bug396843.js +++ b/dom/tests/browser/browser_bug396843.js @@ -72,7 +72,6 @@ function testInDocument(doc, documentID) { HTML_TAG("link", "Link") HTML_TAG("listing", "Span") HTML_TAG("map", "Map") - HTML_TAG("marquee", "Div") HTML_TAG("menu", "Shared") HTML_TAG("meta", "Meta") HTML_TAG("multicol", "Unknown") diff --git a/dom/tests/mochitest/bugs/mochitest.ini b/dom/tests/mochitest/bugs/mochitest.ini index 3743c6782..6865ada88 100644 --- a/dom/tests/mochitest/bugs/mochitest.ini +++ b/dom/tests/mochitest/bugs/mochitest.ini @@ -145,5 +145,4 @@ skip-if = toolkit == 'android' #Windows can't change size on Android skip-if = toolkit == 'android' [test_bug1022869.html] [test_bug1112040.html] -[test_bug1160342_marquee.html] [test_bug1171215.html] diff --git a/dom/tests/mochitest/bugs/test_bug1160342_marquee.html b/dom/tests/mochitest/bugs/test_bug1160342_marquee.html deleted file mode 100644 index 8da13478e..000000000 --- a/dom/tests/mochitest/bugs/test_bug1160342_marquee.html +++ /dev/null @@ -1,337 +0,0 @@ - - - - - Test for Bug 411103 - - - - -Mozilla Bug 1160342 -

-
-marquee -
- -
-
-
- - diff --git a/dom/tests/mochitest/bugs/test_bug396843.html b/dom/tests/mochitest/bugs/test_bug396843.html index 20dc53068..031843fd4 100644 --- a/dom/tests/mochitest/bugs/test_bug396843.html +++ b/dom/tests/mochitest/bugs/test_bug396843.html @@ -92,7 +92,6 @@ HTML_TAG("li", "LI") HTML_TAG("link", "Link") HTML_TAG("listing", "Span") HTML_TAG("map", "Map") -HTML_TAG("marquee", "Div") HTML_TAG("menu", "Shared") HTML_TAG("meta", "Meta") HTML_TAG("multicol", "Unknown") diff --git a/dom/xbl/crashtests/342954-1.xhtml b/dom/xbl/crashtests/342954-1.xhtml deleted file mode 100644 index dbaa15384..000000000 --- a/dom/xbl/crashtests/342954-1.xhtml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - -
- -
- - - - - - - - - -Span - -
Marquee
- - - - - diff --git a/dom/xbl/crashtests/342954-2-xbl.xml b/dom/xbl/crashtests/342954-2-xbl.xml deleted file mode 100644 index 3e73f1355..000000000 --- a/dom/xbl/crashtests/342954-2-xbl.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dom/xbl/crashtests/342954-2.xhtml b/dom/xbl/crashtests/342954-2.xhtml deleted file mode 100644 index 4a250e31c..000000000 --- a/dom/xbl/crashtests/342954-2.xhtml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - -Span - -
Marquee
- - - diff --git a/dom/xbl/crashtests/477878-1.html b/dom/xbl/crashtests/477878-1.html deleted file mode 100644 index 17e4002b4..000000000 --- a/dom/xbl/crashtests/477878-1.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/editor/libeditor/HTMLEditUtils.cpp b/editor/libeditor/HTMLEditUtils.cpp index 0adc5d511..098a908f1 100644 --- a/editor/libeditor/HTMLEditUtils.cpp +++ b/editor/libeditor/HTMLEditUtils.cpp @@ -688,7 +688,6 @@ static const ElementInfo kElements[eHTMLTag_userdefined] = { ELEM(main, true, true, GROUP_BLOCK, GROUP_FLOW_ELEMENT), ELEM(map, true, true, GROUP_SPECIAL, GROUP_BLOCK | GROUP_MAP_CONTENT), ELEM(mark, true, true, GROUP_PHRASE, GROUP_INLINE_ELEMENT), - ELEM(marquee, false, false, GROUP_NONE, GROUP_NONE), ELEM(menu, true, true, GROUP_BLOCK, GROUP_LI | GROUP_FLOW_ELEMENT), ELEM(menuitem, false, false, GROUP_NONE, GROUP_NONE), ELEM(meta, false, false, GROUP_HEAD_CONTENT, GROUP_NONE), diff --git a/layout/base/crashtests/265027-1.html b/layout/base/crashtests/265027-1.html deleted file mode 100644 index 9b455da41..000000000 --- a/layout/base/crashtests/265027-1.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - -Attack of the marquees! - - diff --git a/layout/base/crashtests/265986-1.html b/layout/base/crashtests/265986-1.html deleted file mode 100644 index 8d4ca290f..000000000 --- a/layout/base/crashtests/265986-1.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - -W - - diff --git a/layout/base/crashtests/265999-1.html b/layout/base/crashtests/265999-1.html deleted file mode 100644 index 7e6e3d416..000000000 --- a/layout/base/crashtests/265999-1.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/layout/base/crashtests/367498-2.html b/layout/base/crashtests/367498-2.html deleted file mode 100644 index 2c85ac0a4..000000000 --- a/layout/base/crashtests/367498-2.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -
- - - - - -
- - - - diff --git a/layout/base/crashtests/404491-1.html b/layout/base/crashtests/404491-1.html deleted file mode 100644 index 540a0f6a1..000000000 --- a/layout/base/crashtests/404491-1.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/layout/base/crashtests/580129-1.html b/layout/base/crashtests/580129-1.html deleted file mode 100644 index 228051b5a..000000000 --- a/layout/base/crashtests/580129-1.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/layout/base/crashtests/580494-1.html b/layout/base/crashtests/580494-1.html deleted file mode 100644 index c76125f74..000000000 --- a/layout/base/crashtests/580494-1.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/layout/base/crashtests/597924-1.html b/layout/base/crashtests/597924-1.html deleted file mode 100644 index d855997ee..000000000 --- a/layout/base/crashtests/597924-1.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/layout/generic/crashtests/265867-1.html b/layout/generic/crashtests/265867-1.html deleted file mode 100644 index e9da8c7f6..000000000 --- a/layout/generic/crashtests/265867-1.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/layout/generic/crashtests/348510-1.html b/layout/generic/crashtests/348510-1.html deleted file mode 100644 index 6e00e71f1..000000000 --- a/layout/generic/crashtests/348510-1.html +++ /dev/null @@ -1,7 +0,0 @@ - - - -
-
-
 -aaaaaaa diff --git a/layout/generic/crashtests/348510-2.html b/layout/generic/crashtests/348510-2.html deleted file mode 100644 index 8f8c998cf..000000000 --- a/layout/generic/crashtests/348510-2.html +++ /dev/null @@ -1,7 +0,0 @@ -- - - -
-
 -a \ No newline at end of file diff --git a/layout/generic/crashtests/363722-1.html b/layout/generic/crashtests/363722-1.html deleted file mode 100644 index f83671c5a..000000000 --- a/layout/generic/crashtests/363722-1.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - I am a double-marquee. - - - - diff --git a/layout/generic/crashtests/363722-2.html b/layout/generic/crashtests/363722-2.html deleted file mode 100644 index 1a12a227e..000000000 --- a/layout/generic/crashtests/363722-2.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - [inside OUTER marquee] - - [inside INNER marquee] - - - - diff --git a/layout/generic/crashtests/370866-1.xhtml b/layout/generic/crashtests/370866-1.xhtml deleted file mode 100644 index dbc673cc4..000000000 --- a/layout/generic/crashtests/370866-1.xhtml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - -
- X -
- - - - diff --git a/layout/generic/crashtests/379917-1.xhtml b/layout/generic/crashtests/379917-1.xhtml deleted file mode 100644 index a99bd7f4a..000000000 --- a/layout/generic/crashtests/379917-1.xhtml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - -
xע -m -
- - - diff --git a/layout/generic/crashtests/398332-3.html b/layout/generic/crashtests/398332-3.html deleted file mode 100644 index 991aa6d3d..000000000 --- a/layout/generic/crashtests/398332-3.html +++ /dev/null @@ -1,4 +0,0 @@ -"Ë”Öqü®Û; - - - diff --git a/layout/generic/crashtests/421671.html b/layout/generic/crashtests/421671.html deleted file mode 100644 index e3919e635..000000000 --- a/layout/generic/crashtests/421671.html +++ /dev/null @@ -1,202 +0,0 @@ - - - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> - -<a> -<a> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<a> -<a> -<a> -<a> - -<a> -<a> - -<a> -<a> \ No newline at end of file diff --git a/layout/generic/crashtests/619021.html b/layout/generic/crashtests/619021.html deleted file mode 100644 index 586c0f2db..000000000 --- a/layout/generic/crashtests/619021.html +++ /dev/null @@ -1,5 +0,0 @@ -<foo> <marquee> <marquee> <marquee> <marquee> <marquee> <marquee> -<foo> <marquee> <foo> <marquee> <foo> <object> <marquee> <foo> -<marquee> <marquee> <foo> <foo> <marquee> <marquee> <foo> <marquee> -<marquee> <marquee> <foo> <marquee> <foo> <foo> <marquee> <marquee> -<marquee> </marquee> <foo> <foo> <pre> diff --git a/layout/generic/crashtests/724235.html b/layout/generic/crashtests/724235.html deleted file mode 100644 index 7054a99f5..000000000 --- a/layout/generic/crashtests/724235.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<title>Testcase for bug 724235</title> -</head> - -<body onload="setTimeout(function(){m=document.getElementsByTagName('marquee')[0]; m.style.fontSize='72px'},0)"> - -<a href="#"> - -<center> - -<marquee>This is a marquee ... </marquee> - -<table> - <tr> - <td><a href="#">click me to CRASH!</a></td> - </tr> -</table> - -<iframe></iframe> - -<script>document.body.offsetHeight;</script> - -<a href="#"></a> - - -</body></html> diff --git a/layout/reftests/bidi/logicalmarquee.html b/layout/reftests/bidi/logicalmarquee.html deleted file mode 100644 index cb13827de..000000000 --- a/layout/reftests/bidi/logicalmarquee.html +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE HTML> -<html> - <head> - <meta http-equiv="Content-type" content="text/html; charset=iso-8859-8-i"> - <title>Marquee in Logical Hebrew</title> - </head> - - <body> - <marquee scrollamount="0" behavior="alternate" direction="right">&#x05E2;&#x05D3; &#x05E9;&#x05D9;&#x05E4;&#x05D5;&#x05D7; &#x05D4;&#x05D9;&#x05D5;&#x05DD; &#x05D5;&#x05E0;&#x05E1;&#x05D5; &#x05D4;&#x05E6;&#x05DC;&#x05D9;&#x05DC;&#x05D9;&#x05DD;</marquee> - </body> -</html> diff --git a/layout/reftests/bidi/marquee-ref.html b/layout/reftests/bidi/marquee-ref.html deleted file mode 100644 index d8778dc88..000000000 --- a/layout/reftests/bidi/marquee-ref.html +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE HTML> -<html> - <head> - <meta http-equiv="Content-type" content="text/html; charset=iso-8859-8-i"> - <title>Marquee in Logical Hebrew</title> - </head> - - <body> - <div dir="rtl" align="left">&#x05E2;&#x05D3; &#x05E9;&#x05D9;&#x05E4;&#x05D5;&#x05D7; &#x05D4;&#x05D9;&#x05D5;&#x05DD; &#x05D5;&#x05E0;&#x05E1;&#x05D5; &#x05D4;&#x05E6;&#x05DC;&#x05D9;&#x05DC;&#x05D9;&#x05DD;</div> - </body> -</html> diff --git a/layout/reftests/bidi/reftest-stylo.list b/layout/reftests/bidi/reftest-stylo.list index b6a48f9ca..d0a854e7f 100644 --- a/layout/reftests/bidi/reftest-stylo.list +++ b/layout/reftests/bidi/reftest-stylo.list @@ -21,9 +21,6 @@ skip == bidiSVG-03.svg bidiSVG-03.svg == bidiSVG-04.svg bidiSVG-04.svg == bidiSVG-05.svg bidiSVG-05.svg random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == bidiMirroring.svg bidiMirroring.svg -fuzzy-if(Android,9,134) random-if(layersGPUAccelerated) == visualmarquee.html visualmarquee.html -fuzzy-if(Android,9,134) random-if(layersGPUAccelerated) == logicalmarquee.html logicalmarquee.html -== visualmarquee.html visualmarquee.html # test for glyph mirroring in right-to-left text == mirroring-01.html mirroring-01.html # quote marks are not supposed to mirror, but Unicode 5.0 said they should, so some systems do it diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list index eeabd0beb..5044e657f 100644 --- a/layout/reftests/bidi/reftest.list +++ b/layout/reftests/bidi/reftest.list @@ -18,9 +18,6 @@ random-if(cocoaWidget) == bidi-006-j.html bidi-006-ref.html # bug 734313 fuzzy-if(skiaContent,1,1) == bidiSVG-04.svg bidiSVG-04-ref.svg == bidiSVG-05.svg bidiSVG-05-ref.svg random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == bidiMirroring.svg bidiMirroring-ref.svg -fuzzy-if(Android,9,134) random-if(layersGPUAccelerated) == visualmarquee.html marquee-ref.html -fuzzy-if(Android,9,134) random-if(layersGPUAccelerated) == logicalmarquee.html marquee-ref.html -== visualmarquee.html logicalmarquee.html # test for glyph mirroring in right-to-left text == mirroring-01.html mirroring-01-ref.html # quote marks are not supposed to mirror, but Unicode 5.0 said they should, so some systems do it diff --git a/layout/reftests/bidi/visualmarquee.html b/layout/reftests/bidi/visualmarquee.html deleted file mode 100644 index 932fd775a..000000000 --- a/layout/reftests/bidi/visualmarquee.html +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <meta http-equiv="Content-type" content="text/html; charset=iso-8859-8"> - <title>Marquee in Visual Hebrew</title> - </head> - - <body> - <marquee scrollamount="0" behavior="alternate" direction="right">&#x05DD;&#x05D9;&#x05DC;&#x05D9;&#x05DC;&#x05E6;&#x05D4; &#x05D5;&#x05E1;&#x05E0;&#x05D5; &#x05DD;&#x05D5;&#x05D9;&#x05D4; &#x05D7;&#x05D5;&#x05E4;&#x05D9;&#x05E9; &#x05D3;&#x05E2;</marquee> - </body> -</html> diff --git a/layout/reftests/marquee/1160342-1.html b/layout/reftests/marquee/1160342-1.html deleted file mode 100644 index 85e7215fb..000000000 --- a/layout/reftests/marquee/1160342-1.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<title>Bug 1160342 - Implement marquee using mutation observers</title> -</head> -<body onload="document.getElementById('a').setAttribute('behavior', 'alternate')"> -<marquee id="a" scrollamount=0 direction=right> -This text should be visible -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/1160342-2.html b/layout/reftests/marquee/1160342-2.html deleted file mode 100644 index 99b288568..000000000 --- a/layout/reftests/marquee/1160342-2.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<title>Bug 1160342 - Implement marquee using mutation observers</title> -</head> -<body onload="document.getElementById('a').setAttribute('direction', 'right')"> -<marquee id="a" behavior=alternate scrollamount=0> -This text should be visible -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/1160342-ref.html b/layout/reftests/marquee/1160342-ref.html deleted file mode 100644 index d56c90642..000000000 --- a/layout/reftests/marquee/1160342-ref.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<title>Bug 1160342 - Implement marquee using mutation observers</title> -</head> -<body> -<marquee id="a" behavior=alternate scrollamount=0 direction=right> -This text should be visible -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/166591-dynamic-1-ref.html b/layout/reftests/marquee/166591-dynamic-1-ref.html deleted file mode 100644 index a9bed7d5f..000000000 --- a/layout/reftests/marquee/166591-dynamic-1-ref.html +++ /dev/null @@ -1,6 +0,0 @@ -<html><head> -</head> -<body> -<div id="test"><marquee behavior="alternate" scrollamount="0">dynamic marquee</marquee></div> -</body> -</html> \ No newline at end of file diff --git a/layout/reftests/marquee/166591-dynamic-1.html b/layout/reftests/marquee/166591-dynamic-1.html deleted file mode 100644 index 278b2a37b..000000000 --- a/layout/reftests/marquee/166591-dynamic-1.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head> -<script> -function init() { - document.getElementById('test').innerHTML = '<marquee behavior="alternate" scrollamount="0">dynamic marquee</marquee>'; -} -</script> -</head> -<body onload="init();"> -<div id="test"></div> -</body> -</html> \ No newline at end of file diff --git a/layout/reftests/marquee/336736-1-ref.html b/layout/reftests/marquee/336736-1-ref.html deleted file mode 100644 index 116e5ade2..000000000 --- a/layout/reftests/marquee/336736-1-ref.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body> -<div style="background: green; width: 50px">&nbsp;</div> -</body> -</html> diff --git a/layout/reftests/marquee/336736-1a.html b/layout/reftests/marquee/336736-1a.html deleted file mode 100644 index fb54f3060..000000000 --- a/layout/reftests/marquee/336736-1a.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> -<body dir="rtl"> -<!-- The "alternate" behavior is necessary for the - marquee text to start out on the screen. --> -<marquee - direction="right" - scrollamount="0" - behavior="alternate" -> -<div style="background: green; width: 50px">&nbsp;</div> -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/336736-1b.html b/layout/reftests/marquee/336736-1b.html deleted file mode 100644 index 85338167c..000000000 --- a/layout/reftests/marquee/336736-1b.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> -<body> -<!-- The "alternate" behavior is necessary for the - marquee text to start out on the screen. --> -<marquee - direction="right" - scrollamount="0" - behavior="alternate" -> -<div style="background: green; width: 50px">&nbsp;</div> -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/406073-1-ref.html b/layout/reftests/marquee/406073-1-ref.html deleted file mode 100644 index 751bb5db7..000000000 --- a/layout/reftests/marquee/406073-1-ref.html +++ /dev/null @@ -1,11 +0,0 @@ -<html class="reftest-wait"> -<body style="border:3px solid;" onload="setTimeout(doe, 0)"> -<marquee behavior="alternate" scrollamount="100"><span style="background-color: lime;">marquee</span></marquee> - <script> - function doe() { - document.getElementsByTagName('marquee')[0].stop(); - document.documentElement.className = ""; - } - </script> -</body> -</html> diff --git a/layout/reftests/marquee/406073-1.html b/layout/reftests/marquee/406073-1.html deleted file mode 100644 index 01787afda..000000000 --- a/layout/reftests/marquee/406073-1.html +++ /dev/null @@ -1,23 +0,0 @@ -<html class="reftest-wait"> -<body style="border:3px solid;" onload="setTimeout(doe, 0)"> -<marquee behavior="alternate" scrollamount="100"><span style="background-color: lime;">marquee</span></marquee> - <script> - function doe() { - document.getElementsByTagName('marquee')[0].stop(); - document.getElementsByTagName('marquee')[0].start(); - document.getElementsByTagName('marquee')[0].stop(); - document.getElementsByTagName('marquee')[0].start(); - document.getElementsByTagName('marquee')[0].stop(); - document.getElementsByTagName('marquee')[0].start(); - document.getElementsByTagName('marquee')[0].stop(); - document.getElementsByTagName('marquee')[0].start(); - document.getElementsByTagName('marquee')[0].stop(); - document.getElementsByTagName('marquee')[0].start(); - document.getElementsByTagName('marquee')[0].stop(); - document.getElementsByTagName('marquee')[0].start(); - document.getElementsByTagName('marquee')[0].stop(); - document.documentElement.className = ""; - } - </script> -</body> -</html> diff --git a/layout/reftests/marquee/407016-2-ref.html b/layout/reftests/marquee/407016-2-ref.html deleted file mode 100644 index 25fee1b7d..000000000 --- a/layout/reftests/marquee/407016-2-ref.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body> -<div style="background-color: lime; height: 50px;"></div> -</body> -</html> diff --git a/layout/reftests/marquee/407016-2.html b/layout/reftests/marquee/407016-2.html deleted file mode 100644 index 65e1273b9..000000000 --- a/layout/reftests/marquee/407016-2.html +++ /dev/null @@ -1,7 +0,0 @@ -<html> -<body> -<marquee scrollamount="0" style="height: 50px; background-color: lime;"> -<div style="width: 9999px;">&nbsp;</div> -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/413027-4-ref.html b/layout/reftests/marquee/413027-4-ref.html deleted file mode 100644 index 22fdd42e6..000000000 --- a/layout/reftests/marquee/413027-4-ref.html +++ /dev/null @@ -1,10 +0,0 @@ -<html><head> -<title>Testcase for bug 413027 - Marquee height is sized too small, clipping text vertically</title> -</head> -<body> - -<div style="background-color: lime; width: 600px; float:left;"> - <div style="margin: 100px 0px; padding-left: 2px;">text</div> -</div> - -</body></html> diff --git a/layout/reftests/marquee/413027-4.html b/layout/reftests/marquee/413027-4.html deleted file mode 100644 index d57f2f121..000000000 --- a/layout/reftests/marquee/413027-4.html +++ /dev/null @@ -1,15 +0,0 @@ -<html><head> -<title>Testcase for bug 413027 - Marquee height is sized too small, clipping text vertically</title> -</head> -<body> - -<marquee scrollamount="0" behavior="alternate" direction="right" style="background-color: lime; width: 600px;"> -<div> -<!-- padding-left used to avoid risk of an antialiasing pixel that may - project to the left of the origin, causing a spurious test failure - (see bugs 476927, 475968) --> - <div style="margin: 100px 0px; padding-left: 2px;">text</div> -</div> -</marquee> - -</body></html> diff --git a/layout/reftests/marquee/425247-1-ref.html b/layout/reftests/marquee/425247-1-ref.html deleted file mode 100644 index 3b3a84d41..000000000 --- a/layout/reftests/marquee/425247-1-ref.html +++ /dev/null @@ -1,9 +0,0 @@ -<html><head> -<title>Bug 425247 – Marquee with uppercase UP or DOWN as direction doesn't work properly</title> -</head> -<body> -<marquee direction="up" bgcolor="magenta" behavior="alternate" scrollamount="0"> -<marquee bgcolor="yellow" behavior="alternate" scrollamount="0">marquee up</marquee> -</marquee> -</body> -</html> \ No newline at end of file diff --git a/layout/reftests/marquee/425247-1.html b/layout/reftests/marquee/425247-1.html deleted file mode 100644 index dfa5021c4..000000000 --- a/layout/reftests/marquee/425247-1.html +++ /dev/null @@ -1,9 +0,0 @@ -<html><head> -<title>Bug 425247 – Marquee with uppercase UP or DOWN as direction doesn't work properly</title> -</head> -<body> -<MARQUEE DIRECTION=UP BGCOLOR=MAGENTA BEHAVIOR=ALTERNATE SCROLLAMOUNT=0> -<MARQUEE BGCOLOR=YELLOW BEHAVIOR=ALTERNATE SCROLLAMOUNT=0>marquee up</MARQUEE> -</MARQUEE> -</body> -</html> \ No newline at end of file diff --git a/layout/reftests/marquee/425247-2-ref.html b/layout/reftests/marquee/425247-2-ref.html deleted file mode 100644 index 564d74979..000000000 --- a/layout/reftests/marquee/425247-2-ref.html +++ /dev/null @@ -1,9 +0,0 @@ -<html><head> -<title>Bug 425247 – Marquee with uppercase UP or DOWN as direction doesn't work properly</title> -</head> -<body> -<marquee direction="down" bgcolor="magenta" behavior="alternate" scrollamount="0"> -<marquee bgcolor="yellow" behavior="alternate" scrollamount="0">marquee down</marquee> -</marquee> -</body> -</html> \ No newline at end of file diff --git a/layout/reftests/marquee/425247-2.html b/layout/reftests/marquee/425247-2.html deleted file mode 100644 index 4cb66b901..000000000 --- a/layout/reftests/marquee/425247-2.html +++ /dev/null @@ -1,9 +0,0 @@ -<html><head> -<title>Bug 425247 – Marquee with uppercase UP or DOWN as direction doesn't work properly</title> -</head> -<body> -<MARQUEE DIRECTION=DOWN BGCOLOR=MAGENTA BEHAVIOR=ALTERNATE SCROLLAMOUNT=0> -<MARQUEE BGCOLOR=YELLOW BEHAVIOR=ALTERNATE SCROLLAMOUNT=0>marquee down</MARQUEE> -</MARQUEE> -</body> -</html> \ No newline at end of file diff --git a/layout/reftests/marquee/429849-1-ref.html b/layout/reftests/marquee/429849-1-ref.html deleted file mode 100644 index 3b9c3166e..000000000 --- a/layout/reftests/marquee/429849-1-ref.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<title>Bug 429849 – marquee text not on one line , part of this line on top and second part on bottom</title> -</head> -<body> -<marquee behavior=alternate scrollamount=0 direction=right> -This text should be on one line -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/429849-1.html b/layout/reftests/marquee/429849-1.html deleted file mode 100644 index 6b1757fd0..000000000 --- a/layout/reftests/marquee/429849-1.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<title>Bug 429849 – marquee text not on one line , part of this line on top and second part on bottom</title> -</head> -<body> -<marquee behavior=alternate scrollamount=0 direction=right> -This text <script>document.body.offsetHeight;</script>should be on one line -</marquee> -</body> -</html> diff --git a/layout/reftests/marquee/reftest-stylo.list b/layout/reftests/marquee/reftest-stylo.list deleted file mode 100644 index 26c77acf9..000000000 --- a/layout/reftests/marquee/reftest-stylo.list +++ /dev/null @@ -1,16 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -random-if((B2G&&browserIsRemote)||Mulet) == 166591-dynamic-1.html 166591-dynamic-1.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G) fuzzy-if(Android,8,50) == 336736-1a.html 336736-1a.html -# Bug 1168747 for random b2g timeouts -skip-if(B2G) fuzzy-if(Android,8,50) == 336736-1b.html 336736-1b.html -# Bug 1168747 for random b2g timeouts -== 406073-1.html 406073-1.html -== 407016-2.html 407016-2.html -fuzzy-if(Android,8,220) == 413027-4.html 413027-4.html -fuzzy-if(Android,8,30) == 425247-1.html 425247-1.html -fuzzy-if(Android,8,30) == 425247-2.html 425247-2.html -random == 429849-1.html 429849-1.html -# bug 432288 -== 1160342-1.html 1160342-1.html -== 1160342-2.html 1160342-2.html diff --git a/layout/reftests/marquee/reftest.list b/layout/reftests/marquee/reftest.list deleted file mode 100644 index f033b4634..000000000 --- a/layout/reftests/marquee/reftest.list +++ /dev/null @@ -1,11 +0,0 @@ -== 166591-dynamic-1.html 166591-dynamic-1-ref.html -fuzzy-if(Android,8,50) == 336736-1a.html 336736-1-ref.html -fuzzy-if(Android,8,50) == 336736-1b.html 336736-1-ref.html -== 406073-1.html 406073-1-ref.html -== 407016-2.html 407016-2-ref.html -fuzzy-if(Android,8,220) == 413027-4.html 413027-4-ref.html -fuzzy-if(Android,8,30) == 425247-1.html 425247-1-ref.html -fuzzy-if(Android,8,30) == 425247-2.html 425247-2-ref.html -random == 429849-1.html 429849-1-ref.html # bug 432288 -== 1160342-1.html 1160342-ref.html -== 1160342-2.html 1160342-ref.html diff --git a/layout/reftests/moz.build b/layout/reftests/moz.build index d486e5639..3ab3d4246 100644 --- a/layout/reftests/moz.build +++ b/layout/reftests/moz.build @@ -201,8 +201,6 @@ with Files('list-item/**'): BUG_COMPONENT = ('Core', 'Layout: Block and Inline') with Files('margin-collapsing/**'): BUG_COMPONENT = ('Core', 'Layout: Block and Inline') -with Files('marquee/**'): - BUG_COMPONENT = ('Core', 'CSS Parsing and Computation') with Files('mathml/**'): BUG_COMPONENT = ('Core', 'MathML') with Files('native-theme/**'): diff --git a/layout/reftests/reftest-stylo.list b/layout/reftests/reftest-stylo.list index 7d4078f22..54afc3dac 100644 --- a/layout/reftests/reftest-stylo.list +++ b/layout/reftests/reftest-stylo.list @@ -249,9 +249,6 @@ include mathml/reftest-stylo.list # margin-collapsing include margin-collapsing/reftest-stylo.list -# marquee/ -include marquee/reftest-stylo.list - # native-theme/ # skipping for B2G since something around radio-nonnative.html makes the whole suite hang skip-if(B2G||Android||Mulet) include native-theme/reftest-stylo.list diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list index b2da025d5..b06eba58e 100644 --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -247,9 +247,6 @@ include mathml/reftest.list # margin-collapsing include margin-collapsing/reftest.list -# marquee/ -include marquee/reftest.list - # native-theme/ # (no XUL theme on Android) skip-if(Android) include native-theme/reftest.list diff --git a/layout/reftests/writing-mode/reftest-stylo.list b/layout/reftests/writing-mode/reftest-stylo.list index 5574d9b5b..76f6813e6 100644 --- a/layout/reftests/writing-mode/reftest-stylo.list +++ b/layout/reftests/writing-mode/reftest-stylo.list @@ -65,8 +65,6 @@ HTTP(..) == 1115916-1-vertical-metrics.html 1115916-1-vertical-metrics.html == ua-style-sheet-border-3.html ua-style-sheet-border-3.html == ua-style-sheet-border-4.html ua-style-sheet-border-4.html == ua-style-sheet-border-5.html ua-style-sheet-border-5.html -== ua-style-sheet-size-1.html ua-style-sheet-size-1.html -== ua-style-sheet-size-2.html ua-style-sheet-size-2.html == ua-style-sheet-fieldset-1.html ua-style-sheet-fieldset-1.html skip-if(Android||B2G||Mulet||(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu))) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list index b670dbd13..13c58d2cb 100644 --- a/layout/reftests/writing-mode/reftest.list +++ b/layout/reftests/writing-mode/reftest.list @@ -58,8 +58,6 @@ fuzzy(116,94) fuzzy-if(winWidget,135,124) HTTP(..) == 1115916-1-vertical-metrics == ua-style-sheet-border-3.html ua-style-sheet-border-3-ref.html == ua-style-sheet-border-4.html ua-style-sheet-border-4-ref.html == ua-style-sheet-border-5.html ua-style-sheet-border-5-ref.html -== ua-style-sheet-size-1.html ua-style-sheet-size-1-ref.html -== ua-style-sheet-size-2.html ua-style-sheet-size-2-ref.html == ua-style-sheet-fieldset-1.html ua-style-sheet-fieldset-1-ref.html skip-if(Android||(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu))) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1a-ref.html diff --git a/layout/reftests/writing-mode/ua-style-sheet-size-1-ref.html b/layout/reftests/writing-mode/ua-style-sheet-size-1-ref.html deleted file mode 100644 index 06f6d5700..000000000 --- a/layout/reftests/writing-mode/ua-style-sheet-size-1-ref.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE html> -<meta charset=utf-8> -<title>Test for logical margins on marquee elements in the UA style sheet</title> -<style> -.v-rl { writing-mode: vertical-rl; } -.ltr, .rtl, .v-rl { border: 1px solid blue; padding: 16px; } -marquee { background-color: yellow; color: transparent; } -.ltr marquee { width: -moz-available; height: auto; } -.rtl marquee { width: -moz-available; height: auto; } -.v-rl marquee { width: auto; height: -moz-available; } -</style> -<div class=ltr> - <marquee>A</marquee> -</div> -<div class=rtl dir=rtl> - <marquee>A</marquee> -</div> -<!-- disabled until bug 1132308 -<div class=v-rl> - <marquee>A</marquee> -</div> ---> diff --git a/layout/reftests/writing-mode/ua-style-sheet-size-1.html b/layout/reftests/writing-mode/ua-style-sheet-size-1.html deleted file mode 100644 index 754908501..000000000 --- a/layout/reftests/writing-mode/ua-style-sheet-size-1.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<meta charset=utf-8> -<title>Test for logical sizes on marquee elements in the UA style sheet</title> -<style> -.v-rl { writing-mode: vertical-rl; } -.ltr, .rtl, .v-rl { border: 1px solid blue; padding: 16px; } -marquee { background-color: yellow; color: transparent; } -</style> -<div class=ltr> - <marquee>A</marquee> -</div> -<div class=rtl dir=rtl> - <marquee>A</marquee> -</div> -<!-- disabled until bug 1132308 -<div class=v-rl> - <marquee>A</marquee> -</div> ---> diff --git a/layout/reftests/writing-mode/ua-style-sheet-size-2-ref.html b/layout/reftests/writing-mode/ua-style-sheet-size-2-ref.html deleted file mode 100644 index 3c53326ba..000000000 --- a/layout/reftests/writing-mode/ua-style-sheet-size-2-ref.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE html> -<meta charset=utf-8> -<title>Test for logical margins on marquee elements in the UA style sheet</title> -<style> -.v-rl { writing-mode: vertical-rl; } -.ltr, .rtl, .v-rl { border: 1px solid blue; padding: 16px; } -marquee { background-color: yellow; color: transparent; } -.ltr marquee { width: -moz-available; height: 200px; } -.rtl marquee { width: -moz-available; height: 200px; } -.v-rl marquee { width: 200px; height: -moz-available; } -</style> -<div class=ltr> - <marquee direction=down>A</marquee> -</div> -<div class=rtl dir=rtl> - <marquee direction=down>A</marquee> -</div> -<!-- disabled until bug 1132308 -<div class=v-rl> - <marquee direction=down>A</marquee> -</div> ---> diff --git a/layout/reftests/writing-mode/ua-style-sheet-size-2.html b/layout/reftests/writing-mode/ua-style-sheet-size-2.html deleted file mode 100644 index 1c0be6f4b..000000000 --- a/layout/reftests/writing-mode/ua-style-sheet-size-2.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<meta charset=utf-8> -<title>Test for logical sizes on marquee elements in the UA style sheet</title> -<style> -.v-rl { writing-mode: vertical-rl; } -.ltr, .rtl, .v-rl { border: 1px solid blue; padding: 16px; } -marquee { background-color: yellow; color: transparent; } -</style> -<div class=ltr> - <marquee direction=down>A</marquee> -</div> -<div class=rtl dir=rtl> - <marquee direction=down>A</marquee> -</div> -<!-- disabled until bug 1132308 -<div class=v-rl> - <marquee direction=down>A</marquee> -</div> ---> diff --git a/layout/style/contenteditable.css b/layout/style/contenteditable.css index c550bc7c9..6d569f75e 100644 --- a/layout/style/contenteditable.css +++ b/layout/style/contenteditable.css @@ -80,15 +80,6 @@ input[contenteditable="true"][type="file"] { -moz-user-focus: none !important; } -/* emulation of non-standard HTML <marquee> tag */ -marquee:-moz-read-write { - -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-horizontal-editable'); -} - -marquee[direction="up"]:-moz-read-write, marquee[direction="down"]:-moz-read-write { - -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical-editable'); -} - *|*:-moz-read-write > input[type="hidden"], input[contenteditable="true"][type="hidden"] { border: 1px solid black !important; diff --git a/layout/style/moz.build b/layout/style/moz.build index ff06b5101..bdc86ee99 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -19,7 +19,6 @@ with Files('CSSRuleList.*'): with Files('nsDOM*'): BUG_COMPONENT = ('Core', 'DOM: CSS Object Model') -DIRS += ['xbl-marquee'] TEST_DIRS += ['test'] XPIDL_SOURCES += [ diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index 556e35406..f6b84bfac 100644 --- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -5941,8 +5941,6 @@ CSSParserImpl::ParseAttributeSelector(int32_t& aDataMask, "language", "defer", "type", - // additional attributes not in HTML4 - "direction", // marquee nullptr }; short i = 0; @@ -15318,17 +15316,17 @@ CSSParserImpl::ParseFontFeatureSettings(nsCSSValue& aValue) return true; } -bool -CSSParserImpl::ParseFontVariationSettings(nsCSSValue& aValue) -{ - // TODO: Actually implement this. - - // This stub is here because websites insist on considering this - // very hardware-dependent and O.S.-variable low-level font-control - // as a "critical feature" which it isn't as there is 0 guarantee - // that font variation settings are supported or honored by any - // operating system used by the client. - return true; +bool +CSSParserImpl::ParseFontVariationSettings(nsCSSValue& aValue) +{ + // TODO: Actually implement this. + + // This stub is here because websites insist on considering this + // very hardware-dependent and O.S.-variable low-level font-control + // as a "critical feature" which it isn't as there is 0 guarantee + // that font variation settings are supported or honored by any + // operating system used by the client. + return true; } bool diff --git a/layout/style/res/html.css b/layout/style/res/html.css index 44e41c8d0..b975bf0c9 100644 --- a/layout/style/res/html.css +++ b/layout/style/res/html.css @@ -64,7 +64,6 @@ legend, li, listing, main, -marquee, menu, nav, noframes, @@ -819,25 +818,9 @@ dialog:not([open]) { display: none; } -/* emulation of non-standard HTML <marquee> tag */ -marquee { - inline-size: -moz-available; - display: inline-block; - vertical-align: text-bottom; - text-align: start; - -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-horizontal'); -} - -marquee[direction="up"], marquee[direction="down"] { - -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical'); - block-size: 200px; -} - /* PRINT ONLY rules follow */ @media print { - marquee { -moz-binding: none; } - } /* Ruby */ diff --git a/layout/style/xbl-marquee/jar.mn b/layout/style/xbl-marquee/jar.mn deleted file mode 100644 index 9247cb4a1..000000000 --- a/layout/style/xbl-marquee/jar.mn +++ /dev/null @@ -1,8 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -toolkit.jar: -% content xbl-marquee %content/xbl-marquee/ contentaccessible=yes - content/xbl-marquee/xbl-marquee.xml - content/xbl-marquee/xbl-marquee.css diff --git a/layout/style/xbl-marquee/moz.build b/layout/style/xbl-marquee/moz.build deleted file mode 100644 index eb4454d28..000000000 --- a/layout/style/xbl-marquee/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/layout/style/xbl-marquee/xbl-marquee.css b/layout/style/xbl-marquee/xbl-marquee.css deleted file mode 100644 index e6d3ee94b..000000000 --- a/layout/style/xbl-marquee/xbl-marquee.css +++ /dev/null @@ -1,12 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* PRINT ONLY rules */ -@media print { - - marquee > * > * { - margin: 0 !important; - padding: 0 !important; - } /* This hack is needed until bug 119078 gets fixed */ -} diff --git a/layout/style/xbl-marquee/xbl-marquee.xml b/layout/style/xbl-marquee/xbl-marquee.xml deleted file mode 100644 index bb837624d..000000000 --- a/layout/style/xbl-marquee/xbl-marquee.xml +++ /dev/null @@ -1,733 +0,0 @@ -<?xml version="1.0"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - -<bindings id="marqueeBindings" - xmlns="http://www.mozilla.org/xbl" - xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:xbl="http://www.mozilla.org/xbl"> - - - <binding id="marquee" bindToUntrustedContent="true"> - - <resources> - <stylesheet src="chrome://xbl-marquee/content/xbl-marquee.css"/> - </resources> - <implementation> - - <property name="scrollAmount" exposeToUntrustedContent="true"> - <getter> - <![CDATA[ - this._mutationActor(this._mutationObserver.takeRecords()); - return this._scrollAmount; - ]]> - </getter> - <setter> - <![CDATA[ - var val = parseInt(val); - if (val < 0) { - return; - } - if (isNaN(val)) { - val = 0; - } - this.setAttribute("scrollamount", val); - ]]> - </setter> - </property> - - <property name="scrollDelay" exposeToUntrustedContent="true"> - <getter> - <![CDATA[ - this._mutationActor(this._mutationObserver.takeRecords()); - var val = parseInt(this.getAttribute("scrolldelay")); - - if (val <= 0 || isNaN(val)) { - return this._scrollDelay; - } - - return val; - ]]> - </getter> - <setter> - var val = parseInt(val); - if (val > 0 ) { - this.setAttribute("scrolldelay", val); - } - </setter> - </property> - - <property name="trueSpeed" exposeToUntrustedContent="true"> - <getter> - <![CDATA[ - if (!this.hasAttribute("truespeed")) { - return false; - } - - return true; - ]]> - </getter> - <setter> - <![CDATA[ - if (val) { - this.setAttribute("truespeed", ""); - } else { - this.removeAttribute('truespeed'); - } - ]]> - </setter> - </property> - - <property name="direction" exposeToUntrustedContent="true"> - <getter> - this._mutationActor(this._mutationObserver.takeRecords()); - return this._direction; - </getter> - <setter> - <![CDATA[ - if (typeof val == 'string') { - val = val.toLowerCase(); - } else { - return; - } - if (val != 'left' && val != 'right' && val != 'up' && val != 'down') { - val = 'left'; - } - - this.setAttribute("direction", val); - ]]> - </setter> - </property> - - <property name="behavior" exposeToUntrustedContent="true"> - <getter> - this._mutationActor(this._mutationObserver.takeRecords()); - return this._behavior; - </getter> - <setter> - if (typeof val == 'string') { - val = val.toLowerCase(); - } - if (val == "alternate" || val == "slide" || val == 'scroll') { - this.setAttribute("behavior", val); - } - </setter> - </property> - - - <property name="loop" exposeToUntrustedContent="true"> - <getter> - <![CDATA[ - this._mutationActor(this._mutationObserver.takeRecords()); - return this._loop; - ]]> - </getter> - <setter> - <![CDATA[ - var val = parseInt(val); - if (val == -1 || val > 0) { - this.setAttribute("loop", val); - } - ]]> - </setter> - </property> - - - <property name="onstart" exposeToUntrustedContent="true"> - <getter> - return this.getAttribute("onstart"); - </getter> - <setter> - this._setEventListener("start", val, true); - this.setAttribute("onstart", val); - </setter> - </property> - - <property name="onfinish" exposeToUntrustedContent="true"> - <getter> - return this.getAttribute("onfinish"); - </getter> - <setter> - this._setEventListener("finish", val, true); - this.setAttribute("onfinish", val); - </setter> - </property> - - <property name="onbounce" exposeToUntrustedContent="true"> - <getter> - return this.getAttribute("onbounce"); - </getter> - <setter> - this._setEventListener("bounce", val, true); - this.setAttribute("onbounce", val); - </setter> - </property> - - <property name="outerDiv" - onget="return document.getAnonymousNodes(this)[0]" - /> - - <property name="innerDiv" - onget="return document.getAnonymousElementByAttribute(this, 'class', 'innerDiv');" - /> - - <property name="height" exposeToUntrustedContent="true" - onget="return this.getAttribute('height');" - onset="this.setAttribute('height', val);" - /> - - <property name="width" exposeToUntrustedContent="true" - onget="return this.getAttribute('width');" - onset="this.setAttribute('width', val);" - /> - - <method name="_set_scrollDelay"> - <parameter name="aValue"/> - <body> - <![CDATA[ - aValue = parseInt(aValue); - if (aValue <= 0) { - return; - } else if (isNaN(aValue)) { - this._scrollDelay = 85; - } else if (aValue < 60) { - if (this.trueSpeed == true) { - this._scrollDelay = aValue; - } else { - this._scrollDelay = 60; - } - } else { - this._scrollDelay = aValue; - } - ]]> - </body> - </method> - - <method name="_set_scrollAmount"> - <parameter name="aValue"/> - <body> - <![CDATA[ - aValue = parseInt(aValue); - if (isNaN(aValue)) { - this._scrollAmount = 6; - } else if (aValue < 0) { - return; - } else { - this._scrollAmount = aValue; - } - ]]> - </body> - </method> - - <method name="_set_behavior"> - <parameter name="aValue"/> - <body> - <![CDATA[ - if (typeof aValue == 'string') { - aValue = aValue.toLowerCase(); - } - if (aValue != 'alternate' && aValue != 'slide' && aValue != 'scroll') { - this._behavior = 'scroll'; - } else { - this._behavior = aValue; - } - ]]> - </body> - </method> - - <method name="_set_direction"> - <parameter name="aValue"/> - <body> - <![CDATA[ - if (typeof aValue == 'string') { - aValue = aValue.toLowerCase(); - } - if (aValue != 'left' && aValue != 'right' && aValue != 'up' && aValue != 'down') { - aValue = 'left'; - } - - if (aValue != this._direction) { - this.startNewDirection = true; - } - this._direction = aValue; - ]]> - </body> - </method> - - <method name="_set_loop"> - <parameter name="aValue"/> - <body> - <![CDATA[ - var aValue = parseInt(aValue); - if (aValue == 0) { - return; - } - if (isNaN(aValue) || aValue <= -1) { - aValue = -1; - } - this._loop = aValue; - ]]> - </body> - </method> - - <method name="_setEventListener"> - <parameter name="aName"/> - <parameter name="aValue"/> - <parameter name="aIgnoreNextCall"/> - <body> - <![CDATA[ - // _setEventListener is only used for setting the attribute event - // handlers, which we want to ignore if our document is sandboxed - // without the allow-scripts keyword. - if (document.hasScriptsBlockedBySandbox) { - return true; - } - - // attribute event handlers should only be added if the - // document's CSP allows it. - if (!document.inlineScriptAllowedByCSP) { - return true; - } - - if (this._ignoreNextCall) { - return this._ignoreNextCall = false; - } - - if (aIgnoreNextCall) { - this._ignoreNextCall = true; - } - - if (typeof this["_on" + aName] == 'function') { - this.removeEventListener(aName, this["_on" + aName], false); - } - - switch (typeof aValue) - { - case "function": - this["_on" + aName] = aValue; - this.addEventListener(aName, this["_on" + aName], false); - break; - - case "string": - if (!aIgnoreNextCall) { - try { - // Function Xrays make this simple and safe. \o/ - this["_on" + aName] = new window.Function("event", aValue); - } - catch(e) { - return false; - } - this.addEventListener(aName, this["_on" + aName], false); - } - else { - this["_on" + aName] = aValue; - } - break; - - case "object": - this["_on" + aName] = aValue; - break; - - default: - this._ignoreNextCall = false; - throw new Error("Invalid argument for Marquee::on" + aName); - } - return true; - ]]> - </body> - </method> - - <method name="_fireEvent"> - <parameter name="aName"/> - <parameter name="aBubbles"/> - <parameter name="aCancelable"/> - <body> - <![CDATA[ - var e = document.createEvent("Events"); - e.initEvent(aName, aBubbles, aCancelable); - this.dispatchEvent(e); - ]]> - </body> - </method> - - <method name="start" exposeToUntrustedContent="true"> - <body> - <![CDATA[ - if (this.runId == 0) { - var myThis = this; - var lambda = function myTimeOutFunction(){myThis._doMove(false);} - this.runId = window.setTimeout(lambda, this._scrollDelay - this._deltaStartStop); - this._deltaStartStop = 0; - } - ]]> - </body> - </method> - - <method name="stop" exposeToUntrustedContent="true"> - <body> - <![CDATA[ - if (this.runId != 0) { - this._deltaStartStop = Date.now()- this._lastMoveDate; - clearTimeout(this.runId); - } - - this.runId = 0; - ]]> - </body> - </method> - - <method name="_doMove"> - <parameter name="aResetPosition"/> - <body> - <![CDATA[ - this._lastMoveDate = Date.now(); - - //startNewDirection is true at first load and whenever the direction is changed - if (this.startNewDirection) { - this.startNewDirection = false; //we only want this to run once every scroll direction change - - var corrvalue = 0; - - switch (this._direction) - { - case "up": - var height = document.defaultView.getComputedStyle(this, "").height; - this.outerDiv.style.height = height; - if (this.originalHeight > this.outerDiv.offsetHeight) { - corrvalue = this.originalHeight - this.outerDiv.offsetHeight; - } - this.innerDiv.style.padding = height + " 0"; - this.dirsign = 1; - this.startAt = (this._behavior == 'alternate') ? (this.originalHeight - corrvalue) : 0; - this.stopAt = (this._behavior == 'alternate' || this._behavior == 'slide') ? - (parseInt(height) + corrvalue) : (this.originalHeight + parseInt(height)); - break; - - case "down": - var height = document.defaultView.getComputedStyle(this, "").height; - this.outerDiv.style.height = height; - if (this.originalHeight > this.outerDiv.offsetHeight) { - corrvalue = this.originalHeight - this.outerDiv.offsetHeight; - } - this.innerDiv.style.padding = height + " 0"; - this.dirsign = -1; - this.startAt = (this._behavior == 'alternate') ? - (parseInt(height) + corrvalue) : (this.originalHeight + parseInt(height)); - this.stopAt = (this._behavior == 'alternate' || this._behavior == 'slide') ? - (this.originalHeight - corrvalue) : 0; - break; - - case "right": - if (this.innerDiv.offsetWidth > this.outerDiv.offsetWidth) { - corrvalue = this.innerDiv.offsetWidth - this.outerDiv.offsetWidth; - } - this.dirsign = -1; - this.stopAt = (this._behavior == 'alternate' || this._behavior == 'slide') ? - (this.innerDiv.offsetWidth - corrvalue) : 0; - this.startAt = this.outerDiv.offsetWidth + ((this._behavior == 'alternate') ? - corrvalue : (this.innerDiv.offsetWidth + this.stopAt)); - break; - - case "left": - default: - if (this.innerDiv.offsetWidth > this.outerDiv.offsetWidth) { - corrvalue = this.innerDiv.offsetWidth - this.outerDiv.offsetWidth; - } - this.dirsign = 1; - this.startAt = (this._behavior == 'alternate') ? (this.innerDiv.offsetWidth - corrvalue) : 0; - this.stopAt = this.outerDiv.offsetWidth + - ((this._behavior == 'alternate' || this._behavior == 'slide') ? - corrvalue : (this.innerDiv.offsetWidth + this.startAt)); - } - - if (aResetPosition) { - this.newPosition = this.startAt; - this._fireEvent("start", false, false); - } - } //end if - - this.newPosition = this.newPosition + (this.dirsign * this._scrollAmount); - - if ((this.dirsign == 1 && this.newPosition > this.stopAt) || - (this.dirsign == -1 && this.newPosition < this.stopAt)) - { - switch (this._behavior) - { - case 'alternate': - // lets start afresh - this.startNewDirection = true; - - // swap direction - const swap = {left: "right", down: "up", up: "down", right: "left"}; - this._direction = swap[this._direction]; - this.newPosition = this.stopAt; - - if ((this._direction == "up") || (this._direction == "down")) { - this.outerDiv.scrollTop = this.newPosition; - } else { - this.outerDiv.scrollLeft = this.newPosition; - } - - if (this._loop != 1) { - this._fireEvent("bounce", false, true); - } - break; - - case 'slide': - if (this._loop > 1) { - this.newPosition = this.startAt; - } - break; - - default: - this.newPosition = this.startAt; - - if ((this._direction == "up") || (this._direction == "down")) { - this.outerDiv.scrollTop = this.newPosition; - } else { - this.outerDiv.scrollLeft = this.newPosition; - } - - //dispatch start event, even when this._loop == 1, comp. with IE6 - this._fireEvent("start", false, false); - } - - if (this._loop > 1) { - this._loop--; - } else if (this._loop == 1) { - if ((this._direction == "up") || (this._direction == "down")) { - this.outerDiv.scrollTop = this.stopAt; - } else { - this.outerDiv.scrollLeft = this.stopAt; - } - this.stop(); - this._fireEvent("finish", false, true); - return; - } - } - else { - if ((this._direction == "up") || (this._direction == "down")) { - this.outerDiv.scrollTop = this.newPosition; - } else { - this.outerDiv.scrollLeft = this.newPosition; - } - } - - var myThis = this; - var lambda = function myTimeOutFunction(){myThis._doMove(false);} - this.runId = window.setTimeout(lambda, this._scrollDelay); - ]]> - </body> - </method> - - <method name="init"> - <body> - <![CDATA[ - this.stop(); - - if ((this._direction != "up") && (this._direction != "down")) { - var width = window.getComputedStyle(this, "").width; - this.innerDiv.parentNode.style.margin = '0 ' + width; - - //XXX Adding the margin sometimes causes the marquee to widen, - // see testcase from bug bug 364434: - // https://bugzilla.mozilla.org/attachment.cgi?id=249233 - // Just add a fixed width with current marquee's width for now - if (width != window.getComputedStyle(this, "").width) { - var width = window.getComputedStyle(this, "").width; - this.outerDiv.style.width = width; - this.innerDiv.parentNode.style.margin = '0 ' + width; - } - } - else { - // store the original height before we add padding - this.innerDiv.style.padding = 0; - this.originalHeight = this.innerDiv.offsetHeight; - } - - this._doMove(true); - ]]> - </body> - </method> - - <method name="_mutationActor"> - <parameter name="aMutations"/> - <body> - <![CDATA[ - while (aMutations.length > 0) { - var mutation = aMutations.shift(); - var attrName = mutation.attributeName.toLowerCase(); - var oldValue = mutation.oldValue; - var target = mutation.target; - var newValue = target.getAttribute(attrName); - - if (oldValue != newValue) { - switch (attrName) { - case "loop": - target._set_loop(newValue); - if (target.rundId == 0) { - target.start(); - } - break; - case "scrollamount": - target._set_scrollAmount(newValue); - break; - case "scrolldelay": - target._set_scrollDelay(newValue); - target.stop(); - target.start(); - break; - case "truespeed": - //needed to update target._scrollDelay - var myThis = target; - var lambda = function() {myThis._set_scrollDelay(myThis.getAttribute('scrolldelay'));} - window.setTimeout(lambda, 0); - break; - case "behavior": - target._set_behavior(newValue); - target.startNewDirection = true; - if ((oldValue == "slide" && target.newPosition == target.stopAt) || - newValue == "alternate" || newValue == "slide") { - target.stop(); - target._doMove(true); - } - break; - case "direction": - if (!newValue) { - newValue = "left"; - } - target._set_direction(newValue); - break; - case "width": - case "height": - target.startNewDirection = true; - break; - case "onstart": - target._setEventListener("start", newValue); - break; - case "onfinish": - target._setEventListener("finish", newValue); - break; - case "onbounce": - target._setEventListener("bounce", newValue); - break; - } - } - } - ]]> - </body> - </method> - - <constructor> - <![CDATA[ - // Set up state. - this._scrollAmount = 6; - this._scrollDelay = 85; - this._direction = "left"; - this._behavior = "scroll"; - this._loop = -1; - this.dirsign = 1; - this.startAt = 0; - this.stopAt = 0; - this.newPosition = 0; - this.runId = 0; - this.originalHeight = 0; - this.startNewDirection = true; - - // hack needed to fix js error, see bug 386470 - var myThis = this; - var lambda = function myScopeFunction() { if (myThis.init) myThis.init(); } - - this._set_direction(this.getAttribute('direction')); - this._set_behavior(this.getAttribute('behavior')); - this._set_scrollDelay(this.getAttribute('scrolldelay')); - this._set_scrollAmount(this.getAttribute('scrollamount')); - this._set_loop(this.getAttribute('loop')); - this._setEventListener("start", this.getAttribute("onstart")); - this._setEventListener("finish", this.getAttribute("onfinish")); - this._setEventListener("bounce", this.getAttribute("onbounce")); - this.startNewDirection = true; - - this._mutationObserver = new MutationObserver(this._mutationActor); - this._mutationObserver.observe(this, { attributes: true, - attributeOldValue: true, - attributeFilter: ['loop', 'scrollamount', 'scrolldelay', '', 'truespeed', 'behavior', - 'direction', 'width', 'height', 'onstart', 'onfinish', 'onbounce'] }); - - // init needs to be run after the page has loaded in order to calculate - // the correct height/width - if (document.readyState == "complete") { - lambda(); - } else { - window.addEventListener("load", lambda, false); - } - ]]> - </constructor> - </implementation> - - </binding> - - <binding id="marquee-horizontal" bindToUntrustedContent="true" - extends="chrome://xbl-marquee/content/xbl-marquee.xml#marquee" - inheritstyle="false"> - - <!-- White-space isn't allowed because a marquee could be - inside 'white-space: pre' --> - <content> - <html:div style="display: -moz-box; overflow: hidden; width: -moz-available;" - ><html:div style="display: -moz-box;" - ><html:div class="innerDiv" style="display: table; border-spacing: 0;" - ><html:div - ><children - /></html:div - ></html:div - ></html:div - ></html:div> - </content> - - </binding> - - <binding id="marquee-vertical" bindToUntrustedContent="true" - extends="chrome://xbl-marquee/content/xbl-marquee.xml#marquee" - inheritstyle="false"> - - <!-- White-space isn't allowed because a marquee could be - inside 'white-space: pre' --> - <content> - <html:div style="overflow: hidden; width: -moz-available;" - ><html:div class="innerDiv" - ><children - /></html:div - ></html:div> - </content> - - </binding> - - <binding id="marquee-horizontal-editable" bindToUntrustedContent="true" - inheritstyle="false"> - - <!-- White-space isn't allowed because a marquee could be - inside 'white-space: pre' --> - <content> - <html:div style="display: inline-block; overflow: auto; width: -moz-available;" - ><children - /></html:div> - </content> - - </binding> - - <binding id="marquee-vertical-editable" bindToUntrustedContent="true" - inheritstyle="false"> - - <!-- White-space isn't allowed because a marquee could be - inside 'white-space: pre' --> - <content> - <html:div style="overflow: auto; height: inherit; width: -moz-available;" - ><children/></html:div> - </content> - - </binding> - -</bindings> diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java index ee0493318..65af61a91 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java @@ -690,7 +690,6 @@ public final class ElementName public static final ElementName LISTING = new ElementName("listing", "listing", TreeBuilder.PRE_OR_LISTING | SPECIAL); public static final ElementName MFENCED = new ElementName("mfenced", "mfenced", TreeBuilder.OTHER); public static final ElementName MPADDED = new ElementName("mpadded", "mpadded", TreeBuilder.OTHER); - public static final ElementName MARQUEE = new ElementName("marquee", "marquee", TreeBuilder.MARQUEE_OR_APPLET | SPECIAL | SCOPING); public static final ElementName MACTION = new ElementName("maction", "maction", TreeBuilder.OTHER); public static final ElementName MSUBSUP = new ElementName("msubsup", "msubsup", TreeBuilder.OTHER); public static final ElementName NOEMBED = new ElementName("noembed", "noembed", TreeBuilder.NOEMBED | SPECIAL); @@ -1089,7 +1088,6 @@ public final class ElementName LISTING, MFENCED, MPADDED, - MARQUEE, MACTION, MSUBSUP, NOEMBED, diff --git a/parser/html/nsHtml5AtomList.h b/parser/html/nsHtml5AtomList.h index ce9fcd682..26ceff4b1 100644 --- a/parser/html/nsHtml5AtomList.h +++ b/parser/html/nsHtml5AtomList.h @@ -940,7 +940,6 @@ HTML5_ATOM(logbase, "logbase") HTML5_ATOM(listing, "listing") HTML5_ATOM(mfenced, "mfenced") HTML5_ATOM(mpadded, "mpadded") -HTML5_ATOM(marquee, "marquee") HTML5_ATOM(maction, "maction") HTML5_ATOM(msubsup, "msubsup") HTML5_ATOM(picture, "picture") diff --git a/parser/html/nsHtml5ElementName.h b/parser/html/nsHtml5ElementName.h index 99c6de323..db4427be9 100644 --- a/parser/html/nsHtml5ElementName.h +++ b/parser/html/nsHtml5ElementName.h @@ -358,7 +358,6 @@ class nsHtml5ElementName static nsHtml5ElementName* ELT_LISTING; static nsHtml5ElementName* ELT_MFENCED; static nsHtml5ElementName* ELT_MPADDED; - static nsHtml5ElementName* ELT_MARQUEE; static nsHtml5ElementName* ELT_MACTION; static nsHtml5ElementName* ELT_MSUBSUP; static nsHtml5ElementName* ELT_NOEMBED; diff --git a/parser/htmlparser/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h index 7e1e207cc..62e1d2eb3 100644 --- a/parser/htmlparser/nsHTMLTagList.h +++ b/parser/htmlparser/nsHTMLTagList.h @@ -110,7 +110,6 @@ HTML_TAG(listing, Pre) HTML_HTMLELEMENT_TAG(main) HTML_TAG(map, Map) HTML_HTMLELEMENT_TAG(mark) -HTML_TAG(marquee, Div) HTML_TAG(menu, Menu) HTML_TAG(menuitem, MenuItem) HTML_TAG(meta, Meta) diff --git a/testing/mozbase/mozlog/mozlog/formatters/html/xmlgen.py b/testing/mozbase/mozlog/mozlog/formatters/html/xmlgen.py index e545e9a7d..e5998cda3 100644 --- a/testing/mozbase/mozlog/mozlog/formatters/html/xmlgen.py +++ b/testing/mozbase/mozlog/mozlog/formatters/html/xmlgen.py @@ -106,7 +106,7 @@ class html(Namespace): 'colgroup,comment,dd,del,dfn,dir,div,dl,dt,em,embed,' 'fieldset,font,form,frameset,h1,h2,h3,h4,h5,h6,head,html,' 'i,iframe,img,input,ins,kbd,label,legend,li,link,listing,' - 'map,marquee,menu,meta,multicol,nobr,noembed,noframes,' + 'map,menu,meta,multicol,nobr,noembed,noframes,' 'noscript,object,ol,optgroup,option,p,pre,q,s,script,' 'select,small,span,strike,strong,style,sub,sup,table,' 'tbody,td,textarea,tfoot,th,thead,title,tr,tt,u,ul,xmp,' diff --git a/testing/web-platform/tests/dom/nodes/Node-cloneNode.html b/testing/web-platform/tests/dom/nodes/Node-cloneNode.html index 9fb939f7e..644a614fb 100644 --- a/testing/web-platform/tests/dom/nodes/Node-cloneNode.html +++ b/testing/web-platform/tests/dom/nodes/Node-cloneNode.html @@ -115,7 +115,6 @@ test(function() { create_element_and_check("main", HTMLElement); create_element_and_check("map", HTMLMapElement); create_element_and_check("mark", HTMLElement); - create_element_and_check("marquee", HTMLElement); create_element_and_check("meta", HTMLMetaElement); create_element_and_check("meter", HTMLMeterElement); create_element_and_check("nav", HTMLElement); diff --git a/testing/web-platform/tests/tools/html5lib/html5lib/constants.py b/testing/web-platform/tests/tools/html5lib/html5lib/constants.py index e7089846d..a1f601b40 100644 --- a/testing/web-platform/tests/tools/html5lib/html5lib/constants.py +++ b/testing/web-platform/tests/tools/html5lib/html5lib/constants.py @@ -302,7 +302,6 @@ scopingElements = frozenset(( (namespaces["html"], "applet"), (namespaces["html"], "caption"), (namespaces["html"], "html"), - (namespaces["html"], "marquee"), (namespaces["html"], "object"), (namespaces["html"], "table"), (namespaces["html"], "td"), @@ -386,7 +385,6 @@ specialElements = frozenset(( (namespaces["html"], "li"), (namespaces["html"], "link"), (namespaces["html"], "listing"), - (namespaces["html"], "marquee"), (namespaces["html"], "menu"), (namespaces["html"], "meta"), (namespaces["html"], "nav"), diff --git a/testing/web-platform/tests/tools/html5lib/html5lib/html5parser.py b/testing/web-platform/tests/tools/html5lib/html5lib/html5parser.py index 5b9ce7d72..048905ec3 100644 --- a/testing/web-platform/tests/tools/html5lib/html5lib/html5parser.py +++ b/testing/web-platform/tests/tools/html5lib/html5lib/html5parser.py @@ -898,7 +898,6 @@ def getPhases(debug): "strong", "tt", "u"), self.startTagFormatting), ("nobr", self.startTagNobr), ("button", self.startTagButton), - (("applet", "marquee", "object"), self.startTagAppletMarqueeObject), ("xmp", self.startTagXmp), ("table", self.startTagTable), (("area", "br", "embed", "img", "keygen", "wbr"), @@ -935,7 +934,6 @@ def getPhases(debug): (headingElements, self.endTagHeading), (("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u"), self.endTagFormatting), - (("applet", "marquee", "object"), self.endTagAppletMarqueeObject), ("br", self.endTagBr), ]) self.endTagHandler.default = self.endTagOther @@ -1133,12 +1131,6 @@ def getPhases(debug): self.tree.insertElement(token) self.parser.framesetOK = False - def startTagAppletMarqueeObject(self, token): - self.tree.reconstructActiveFormattingElements() - self.tree.insertElement(token) - self.tree.activeFormattingElements.append(Marker) - self.parser.framesetOK = False - def startTagXmp(self, token): if self.tree.elementInScope("p", variant="button"): self.endTagP(impliedTagToken("p")) @@ -1558,17 +1550,6 @@ def getPhases(debug): self.tree.openElements.insert( self.tree.openElements.index(furthestBlock) + 1, clone) - def endTagAppletMarqueeObject(self, token): - if self.tree.elementInScope(token["name"]): - self.tree.generateImpliedEndTags() - if self.tree.openElements[-1].name != token["name"]: - self.parser.parseError("end-tag-too-early", {"name": token["name"]}) - - if self.tree.elementInScope(token["name"]): - element = self.tree.openElements.pop() - while element.name != token["name"]: - element = self.tree.openElements.pop() - self.tree.clearActiveFormattingElements() def endTagBr(self, token): self.parser.parseError("unexpected-end-tag-treated-as", diff --git a/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests1.dat b/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests1.dat index d6726e305..cc65fd2fa 100644 --- a/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests1.dat +++ b/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests1.dat @@ -283,27 +283,6 @@ Line1<br>Line2<br>Line3<br>Line4 | <button> | "foobar" -#data -<p><b><div><marquee></p></b></div>X -#errors -(1,3): expected-doctype-but-got-start-tag -(1,11): unexpected-end-tag -(1,24): unexpected-end-tag -(1,28): unexpected-end-tag -(1,34): end-tag-too-early -(1,35): expected-closing-tag-but-got-eof -#document -| <html> -| <head> -| <body> -| <p> -| <b> -| <div> -| <b> -| <marquee> -| <p> -| "X" - #data <script><div></script></div><title><p></title><p><p> #errors @@ -1204,26 +1183,6 @@ Line1<br>Line2<br>Line3<br>Line4 | href="blah" | "aoe" -#data -<a href=a>aa<marquee>aa<a href=b>bb</marquee>aa -#errors -(1,10): expected-doctype-but-got-start-tag -(1,45): end-tag-too-early -(1,47): expected-closing-tag-but-got-eof -#document -| <html> -| <head> -| <body> -| <a> -| href="a" -| "aa" -| <marquee> -| "aa" -| <a> -| href="b" -| "bb" -| "aa" - #data <wbr><strike><code></strike><code><strike></code> #errors @@ -1484,26 +1443,6 @@ Line1<br>Line2<br>Line3<br>Line4 | <button> | <b> -#data -<p><b><div><marquee></p></b></div> -#errors -(1,3): expected-doctype-but-got-start-tag -(1,11): unexpected-end-tag -(1,24): unexpected-end-tag -(1,28): unexpected-end-tag -(1,34): end-tag-too-early -(1,34): expected-closing-tag-but-got-eof -#document -| <html> -| <head> -| <body> -| <p> -| <b> -| <div> -| <b> -| <marquee> -| <p> - #data <script></script></div><title></title><p><p> #errors @@ -1729,225 +1668,6 @@ Line1<br>Line2<br>Line3<br>Line4 | <td> | <colgroup> -#data -</strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea> -#errors -(1,9): expected-doctype-but-got-end-tag -(1,9): unexpected-end-tag-before-html -(1,13): unexpected-end-tag-before-html -(1,18): unexpected-end-tag-before-html -(1,22): unexpected-end-tag-before-html -(1,26): unexpected-end-tag-before-html -(1,35): unexpected-end-tag-before-html -(1,39): unexpected-end-tag-before-html -(1,47): unexpected-end-tag-before-html -(1,52): unexpected-end-tag-before-html -(1,58): unexpected-end-tag-before-html -(1,64): unexpected-end-tag-before-html -(1,72): unexpected-end-tag-before-html -(1,79): unexpected-end-tag-before-html -(1,88): unexpected-end-tag-before-html -(1,93): unexpected-end-tag-before-html -(1,98): unexpected-end-tag-before-html -(1,103): unexpected-end-tag-before-html -(1,108): unexpected-end-tag-before-html -(1,113): unexpected-end-tag-before-html -(1,118): unexpected-end-tag-before-html -(1,130): unexpected-end-tag-after-body -(1,130): unexpected-end-tag-treated-as -(1,134): unexpected-end-tag -(1,140): unexpected-end-tag -(1,148): unexpected-end-tag -(1,155): unexpected-end-tag -(1,163): unexpected-end-tag -(1,172): unexpected-end-tag -(1,180): unexpected-end-tag -(1,185): unexpected-end-tag -(1,190): unexpected-end-tag -(1,195): unexpected-end-tag -(1,203): unexpected-end-tag -(1,210): unexpected-end-tag -(1,217): unexpected-end-tag -(1,225): unexpected-end-tag -(1,230): unexpected-end-tag -(1,238): unexpected-end-tag -(1,244): unexpected-end-tag -(1,251): unexpected-end-tag -(1,258): unexpected-end-tag -(1,269): unexpected-end-tag -(1,279): unexpected-end-tag -(1,287): unexpected-end-tag -(1,296): unexpected-end-tag -(1,300): unexpected-end-tag -(1,305): unexpected-end-tag -(1,310): unexpected-end-tag -(1,320): unexpected-end-tag -(1,331): unexpected-end-tag -(1,339): unexpected-end-tag -(1,347): unexpected-end-tag -(1,355): unexpected-end-tag -(1,365): end-tag-too-early -(1,378): end-tag-too-early -(1,387): end-tag-too-early -(1,393): end-tag-too-early -(1,399): end-tag-too-early -(1,404): end-tag-too-early -(1,415): end-tag-too-early -(1,425): end-tag-too-early -(1,432): end-tag-too-early -(1,437): end-tag-too-early -(1,442): end-tag-too-early -(1,447): unexpected-end-tag -(1,454): unexpected-end-tag -(1,460): unexpected-end-tag -(1,467): unexpected-end-tag -(1,476): end-tag-too-early -(1,486): end-tag-too-early -(1,495): end-tag-too-early -(1,513): expected-eof-but-got-end-tag -(1,513): unexpected-end-tag -(1,520): unexpected-end-tag -(1,529): unexpected-end-tag -(1,537): unexpected-end-tag -(1,547): unexpected-end-tag -(1,557): unexpected-end-tag -(1,568): unexpected-end-tag -(1,579): unexpected-end-tag -(1,590): unexpected-end-tag -(1,599): unexpected-end-tag -(1,611): unexpected-end-tag -(1,622): unexpected-end-tag -#document -| <html> -| <head> -| <body> -| <br> -| <p> - -#data -<table><tr></strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea> -#errors -(1,7): expected-doctype-but-got-start-tag -(1,20): unexpected-end-tag-implies-table-voodoo -(1,20): unexpected-end-tag -(1,24): unexpected-end-tag-implies-table-voodoo -(1,24): unexpected-end-tag -(1,29): unexpected-end-tag-implies-table-voodoo -(1,29): unexpected-end-tag -(1,33): unexpected-end-tag-implies-table-voodoo -(1,33): unexpected-end-tag -(1,37): unexpected-end-tag-implies-table-voodoo -(1,37): unexpected-end-tag -(1,46): unexpected-end-tag-implies-table-voodoo -(1,46): unexpected-end-tag -(1,50): unexpected-end-tag-implies-table-voodoo -(1,50): unexpected-end-tag -(1,58): unexpected-end-tag-implies-table-voodoo -(1,58): unexpected-end-tag -(1,63): unexpected-end-tag-implies-table-voodoo -(1,63): unexpected-end-tag -(1,69): unexpected-end-tag-implies-table-voodoo -(1,69): end-tag-too-early -(1,75): unexpected-end-tag-implies-table-voodoo -(1,75): unexpected-end-tag -(1,83): unexpected-end-tag-implies-table-voodoo -(1,83): unexpected-end-tag -(1,90): unexpected-end-tag-implies-table-voodoo -(1,90): unexpected-end-tag -(1,99): unexpected-end-tag-implies-table-voodoo -(1,99): unexpected-end-tag -(1,104): unexpected-end-tag-implies-table-voodoo -(1,104): end-tag-too-early -(1,109): unexpected-end-tag-implies-table-voodoo -(1,109): end-tag-too-early -(1,114): unexpected-end-tag-implies-table-voodoo -(1,114): end-tag-too-early -(1,119): unexpected-end-tag-implies-table-voodoo -(1,119): end-tag-too-early -(1,124): unexpected-end-tag-implies-table-voodoo -(1,124): end-tag-too-early -(1,129): unexpected-end-tag-implies-table-voodoo -(1,129): end-tag-too-early -(1,136): unexpected-end-tag-in-table-row -(1,141): unexpected-end-tag-implies-table-voodoo -(1,141): unexpected-end-tag-treated-as -(1,145): unexpected-end-tag-implies-table-voodoo -(1,145): unexpected-end-tag -(1,151): unexpected-end-tag-implies-table-voodoo -(1,151): unexpected-end-tag -(1,159): unexpected-end-tag-implies-table-voodoo -(1,159): unexpected-end-tag -(1,166): unexpected-end-tag-implies-table-voodoo -(1,166): unexpected-end-tag -(1,174): unexpected-end-tag-implies-table-voodoo -(1,174): unexpected-end-tag -(1,183): unexpected-end-tag-implies-table-voodoo -(1,183): unexpected-end-tag -(1,196): unexpected-end-tag -(1,201): unexpected-end-tag -(1,206): unexpected-end-tag -(1,214): unexpected-end-tag -(1,221): unexpected-end-tag -(1,228): unexpected-end-tag -(1,236): unexpected-end-tag -(1,241): unexpected-end-tag -(1,249): unexpected-end-tag -(1,255): unexpected-end-tag -(1,262): unexpected-end-tag -(1,269): unexpected-end-tag -(1,280): unexpected-end-tag -(1,290): unexpected-end-tag -(1,298): unexpected-end-tag -(1,307): unexpected-end-tag -(1,311): unexpected-end-tag -(1,316): unexpected-end-tag -(1,321): unexpected-end-tag -(1,331): unexpected-end-tag -(1,342): unexpected-end-tag -(1,350): unexpected-end-tag -(1,358): unexpected-end-tag -(1,366): unexpected-end-tag -(1,376): end-tag-too-early -(1,389): end-tag-too-early -(1,398): end-tag-too-early -(1,404): end-tag-too-early -(1,410): end-tag-too-early -(1,415): end-tag-too-early -(1,426): end-tag-too-early -(1,436): end-tag-too-early -(1,443): end-tag-too-early -(1,448): end-tag-too-early -(1,453): end-tag-too-early -(1,458): unexpected-end-tag -(1,465): unexpected-end-tag -(1,471): unexpected-end-tag -(1,478): unexpected-end-tag -(1,487): end-tag-too-early -(1,497): end-tag-too-early -(1,506): end-tag-too-early -(1,524): expected-eof-but-got-end-tag -(1,524): unexpected-end-tag -(1,531): unexpected-end-tag -(1,540): unexpected-end-tag -(1,548): unexpected-end-tag -(1,558): unexpected-end-tag -(1,568): unexpected-end-tag -(1,579): unexpected-end-tag -(1,590): unexpected-end-tag -(1,601): unexpected-end-tag -(1,610): unexpected-end-tag -(1,622): unexpected-end-tag -(1,633): unexpected-end-tag -#document -| <html> -| <head> -| <body> -| <br> -| <table> -| <tbody> -| <tr> -| <p> - #data <frameset> #errors diff --git a/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests19.dat b/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests19.dat index 02158c8bb..00cc79243 100644 --- a/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests19.dat +++ b/testing/web-platform/tests/tools/html5lib/html5lib/tests/testdata/tree-construction/tests19.dat @@ -781,18 +781,6 @@ | <body> | <applet> -#data -<!doctype html><marquee><frameset> -#errors -(1,34): unexpected-start-tag -(1,34): expected-closing-tag-but-got-eof -#document -| <!DOCTYPE html> -| <html> -| <head> -| <body> -| <marquee> - #data <!doctype html><object><frameset> #errors diff --git a/testing/web-platform/tests/tools/html5lib/html5lib/treebuilders/_base.py b/testing/web-platform/tests/tools/html5lib/html5lib/treebuilders/_base.py index 8b97cc11a..13c73bf22 100644 --- a/testing/web-platform/tests/tools/html5lib/html5lib/treebuilders/_base.py +++ b/testing/web-platform/tests/tools/html5lib/html5lib/treebuilders/_base.py @@ -4,8 +4,8 @@ from six import text_type from ..constants import scopingElements, tableInsertModeElements, namespaces # The scope markers are inserted when entering object elements, -# marquees, table cells, and table captions, and are used to prevent formatting -# from "leaking" into tables, object elements, and marquees. +# table cells, and table captions, and are used to prevent formatting +# from "leaking" into tables, and object elements. Marker = None listElementsMap = { diff --git a/testing/web-platform/tests/tools/py/py/_xmlgen.py b/testing/web-platform/tests/tools/py/py/_xmlgen.py index 2ffcaa14b..741e2029e 100644 --- a/testing/web-platform/tests/tools/py/py/_xmlgen.py +++ b/testing/web-platform/tests/tools/py/py/_xmlgen.py @@ -79,7 +79,7 @@ class html(Namespace): 'colgroup,comment,dd,del,dfn,dir,div,dl,dt,em,embed,' 'fieldset,font,form,frameset,h1,h2,h3,h4,h5,h6,head,html,' 'i,iframe,img,input,ins,kbd,label,legend,li,link,listing,' - 'map,marquee,menu,meta,multicol,nobr,noembed,noframes,' + 'map,menu,meta,multicol,nobr,noembed,noframes,' 'noscript,object,ol,optgroup,option,p,pre,q,s,script,' 'select,small,span,strike,strong,style,sub,sup,table,' 'tbody,td,textarea,tfoot,th,thead,title,tr,tt,u,ul,xmp,' -- cgit v1.2.3