mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1507895 - Part III, Remove the marquee binding r=smaug 

This patch removes the XBL marquee binding and always uses
UA Widget for the internal "gut" of the marquee element.

Depends on D17572

Differential Revision: https://phabricator.services.mozilla.com/D17573

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Timothy Guan-tin Chien 2019-01-25 14:24:43 +00:00
Родитель ccf133638c
Коммит f1367fab83
11 изменённых файлов: 7 добавлений и 481 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
dom/html/HTMLMarqueeElement.cpp
Просмотреть файл

@ -22,12 +22,6 @@ namespace dom {
HTMLMarqueeElement::~HTMLMarqueeElement() {}
NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLMarqueeElement, nsGenericHTMLElement,
mStartStopCallback)
NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED_0(HTMLMarqueeElement,
nsGenericHTMLElement)
NS_IMPL_ELEMENT_CLONE(HTMLMarqueeElement)
static const nsAttrValue::EnumTable kBehaviorTable[] = {
@ -59,7 +53,7 @@ nsresult HTMLMarqueeElement::BindToTree(Document* aDocument,
nsGenericHTMLElement::BindToTree(aDocument, aParent, aBindingParent);
NS_ENSURE_SUCCESS(rv, rv);
if (nsContentUtils::IsUAWidgetEnabled() && IsInComposedDoc()) {
if (IsInComposedDoc()) {
AttachAndSetUAShadowRoot();
NotifyUAWidgetSetupOrChange();
}
@ -68,7 +62,7 @@ nsresult HTMLMarqueeElement::BindToTree(Document* aDocument,
}
void HTMLMarqueeElement::UnbindFromTree(bool aDeep, bool aNullParent) {
if (nsContentUtils::IsUAWidgetEnabled() && IsInComposedDoc()) {
if (IsInComposedDoc()) {
// We don't want to unattach the shadow root because it used to
// contain a <slot>.
NotifyUAWidgetTeardown(UnattachShadowRoot::No);
@ -77,11 +71,6 @@ void HTMLMarqueeElement::UnbindFromTree(bool aDeep, bool aNullParent) {
nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent);
}
void HTMLMarqueeElement::SetStartStopCallback(
FunctionStringCallback* aCallback) {
mStartStopCallback = aCallback;
}
void HTMLMarqueeElement::GetBehavior(nsAString& aValue) {
GetEnumAttr(nsGkAtoms::behavior, kDefaultBehavior->tag, aValue);
}
@ -134,7 +123,7 @@ nsresult HTMLMarqueeElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
const nsAttrValue* aOldValue,
nsIPrincipal* aMaybeScriptedPrincipal,
bool aNotify) {
if (nsContentUtils::IsUAWidgetEnabled() && IsInComposedDoc() &&
if (IsInComposedDoc() &&
aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::direction) {
NotifyUAWidgetSetupOrChange();
}
@ -178,16 +167,12 @@ void HTMLMarqueeElement::DispatchEventToShadowRoot(
void HTMLMarqueeElement::Start() {
if (GetShadowRoot()) {
DispatchEventToShadowRoot(NS_LITERAL_STRING("marquee-start"));
} else if (mStartStopCallback) {
mStartStopCallback->Call(NS_LITERAL_STRING("start"));
}
}
void HTMLMarqueeElement::Stop() {
if (GetShadowRoot()) {
DispatchEventToShadowRoot(NS_LITERAL_STRING("marquee-stop"));
} else if (mStartStopCallback) {
mStartStopCallback->Call(NS_LITERAL_STRING("stop"));
}
}

10
dom/html/HTMLMarqueeElement.h
Просмотреть файл

@ -12,18 +12,11 @@
namespace mozilla {
namespace dom {
class FunctionStringCallback;
class HTMLMarqueeElement final : public nsGenericHTMLElement {
public:
explicit HTMLMarqueeElement(already_AddRefed<dom::NodeInfo>&& aNodeInfo)
: nsGenericHTMLElement(std::move(aNodeInfo)) {}
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLMarqueeElement,
nsGenericHTMLElement)
nsresult BindToTree(Document* aDocument, nsIContent* aParent,
nsIContent* aBindingParent) override;
void UnbindFromTree(bool aDeep = true, bool aNullParent = true) override;
@ -34,8 +27,6 @@ class HTMLMarqueeElement final : public nsGenericHTMLElement {
bool IsEventAttributeNameInternal(nsAtom* aName) override;
void SetStartStopCallback(FunctionStringCallback* aCallback);
void GetBehavior(nsAString& aValue);
void SetBehavior(const nsAString& aValue, ErrorResult& aError) {
SetHTMLAttr(nsGkAtoms::behavior, aValue, aError);
@ -126,7 +117,6 @@ class HTMLMarqueeElement final : public nsGenericHTMLElement {
JS::Handle<JSObject*> aGivenProto) override;
private:
RefPtr<FunctionStringCallback> mStartStopCallback;
static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
MappedDeclarations&);

3
dom/webidl/HTMLMarqueeElement.webidl
Просмотреть файл

@ -32,8 +32,5 @@ interface HTMLMarqueeElement : HTMLElement {
void start();
void stop();
[Func="IsChromeOrXBL"]
void setStartStopCallback(FunctionStringCallback? callback);
};

4
dom/xbl/nsXBLService.cpp
Просмотреть файл

@ -487,9 +487,7 @@ nsresult nsXBLService::LoadBindings(Element* aElement, nsIURI* aURL,
MOZ_ASSERT(
// pluginProblem
tag == nsGkAtoms::embed || tag == nsGkAtoms::applet ||
tag == nsGkAtoms::object ||
// xbl-marquee
tag == nsGkAtoms::marquee,
tag == nsGkAtoms::object,
"Unexpected XBL binding used in the content process");
}
#endif

20
layout/style/contenteditable.css
Просмотреть файл

@ -14,13 +14,13 @@ textarea:-moz-read-write > .anonymous-div:-moz-read-only {
-moz-user-select: text;
}
/* Use default arrow over objects with size that
/* Use default arrow over objects with size that
are selected when clicked on.
Override the browser's pointer cursor over links
*/
img:-moz-read-write, img:-moz-read-write[usemap], area:-moz-read-write,
object:-moz-read-write, object:-moz-read-write[usemap],
object:-moz-read-write, object:-moz-read-write[usemap],
applet:-moz-read-write, hr:-moz-read-write, button:-moz-read-write,
select:-moz-read-write,
a:-moz-read-write:link img, a:-moz-read-write:visited img,
@ -38,7 +38,7 @@ a:active:-moz-read-write img {
-moz-user-input: none;
}
/* We suppress user/author's prefs for link underline,
/* We suppress user/author's prefs for link underline,
so we must set explicitly. This isn't good!
*/
a:link:-moz-read-write {
@ -70,20 +70,6 @@ input[contenteditable="true"][type="file"] {
-moz-user-focus: none !important;
}
/* emulation of non-standard HTML <marquee> tag */
@supports not -moz-bool-pref("dom.ua_widget.enabled") {
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;

1
layout/style/moz.build
Просмотреть файл

@ -34,7 +34,6 @@ with Files('nsTransitionManager.*'):
with Files('StyleAnimationValue.*'):
BUG_COMPONENT = ('Core', 'CSS Transitions and Animations')
DIRS += ['xbl-marquee']
TEST_DIRS += ['test']
EXPORTS += [

13
layout/style/res/html.css
Просмотреть файл

@ -812,7 +812,6 @@ dialog:not([open]) {
display: none;
}
/* emulation of non-standard HTML <marquee> tag */
marquee {
inline-size: -moz-available;
display: inline-block;
@ -824,18 +823,6 @@ marquee[direction="up"], marquee[direction="down"] {
block-size: 200px;
}
@supports not -moz-bool-pref("dom.ua_widget.enabled") {
marquee {
-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');
}
}
/* PRINT ONLY rules follow */
@media print {

8
layout/style/xbl-marquee/jar.mn
Просмотреть файл

@ -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

7
layout/style/xbl-marquee/moz.build
Просмотреть файл

@ -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']

12
layout/style/xbl-marquee/xbl-marquee.css
Просмотреть файл

@ -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 */
}

389
layout/style/xbl-marquee/xbl-marquee.xml
Просмотреть файл

@ -1,389 +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="outerDiv"
onget="return document.getAnonymousNodes(this)[0]"
/>
<property name="innerDiv"
onget="return document.getAnonymousElementByAttribute(this, 'class', 'innerDiv');"
/>
<property name="scrollDelayWithTruespeed">
<getter>
<![CDATA[
if (this.scrollDelay < 60 && !this.trueSpeed) {
return 60;
}
return this.scrollDelay;
]]>
</getter>
</property>
<method name="doStart">
<body>
<![CDATA[
if (this.runId == 0) {
var lambda = () => this._doMove(false);
this.runId = window.setTimeout(lambda, this.scrollDelayWithTruespeed - this._deltaStartStop);
this._deltaStartStop = 0;
}
]]>
</body>
</method>
<method name="doStop">
<body>
<![CDATA[
if (this.runId != 0) {
this._deltaStartStop = Date.now()- this._lastMoveDate;
clearTimeout(this.runId);
}
this.runId = 0;
]]>
</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="_doMove">
<parameter name="aResetPosition"/>
<body>
<![CDATA[
this._lastMoveDate = Date.now();
// invalidateCache is true at first load and whenever an attribute
// is changed
if (this.invalidateCache) {
this.invalidateCache = false; //we only want this to run once every scroll direction change
var corrvalue = 0;
switch (this._currentDirection)
{
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.invalidateCache = true;
// swap direction
const swap = {left: "right", down: "up", up: "down", right: "left"};
this._currentDirection = swap[this._currentDirection] || "left";
this.newPosition = this.stopAt;
if ((this._currentDirection == "up") || (this._currentDirection == "down")) {
this.outerDiv.scrollTop = this.newPosition;
} else {
this.outerDiv.scrollLeft = this.newPosition;
}
if (this._currentLoop != 1) {
this._fireEvent("bounce", false, true);
}
break;
case 'slide':
if (this._currentLoop > 1) {
this.newPosition = this.startAt;
}
break;
default:
this.newPosition = this.startAt;
if ((this._currentDirection == "up") || (this._currentDirection == "down")) {
this.outerDiv.scrollTop = this.newPosition;
} else {
this.outerDiv.scrollLeft = this.newPosition;
}
//dispatch start event, even when this._currentLoop == 1, comp. with IE6
this._fireEvent("start", false, false);
}
if (this._currentLoop > 1) {
this._currentLoop--;
} else if (this._currentLoop == 1) {
if ((this._currentDirection == "up") || (this._currentDirection == "down")) {
this.outerDiv.scrollTop = this.stopAt;
} else {
this.outerDiv.scrollLeft = this.stopAt;
}
this.stop();
this._fireEvent("finish", false, true);
return;
}
}
else {
if ((this._currentDirection == "up") || (this._currentDirection == "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.scrollDelayWithTruespeed);
]]>
</body>
</method>
<method name="init">
<body>
<![CDATA[
this.stop();
if ((this._currentDirection != "up") && (this._currentDirection != "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) {
target.invalidateCache = true;
switch (attrName) {
case "loop":
target._currentLoop = target.loop;
break;
case "direction":
target._currentDirection = target.direction;
break;
}
}
}
]]>
</body>
</method>
<constructor>
<![CDATA[
this.setStartStopCallback(val => {
if (val == "start") {
this.doStart();
} else if (val == "stop") {
this.doStop();
} else {
throw new Error(`setStartStopCallback passed an invalid value: ${val}`);
}
});
// Set up state.
this._currentDirection = this.direction || "left";
this._currentLoop = this.loop;
this.dirsign = 1;
this.startAt = 0;
this.stopAt = 0;
this.newPosition = 0;
this.runId = 0;
this.originalHeight = 0;
this.invalidateCache = true;
// hack needed to fix js error, see bug 386470
var myThis = this;
var lambda = function myScopeFunction() { if (myThis.init) myThis.init(); }
this._mutationObserver = new MutationObserver(this._mutationActor);
this._mutationObserver.observe(this, { attributes: true,
attributeOldValue: true,
attributeFilter: ['loop', '', 'behavior',
'direction', 'width', 'height'] });
// 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);
}
]]>
</constructor>
<destructor>
<![CDATA[
this.setStartStopCallback(null);
]]>
</destructor>
</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>