mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-26 04:09:50 +00:00
Merge mozilla-inbound to mozilla-central. a=merge
This commit is contained in:
Dorel Luca
commit
f51c4fa5d9
22
Cargo.lock
generated
22
Cargo.lock
generated
@ -442,7 +442,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cssparser"
|
||||
version = "0.23.9"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"cssparser-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -450,11 +450,11 @@ dependencies = [
|
||||
"itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"proc-macro2 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -803,7 +803,7 @@ name = "geckoservo"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1140,7 +1140,7 @@ name = "malloc_size_of"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"app_units 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hashglobe 0.1.0",
|
||||
"selectors 0.19.0",
|
||||
@ -1797,7 +1797,7 @@ name = "selectors"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1940,7 +1940,7 @@ dependencies = [
|
||||
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fallible 0.0.1",
|
||||
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1995,7 +1995,7 @@ version = "0.0.1"
|
||||
dependencies = [
|
||||
"app_units 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"malloc_size_of 0.0.1",
|
||||
"malloc_size_of_derive 0.0.1",
|
||||
@ -2008,7 +2008,7 @@ name = "stylo_tests"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -2566,7 +2566,7 @@ dependencies = [
|
||||
"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
|
||||
"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
|
||||
"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
|
||||
"checksum cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)" = "205647ffe2b63a9726a4c3bb6f31c7325e8ceff10e2f1b75a6fb7609e20419ea"
|
||||
"checksum cssparser 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "495beddc39b1987b8e9f029354eccbd5ef88eb5f1cd24badb764dce338acf2e0"
|
||||
"checksum cssparser-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f3a5383ae18dbfdeb569ed62019f5bddb2a95cd2d3833313c475a0d014777805"
|
||||
"checksum cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b6557bdb1dc9647eae1cf7f5601b14cd45fc3c7ccf2df618387416fe542da6ea"
|
||||
"checksum cstr-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0472c17c83d3ec1af32fb6ee2b3ad56ae0b6e69355d63d1d30602055c34324a8"
|
||||
|
||||
@ -62,7 +62,7 @@ AccessibleNode::~AccessibleNode()
|
||||
/* virtual */ JSObject*
|
||||
AccessibleNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return AccessibleNodeBinding::Wrap(aCx, this, aGivenProto);
|
||||
return AccessibleNode_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* virtual */ ParentObject
|
||||
|
||||
@ -27,7 +27,6 @@ XULMAP_TYPE(radio, XULRadioButtonAccessible)
|
||||
XULMAP_TYPE(radiogroup, XULRadioGroupAccessible)
|
||||
XULMAP_TYPE(richlistbox, XULListboxAccessibleWrap)
|
||||
XULMAP_TYPE(richlistitem, XULListitemAccessible)
|
||||
XULMAP_TYPE(scale, XULSliderAccessible)
|
||||
XULMAP_TYPE(statusbar, XULStatusBarAccessible)
|
||||
XULMAP_TYPE(tab, XULTabAccessible)
|
||||
XULMAP_TYPE(tabpanels, XULTabpanelsAccessible)
|
||||
@ -149,16 +148,6 @@ XULMAP(
|
||||
}
|
||||
)
|
||||
|
||||
XULMAP(
|
||||
thumb,
|
||||
[](Element* aElement, Accessible* aContext) -> Accessible* {
|
||||
if (aElement->ClassList()->Contains(NS_LITERAL_STRING("scale-thumb"))) {
|
||||
return new XULThumbAccessible(aElement, aContext->Document());
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
)
|
||||
|
||||
XULMAP(
|
||||
tree,
|
||||
[](Element* aElement, Accessible* aContext) -> Accessible* {
|
||||
|
||||
@ -81,7 +81,6 @@
|
||||
#include "XULFormControlAccessible.h"
|
||||
#include "XULListboxAccessibleWrap.h"
|
||||
#include "XULMenuAccessibleWrap.h"
|
||||
#include "XULSliderAccessible.h"
|
||||
#include "XULTabAccessible.h"
|
||||
#include "XULTreeGridAccessibleWrap.h"
|
||||
#endif
|
||||
|
||||
@ -143,7 +143,7 @@ nsCoreUtils::DispatchMouseEvent(EventMessage aMessage, int32_t aX, int32_t aY,
|
||||
event.mClickCount = 1;
|
||||
event.button = WidgetMouseEvent::eLeftButton;
|
||||
event.mTime = PR_IntervalNow();
|
||||
event.inputSource = dom::MouseEventBinding::MOZ_SOURCE_UNKNOWN;
|
||||
event.inputSource = dom::MouseEvent_Binding::MOZ_SOURCE_UNKNOWN;
|
||||
|
||||
nsEventStatus status = nsEventStatus_eIgnore;
|
||||
aPresShell->HandleEventWithTarget(&event, aFrame, aContent, &status);
|
||||
|
||||
@ -256,13 +256,13 @@ Accessible::AccessKey() const
|
||||
switch (Preferences::GetInt("ui.key.generalAccessKey", -1)) {
|
||||
case -1:
|
||||
break;
|
||||
case dom::KeyboardEventBinding::DOM_VK_SHIFT:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_SHIFT:
|
||||
return KeyBinding(key, KeyBinding::kShift);
|
||||
case dom::KeyboardEventBinding::DOM_VK_CONTROL:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_CONTROL:
|
||||
return KeyBinding(key, KeyBinding::kControl);
|
||||
case dom::KeyboardEventBinding::DOM_VK_ALT:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_ALT:
|
||||
return KeyBinding(key, KeyBinding::kAlt);
|
||||
case dom::KeyboardEventBinding::DOM_VK_META:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_META:
|
||||
return KeyBinding(key, KeyBinding::kMeta);
|
||||
default:
|
||||
return KeyBinding();
|
||||
|
||||
@ -721,7 +721,7 @@ DocAccessible::AttributeWillChange(dom::Element* aElement,
|
||||
// Update dependent IDs cache. Take care of elements that are accessible
|
||||
// because dependent IDs cache doesn't contain IDs from non accessible
|
||||
// elements.
|
||||
if (aModType != dom::MutationEventBinding::ADDITION)
|
||||
if (aModType != dom::MutationEvent_Binding::ADDITION)
|
||||
RemoveDependentIDsFor(accessible, aAttribute);
|
||||
|
||||
if (aAttribute == nsGkAtoms::id) {
|
||||
@ -739,7 +739,7 @@ DocAccessible::AttributeWillChange(dom::Element* aElement,
|
||||
// need to newly expose it as a toggle button) etc.
|
||||
if (aAttribute == nsGkAtoms::aria_checked ||
|
||||
aAttribute == nsGkAtoms::aria_pressed) {
|
||||
mARIAAttrOldValue = (aModType != dom::MutationEventBinding::ADDITION) ?
|
||||
mARIAAttrOldValue = (aModType != dom::MutationEvent_Binding::ADDITION) ?
|
||||
nsAccUtils::GetARIAToken(aElement, aAttribute) : nullptr;
|
||||
return;
|
||||
}
|
||||
@ -794,8 +794,8 @@ DocAccessible::AttributeChanged(dom::Element* aElement,
|
||||
// its accessible will be created later. It doesn't make sense to keep
|
||||
// dependent IDs for non accessible elements. For the second case we'll update
|
||||
// dependent IDs cache when its accessible is created.
|
||||
if (aModType == dom::MutationEventBinding::MODIFICATION ||
|
||||
aModType == dom::MutationEventBinding::ADDITION) {
|
||||
if (aModType == dom::MutationEvent_Binding::MODIFICATION ||
|
||||
aModType == dom::MutationEvent_Binding::ADDITION) {
|
||||
AddDependentIDsFor(accessible, aAttribute);
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,7 +42,6 @@
|
||||
new focusChecker(getNode("textbox").inputField)));
|
||||
gQueue.push(new synthFocus("textbox_multiline",
|
||||
new focusChecker(getNode("textbox_multiline").inputField)));
|
||||
gQueue.push(new synthFocus("scale"));
|
||||
gQueue.push(new synthFocusOnFrame("editabledoc"));
|
||||
gQueue.push(new synthFocus("radioclothes",
|
||||
new focusChecker("radiosweater")));
|
||||
@ -118,11 +117,6 @@ if (!MAC) {
|
||||
|
||||
<hbox flex="1" style="overflow: auto;">
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<a target="_blank"
|
||||
href="https://bugzilla.mozilla.org/show_bug.cgi?id=492518"
|
||||
title="xul:slider accessible of xul:scale is accessible illegally">
|
||||
Mozilla Bug 492518
|
||||
</a>
|
||||
<a target="_blank"
|
||||
href="https://bugzilla.mozilla.org/show_bug.cgi?id=552368"
|
||||
title=" fire focus event on document accessible whenever the root or body element is focused">
|
||||
@ -137,7 +131,6 @@ if (!MAC) {
|
||||
<vbox flex="1">
|
||||
<textbox id="textbox" value="hello"/>
|
||||
<textbox id="textbox_multiline" multiline="true" value="hello"/>
|
||||
<scale id="scale" min="0" max="9" value="5"/>
|
||||
<iframe id="editabledoc" src="focus.html"/>
|
||||
<radiogroup id="radioclothes">
|
||||
<radio id="radiosweater" label="radiosweater"/>
|
||||
|
||||
@ -70,8 +70,6 @@
|
||||
testStates("menubar", 0, 0, STATE_FOCUSABLE);
|
||||
testStates("menu", STATE_FOCUSABLE, 0, STATE_UNAVAILABLE);
|
||||
testStates("menu-disabled", STATE_UNAVAILABLE, 0, STATE_FOCUSABLE | STATE_SELECTABLE);
|
||||
testStates("scale", STATE_FOCUSABLE, 0, STATE_UNAVAILABLE);
|
||||
testStates("scale-disabled", STATE_UNAVAILABLE, 0, STATE_FOCUSABLE);
|
||||
testStates("tab", STATE_FOCUSABLE | STATE_SELECTABLE | STATE_SELECTED, 0, STATE_UNAVAILABLE);
|
||||
testStates("tab-disabled", STATE_UNAVAILABLE, 0, STATE_FOCUSABLE | STATE_SELECTABLE | STATE_SELECTED);
|
||||
|
||||
@ -160,9 +158,6 @@
|
||||
</menubar>
|
||||
</toolbox>
|
||||
|
||||
<scale id="scale" min="1" max="10"/>
|
||||
<scale id="scale-disabled" min="1" max="10" disabled="true"/>
|
||||
|
||||
<tabbox>
|
||||
<tabs>
|
||||
<tab id="tab" label="tab1" tooltip="tooltip"/>
|
||||
|
||||
@ -23,10 +23,6 @@
|
||||
testValue("pm2", "50%", 500, 0, 1000, 0);
|
||||
testValue("pm3", "", 0, 0, 100, 0);
|
||||
|
||||
// scale
|
||||
testValue("sc1", "500", 500, 0, 1000, 10);
|
||||
testValue("sc2", "", 0, 0, 0, 0);
|
||||
|
||||
// aria progressbar
|
||||
testValue("ariapb1", "500", 500, 0, 1000, 0);
|
||||
testValue("ariapb2", "", 0, 0, 0, 0);
|
||||
@ -58,10 +54,6 @@
|
||||
<progressmeter id="pm2" value="500" max="1000"/>
|
||||
<progressmeter id="pm3"/>
|
||||
|
||||
<!-- scale -->
|
||||
<scale id="sc1" value="500" max="1000" increment="10"/>
|
||||
<scale id="sc2"/>
|
||||
|
||||
<!-- aria -->
|
||||
<description id="ariapb1" role="progressbar"
|
||||
aria-valuenow="500" aria-valuemin="0" aria-valuemax="1000"/>
|
||||
|
||||
@ -173,16 +173,16 @@ XULMenuitemAccessible::AccessKey() const
|
||||
}
|
||||
|
||||
switch (gMenuAccesskeyModifier) {
|
||||
case dom::KeyboardEventBinding::DOM_VK_CONTROL:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_CONTROL:
|
||||
modifierKey = KeyBinding::kControl;
|
||||
break;
|
||||
case dom::KeyboardEventBinding::DOM_VK_ALT:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_ALT:
|
||||
modifierKey = KeyBinding::kAlt;
|
||||
break;
|
||||
case dom::KeyboardEventBinding::DOM_VK_META:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_META:
|
||||
modifierKey = KeyBinding::kMeta;
|
||||
break;
|
||||
case dom::KeyboardEventBinding::DOM_VK_WIN:
|
||||
case dom::KeyboardEvent_Binding::DOM_VK_WIN:
|
||||
modifierKey = KeyBinding::kOS;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -1,216 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* 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/. */
|
||||
|
||||
#include "XULSliderAccessible.h"
|
||||
|
||||
#include "nsAccessibilityService.h"
|
||||
#include "Role.h"
|
||||
#include "States.h"
|
||||
|
||||
#include "nsIFrame.h"
|
||||
#include "mozilla/dom/Element.h"
|
||||
#include "mozilla/FloatingPoint.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// XULSliderAccessible
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
XULSliderAccessible::
|
||||
XULSliderAccessible(nsIContent* aContent, DocAccessible* aDoc) :
|
||||
AccessibleWrap(aContent, aDoc)
|
||||
{
|
||||
mStateFlags |= eHasNumericValue | eNoXBLKids;
|
||||
}
|
||||
|
||||
// Accessible
|
||||
|
||||
role
|
||||
XULSliderAccessible::NativeRole() const
|
||||
{
|
||||
return roles::SLIDER;
|
||||
}
|
||||
|
||||
uint64_t
|
||||
XULSliderAccessible::NativeInteractiveState() const
|
||||
{
|
||||
if (NativelyUnavailable())
|
||||
return states::UNAVAILABLE;
|
||||
|
||||
dom::Element* sliderElm = GetSliderElement();
|
||||
if (sliderElm) {
|
||||
nsIFrame* frame = sliderElm->GetPrimaryFrame();
|
||||
if (frame && frame->IsFocusable())
|
||||
return states::FOCUSABLE;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool
|
||||
XULSliderAccessible::NativelyUnavailable() const
|
||||
{
|
||||
return mContent->AsElement()->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled,
|
||||
nsGkAtoms::_true, eCaseMatters);
|
||||
}
|
||||
|
||||
void
|
||||
XULSliderAccessible::Value(nsString& aValue) const
|
||||
{
|
||||
GetSliderAttr(nsGkAtoms::curpos, aValue);
|
||||
}
|
||||
|
||||
uint8_t
|
||||
XULSliderAccessible::ActionCount() const
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
XULSliderAccessible::ActionNameAt(uint8_t aIndex, nsAString& aName)
|
||||
{
|
||||
aName.Truncate();
|
||||
if (aIndex == 0)
|
||||
aName.AssignLiteral("activate");
|
||||
}
|
||||
|
||||
bool
|
||||
XULSliderAccessible::DoAction(uint8_t aIndex) const
|
||||
{
|
||||
if (aIndex != 0)
|
||||
return false;
|
||||
|
||||
dom::Element* sliderElm = GetSliderElement();
|
||||
if (sliderElm)
|
||||
DoCommand(sliderElm);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
double
|
||||
XULSliderAccessible::MaxValue() const
|
||||
{
|
||||
double value = AccessibleWrap::MaxValue();
|
||||
return IsNaN(value) ? GetSliderAttr(nsGkAtoms::maxpos) : value;
|
||||
}
|
||||
|
||||
double
|
||||
XULSliderAccessible::MinValue() const
|
||||
{
|
||||
double value = AccessibleWrap::MinValue();
|
||||
return IsNaN(value) ? GetSliderAttr(nsGkAtoms::minpos) : value;
|
||||
}
|
||||
|
||||
double
|
||||
XULSliderAccessible::Step() const
|
||||
{
|
||||
double value = AccessibleWrap::Step();
|
||||
return IsNaN(value) ? GetSliderAttr(nsGkAtoms::increment) : value;
|
||||
}
|
||||
|
||||
double
|
||||
XULSliderAccessible::CurValue() const
|
||||
{
|
||||
double value = AccessibleWrap::CurValue();
|
||||
return IsNaN(value) ? GetSliderAttr(nsGkAtoms::curpos) : value;
|
||||
}
|
||||
|
||||
bool
|
||||
XULSliderAccessible::SetCurValue(double aValue)
|
||||
{
|
||||
if (AccessibleWrap::SetCurValue(aValue))
|
||||
return true;
|
||||
|
||||
return SetSliderAttr(nsGkAtoms::curpos, aValue);
|
||||
}
|
||||
|
||||
// Utils
|
||||
|
||||
dom::Element*
|
||||
XULSliderAccessible::GetSliderElement() const
|
||||
{
|
||||
if (!mSliderElement) {
|
||||
// XXX: we depend on anonymous content.
|
||||
mSliderElement = mContent->OwnerDoc()->
|
||||
GetAnonymousElementByAttribute(mContent, nsGkAtoms::anonid,
|
||||
NS_LITERAL_STRING("slider"));
|
||||
}
|
||||
|
||||
return mSliderElement;
|
||||
}
|
||||
|
||||
nsresult
|
||||
XULSliderAccessible::GetSliderAttr(nsAtom* aName, nsAString& aValue) const
|
||||
{
|
||||
aValue.Truncate();
|
||||
|
||||
if (IsDefunct())
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
Element* sliderElm = GetSliderElement();
|
||||
if (sliderElm)
|
||||
sliderElm->GetAttr(kNameSpaceID_None, aName, aValue);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
XULSliderAccessible::SetSliderAttr(nsAtom* aName, const nsAString& aValue)
|
||||
{
|
||||
if (IsDefunct())
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
if (dom::Element* sliderElm = GetSliderElement())
|
||||
sliderElm->SetAttr(kNameSpaceID_None, aName, aValue, true);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
double
|
||||
XULSliderAccessible::GetSliderAttr(nsAtom* aName) const
|
||||
{
|
||||
nsAutoString attrValue;
|
||||
nsresult rv = GetSliderAttr(aName, attrValue);
|
||||
if (NS_FAILED(rv))
|
||||
return UnspecifiedNaN<double>();
|
||||
|
||||
nsresult error = NS_OK;
|
||||
double value = attrValue.ToDouble(&error);
|
||||
return NS_FAILED(error) ? UnspecifiedNaN<double>() : value;
|
||||
}
|
||||
|
||||
bool
|
||||
XULSliderAccessible::SetSliderAttr(nsAtom* aName, double aValue)
|
||||
{
|
||||
nsAutoString value;
|
||||
value.AppendFloat(aValue);
|
||||
|
||||
return NS_SUCCEEDED(SetSliderAttr(aName, value));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// XULThumbAccessible
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
XULThumbAccessible::
|
||||
XULThumbAccessible(nsIContent* aContent, DocAccessible* aDoc) :
|
||||
AccessibleWrap(aContent, aDoc)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// XULThumbAccessible: Accessible
|
||||
|
||||
role
|
||||
XULThumbAccessible::NativeRole() const
|
||||
{
|
||||
return roles::INDICATOR;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,73 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* 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/. */
|
||||
|
||||
#ifndef mozilla_a11y_XULSliderAccessible_h__
|
||||
#define mozilla_a11y_XULSliderAccessible_h__
|
||||
|
||||
#include "AccessibleWrap.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
||||
/**
|
||||
* Used for XUL slider and scale elements.
|
||||
*/
|
||||
class XULSliderAccessible : public AccessibleWrap
|
||||
{
|
||||
public:
|
||||
XULSliderAccessible(nsIContent* aContent, DocAccessible* aDoc);
|
||||
|
||||
// Accessible
|
||||
virtual void Value(nsString& aValue) const override;
|
||||
virtual a11y::role NativeRole() const override;
|
||||
virtual uint64_t NativeInteractiveState() const override;
|
||||
virtual bool NativelyUnavailable() const override;
|
||||
|
||||
// Value
|
||||
virtual double MaxValue() const override;
|
||||
virtual double MinValue() const override;
|
||||
virtual double CurValue() const override;
|
||||
virtual double Step() const override;
|
||||
virtual bool SetCurValue(double aValue) override;
|
||||
|
||||
// ActionAccessible
|
||||
virtual uint8_t ActionCount() const override;
|
||||
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
|
||||
virtual bool DoAction(uint8_t aIndex) const override;
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Return anonymous slider element.
|
||||
*/
|
||||
dom::Element* GetSliderElement() const;
|
||||
|
||||
nsresult GetSliderAttr(nsAtom *aName, nsAString& aValue) const;
|
||||
nsresult SetSliderAttr(nsAtom *aName, const nsAString& aValue);
|
||||
|
||||
double GetSliderAttr(nsAtom *aName) const;
|
||||
bool SetSliderAttr(nsAtom *aName, double aValue);
|
||||
|
||||
private:
|
||||
mutable RefPtr<dom::Element> mSliderElement;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Used for slider's thumb element.
|
||||
*/
|
||||
class XULThumbAccessible : public AccessibleWrap
|
||||
{
|
||||
public:
|
||||
XULThumbAccessible(nsIContent* aContent, DocAccessible* aDoc);
|
||||
|
||||
// Accessible
|
||||
virtual a11y::role NativeRole() const override;
|
||||
};
|
||||
|
||||
} // namespace a11y
|
||||
} // namespace mozilla
|
||||
|
||||
#endif
|
||||
|
||||
@ -431,7 +431,7 @@ XULTreeGridCellAccessible::
|
||||
|
||||
NS_ASSERTION(mTreeView, "mTreeView is null");
|
||||
|
||||
if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX)
|
||||
if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX)
|
||||
mTreeView->GetCellValue(mRow, mColumn, mCachedTextEquiv);
|
||||
else
|
||||
mTreeView->GetCellText(mRow, mColumn, mCachedTextEquiv);
|
||||
@ -538,7 +538,7 @@ XULTreeGridCellAccessible::ActionCount() const
|
||||
if (mColumn->Cycler())
|
||||
return 1;
|
||||
|
||||
if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX && IsEditable())
|
||||
if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX && IsEditable())
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
@ -557,7 +557,7 @@ XULTreeGridCellAccessible::ActionNameAt(uint8_t aIndex, nsAString& aName)
|
||||
return;
|
||||
}
|
||||
|
||||
if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX &&
|
||||
if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX &&
|
||||
IsEditable()) {
|
||||
nsAutoString value;
|
||||
mTreeView->GetCellValue(mRow, mColumn, value);
|
||||
@ -579,7 +579,7 @@ XULTreeGridCellAccessible::DoAction(uint8_t aIndex) const
|
||||
return true;
|
||||
}
|
||||
|
||||
if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX &&
|
||||
if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX &&
|
||||
IsEditable()) {
|
||||
DoCommand();
|
||||
return true;
|
||||
@ -691,7 +691,7 @@ XULTreeGridCellAccessible::NativeState() const
|
||||
}
|
||||
|
||||
// checked state
|
||||
if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX) {
|
||||
if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX) {
|
||||
states |= states::CHECKABLE;
|
||||
nsAutoString checked;
|
||||
mTreeView->GetCellValue(mRow, mColumn, checked);
|
||||
@ -729,7 +729,7 @@ XULTreeGridCellAccessible::CellInvalidated()
|
||||
|
||||
nsAutoString textEquiv;
|
||||
|
||||
if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX) {
|
||||
if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX) {
|
||||
mTreeView->GetCellValue(mRow, mColumn, textEquiv);
|
||||
if (mCachedTextEquiv != textEquiv) {
|
||||
bool isEnabled = textEquiv.EqualsLiteral("true");
|
||||
|
||||
@ -13,7 +13,6 @@ UNIFIED_SOURCES += [
|
||||
'XULListboxAccessible.cpp',
|
||||
'XULMenuAccessible.cpp',
|
||||
'XULSelectControlAccessible.cpp',
|
||||
'XULSliderAccessible.cpp',
|
||||
'XULTabAccessible.cpp',
|
||||
'XULTreeAccessible.cpp',
|
||||
'XULTreeGridAccessible.cpp',
|
||||
|
||||
@ -55,7 +55,7 @@ var AboutTabCrashed = {
|
||||
},
|
||||
|
||||
init() {
|
||||
this.MESSAGES.forEach((msg) => addMessageListener(msg, this.receiveMessage.bind(this)));
|
||||
this.MESSAGES.forEach((msg) => RPMAddMessageListener(msg, this.receiveMessage.bind(this)));
|
||||
addEventListener("DOMContentLoaded", this);
|
||||
|
||||
document.title = this.pageData.title;
|
||||
@ -108,7 +108,7 @@ var AboutTabCrashed = {
|
||||
let event = new CustomEvent("AboutTabCrashedLoad", {bubbles: true});
|
||||
document.dispatchEvent(event);
|
||||
|
||||
sendAsyncMessage("Load");
|
||||
RPMSendAsyncMessage("Load");
|
||||
},
|
||||
|
||||
onClick(event) {
|
||||
@ -295,7 +295,7 @@ var AboutTabCrashed = {
|
||||
autoSubmit = document.getElementById("autoSubmit").checked;
|
||||
}
|
||||
|
||||
sendAsyncMessage(messageName, {
|
||||
RPMSendAsyncMessage(messageName, {
|
||||
sendReport,
|
||||
comments,
|
||||
email,
|
||||
|
||||
@ -21,7 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
ContentLinkHandler: "resource:///modules/ContentLinkHandler.jsm",
|
||||
ContentMetaHandler: "resource:///modules/ContentMetaHandler.jsm",
|
||||
ContentWebRTC: "resource:///modules/ContentWebRTC.jsm",
|
||||
LoginManagerContent: "resource://gre/modules/LoginManagerContent.jsm",
|
||||
LoginFormFactory: "resource://gre/modules/LoginManagerContent.jsm",
|
||||
InsecurePasswordUtils: "resource://gre/modules/InsecurePasswordUtils.jsm",
|
||||
PluginContent: "resource:///modules/PluginContent.jsm",
|
||||
@ -37,6 +36,13 @@ XPCOMUtils.defineLazyProxy(this, "contextMenu", () => {
|
||||
return new ContextMenu(global);
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyGetter(this, "LoginManagerContent", () => {
|
||||
let tmp = {};
|
||||
ChromeUtils.import("resource://gre/modules/LoginManagerContent.jsm", tmp);
|
||||
tmp.LoginManagerContent.setupEventListeners(global);
|
||||
return tmp.LoginManagerContent;
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyProxy(this, "formSubmitObserver", () => {
|
||||
return new FormSubmitObserver(content, this);
|
||||
}, {
|
||||
@ -56,6 +62,7 @@ Services.obs.addObserver(formSubmitObserver, "invalidformsubmit", true);
|
||||
|
||||
addMessageListener("PageInfo:getData", PageInfoListener);
|
||||
|
||||
// NOTE: Much of this logic is duplicated in BrowserCLH.js for Android.
|
||||
addMessageListener("RemoteLogins:fillForm", function(message) {
|
||||
// intercept if ContextMenu.jsm had sent a plain object for remote targets
|
||||
message.objects.inputElement = contextMenu.getTarget(message, "inputElement");
|
||||
@ -71,15 +78,9 @@ addEventListener("DOMInputPasswordAdded", function(event) {
|
||||
let formLike = LoginFormFactory.createFromField(event.originalTarget);
|
||||
InsecurePasswordUtils.reportInsecurePasswords(formLike);
|
||||
});
|
||||
addEventListener("pageshow", function(event) {
|
||||
LoginManagerContent.onPageShow(event, content);
|
||||
});
|
||||
addEventListener("DOMAutoComplete", function(event) {
|
||||
LoginManagerContent.onUsernameInput(event);
|
||||
});
|
||||
addEventListener("blur", function(event) {
|
||||
LoginManagerContent.onUsernameInput(event);
|
||||
});
|
||||
|
||||
var AboutBlockedSiteListener = {
|
||||
init(chromeGlobal) {
|
||||
@ -317,8 +318,70 @@ ClickEventHandler.init();
|
||||
ContentLinkHandler.init(this);
|
||||
ContentMetaHandler.init(this);
|
||||
|
||||
// TODO: Load this lazily so the JSM is run only if a relevant event/message fires.
|
||||
void new PluginContent(global);
|
||||
var PluginContentStub = {
|
||||
EVENTS: [
|
||||
"PluginCrashed",
|
||||
"PluginOutdated",
|
||||
"PluginInstantiated",
|
||||
"PluginRemoved",
|
||||
"HiddenPlugin",
|
||||
],
|
||||
|
||||
MESSAGES: [
|
||||
"BrowserPlugins:ActivatePlugins",
|
||||
"BrowserPlugins:NotificationShown",
|
||||
"BrowserPlugins:ContextMenuCommand",
|
||||
"BrowserPlugins:NPAPIPluginProcessCrashed",
|
||||
"BrowserPlugins:CrashReportSubmitted",
|
||||
"BrowserPlugins:Test:ClearCrashData",
|
||||
],
|
||||
|
||||
_pluginContent: null,
|
||||
get pluginContent() {
|
||||
if (!this._pluginContent) {
|
||||
this._pluginContent = new PluginContent(global);
|
||||
}
|
||||
return this._pluginContent;
|
||||
},
|
||||
|
||||
init() {
|
||||
addEventListener("unload", this);
|
||||
|
||||
addEventListener("PluginBindingAttached", this, true, true);
|
||||
|
||||
for (let event of this.EVENTS) {
|
||||
addEventListener(event, this, true);
|
||||
}
|
||||
for (let msg of this.MESSAGES) {
|
||||
addMessageListener(msg, this);
|
||||
}
|
||||
Services.obs.addObserver(this, "decoder-doctor-notification");
|
||||
},
|
||||
|
||||
uninit() {
|
||||
Services.obs.removeObserver(this, "decoder-doctor-notification");
|
||||
},
|
||||
|
||||
observe(subject, topic, data) {
|
||||
return this.pluginContent.observe(subject, topic, data);
|
||||
},
|
||||
|
||||
handleEvent(event) {
|
||||
if (event.type === "unload") {
|
||||
return this.uninit();
|
||||
}
|
||||
return this.pluginContent.handleEvent(event);
|
||||
},
|
||||
|
||||
receiveMessage(msg) {
|
||||
return this.pluginContent.receiveMessage(msg);
|
||||
},
|
||||
};
|
||||
|
||||
PluginContentStub.init();
|
||||
|
||||
// This is a temporary hack to prevent regressions (bug 1471327).
|
||||
void content;
|
||||
|
||||
addEventListener("DOMWindowFocus", function(event) {
|
||||
sendAsyncMessage("DOMWindowFocus", {});
|
||||
|
||||
@ -116,20 +116,20 @@ add_task(async function open_10_tabs() {
|
||||
max: 25,
|
||||
},
|
||||
"security.insecure_connection_icon.pbmode.enabled": {
|
||||
min: 17,
|
||||
max: 25,
|
||||
min: 10,
|
||||
max: 18,
|
||||
},
|
||||
"security.insecure_connection_icon.enabled": {
|
||||
min: 17,
|
||||
max: 25,
|
||||
min: 10,
|
||||
max: 18,
|
||||
},
|
||||
"security.insecure_connection_text.enabled": {
|
||||
min: 17,
|
||||
max: 25,
|
||||
min: 10,
|
||||
max: 18,
|
||||
},
|
||||
"security.insecure_connection_text.pbmode.enabled": {
|
||||
min: 17,
|
||||
max: 25,
|
||||
min: 10,
|
||||
max: 18,
|
||||
},
|
||||
"dom.ipc.processCount": {
|
||||
min: 10,
|
||||
@ -171,20 +171,20 @@ add_task(async function navigate_around() {
|
||||
max: 110,
|
||||
},
|
||||
"security.insecure_connection_icon.pbmode.enabled": {
|
||||
min: 50,
|
||||
max: 55,
|
||||
min: 20,
|
||||
max: 30,
|
||||
},
|
||||
"security.insecure_connection_icon.enabled": {
|
||||
min: 50,
|
||||
max: 55,
|
||||
min: 20,
|
||||
max: 30,
|
||||
},
|
||||
"security.insecure_connection_text.enabled": {
|
||||
min: 50,
|
||||
max: 55,
|
||||
min: 20,
|
||||
max: 30,
|
||||
},
|
||||
"security.insecure_connection_text.pbmode.enabled": {
|
||||
min: 50,
|
||||
max: 55,
|
||||
min: 20,
|
||||
max: 30,
|
||||
},
|
||||
"browser.chrome.favicons": {
|
||||
min: 50,
|
||||
|
||||
@ -26,6 +26,8 @@ const blacklist = {
|
||||
"resource:///modules/ContentWebRTC.jsm",
|
||||
"resource://gre/modules/InlineSpellChecker.jsm",
|
||||
"resource://gre/modules/InlineSpellCheckerContent.jsm",
|
||||
"resource://gre/modules/LoginHelper.jsm",
|
||||
"resource://gre/modules/LoginManagerContent.jsm",
|
||||
"resource://gre/modules/Promise.jsm",
|
||||
"resource://gre/modules/Task.jsm",
|
||||
"resource://gre/modules/osfile.jsm",
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
@ -596,7 +596,8 @@ this.tabs = class extends ExtensionAPI {
|
||||
window.focusAndSelectUrlBar();
|
||||
}
|
||||
|
||||
if (createProperties.url && createProperties.url !== window.BROWSER_NEW_TAB_URL) {
|
||||
if (createProperties.url &&
|
||||
createProperties.url !== window.BROWSER_NEW_TAB_URL) {
|
||||
// We can't wait for a location change event for about:newtab,
|
||||
// since it may be pre-rendered, in which case its initial
|
||||
// location change event has already fired.
|
||||
|
||||
@ -37,10 +37,20 @@ var gAppManagerDialog = {
|
||||
continue;
|
||||
|
||||
app.QueryInterface(Ci.nsIHandlerApp);
|
||||
var item = list.appendItem(app.name);
|
||||
item.setAttribute("image", gMainPane._getIconURLForHandlerApp(app));
|
||||
item.className = "listitem-iconic";
|
||||
|
||||
// Ensure the XBL binding is created eagerly.
|
||||
// eslint-disable-next-line no-undef
|
||||
list.appendChild(MozXULElement.parseXULToFragment("<richlistitem/>"));
|
||||
var item = list.lastChild;
|
||||
item.app = app;
|
||||
|
||||
var image = document.createElement("image");
|
||||
image.setAttribute("src", gMainPane._getIconURLForHandlerApp(app));
|
||||
item.appendChild(image);
|
||||
|
||||
var label = document.createElement("label");
|
||||
label.setAttribute("value", app.name);
|
||||
item.appendChild(label);
|
||||
}
|
||||
|
||||
// Triggers onSelect which populates label
|
||||
@ -74,14 +84,16 @@ var gAppManagerDialog = {
|
||||
var list = document.getElementById("appList");
|
||||
this._removed.push(list.selectedItem.app);
|
||||
var index = list.selectedIndex;
|
||||
list.selectedItem.remove();
|
||||
if (list.getRowCount() == 0) {
|
||||
var element = list.selectedItem;
|
||||
list.removeItemFromSelection(element);
|
||||
element.remove();
|
||||
if (list.itemCount == 0) {
|
||||
// The list is now empty, make the bottom part disappear
|
||||
document.getElementById("appDetails").hidden = true;
|
||||
} else {
|
||||
// Select the item at the same index, if we removed the last
|
||||
// item of the list, select the previous item
|
||||
if (index == list.getRowCount())
|
||||
if (index == list.itemCount)
|
||||
--index;
|
||||
list.selectedIndex = index;
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/"?>
|
||||
<?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
|
||||
|
||||
<dialog id="appManager"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
@ -38,7 +39,7 @@
|
||||
<description id="appDescription"/>
|
||||
<separator class="thin"/>
|
||||
<hbox flex="1">
|
||||
<listbox id="appList" onselect="gAppManagerDialog.onSelect();" flex="1"/>
|
||||
<richlistbox id="appList" onselect="gAppManagerDialog.onSelect();" flex="1"/>
|
||||
<vbox>
|
||||
<button id="remove"
|
||||
data-l10n-id="app-manager-remove"
|
||||
|
||||
@ -71,7 +71,7 @@ add_task(async function() {
|
||||
|
||||
dialogDoc = dialog.document;
|
||||
dialogList = dialogDoc.getElementById("appList");
|
||||
let itemToRemove = dialogList.querySelector('listitem[label="' + selectedApp.name + '"]');
|
||||
let itemToRemove = dialogList.querySelector('richlistitem > label[value="' + selectedApp.name + '"]').parentNode;
|
||||
dialogList.selectItem(itemToRemove);
|
||||
let itemsBefore = dialogList.children.length;
|
||||
dialogDoc.getElementById("remove").click();
|
||||
|
||||
@ -33,13 +33,13 @@ document.addEventListener("DOMContentLoaded", function() {
|
||||
document.documentElement.classList.add("normal");
|
||||
document.getElementById("favicon").setAttribute("href", FAVICON_QUESTION);
|
||||
document.getElementById("startPrivateBrowsing").addEventListener("click", function() {
|
||||
sendAsyncMessage("OpenPrivateWindow");
|
||||
RPMSendAsyncMessage("OpenPrivateWindow");
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
document.getElementById("startTour").addEventListener("click", function() {
|
||||
sendAsyncMessage("DontShowIntroPanelAgain");
|
||||
RPMSendAsyncMessage("DontShowIntroPanelAgain");
|
||||
});
|
||||
document.getElementById("startTour").setAttribute("href",
|
||||
RPMGetFormatURLPref("privacy.trackingprotection.introURL"));
|
||||
|
||||
@ -14,13 +14,13 @@ const OUTGOING_MESSAGE_NAME = "ASRouter:child-to-parent";
|
||||
|
||||
export const ASRouterUtils = {
|
||||
addListener(listener) {
|
||||
global.addMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
global.RPMAddMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
},
|
||||
removeListener(listener) {
|
||||
global.removeMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
global.RPMRemoveMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
},
|
||||
sendMessage(action) {
|
||||
global.sendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
global.RPMSendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
},
|
||||
blockById(id) {
|
||||
ASRouterUtils.sendMessage({type: "BLOCK_MESSAGE_BY_ID", data: {id}});
|
||||
@ -47,7 +47,7 @@ export const ASRouterUtils = {
|
||||
},
|
||||
sendTelemetry(ping) {
|
||||
const payload = ac.ASRouterUserEvent(ping);
|
||||
global.sendAsyncMessage(AS_GENERAL_OUTGOING_MESSAGE_NAME, payload);
|
||||
global.RPMSendAsyncMessage(AS_GENERAL_OUTGOING_MESSAGE_NAME, payload);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ function mergeStateReducer(mainReducer) {
|
||||
const messageMiddleware = store => next => action => {
|
||||
const skipLocal = action.meta && action.meta.skipLocal;
|
||||
if (au.isSendToMain(action)) {
|
||||
sendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
RPMSendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
}
|
||||
if (!skipLocal) {
|
||||
next(action);
|
||||
@ -118,14 +118,14 @@ export function initStore(reducers, initialState) {
|
||||
const store = createStore(
|
||||
mergeStateReducer(combineReducers(reducers)),
|
||||
initialState,
|
||||
global.addMessageListener && applyMiddleware(rehydrationMiddleware, queueEarlyMessageMiddleware, messageMiddleware)
|
||||
global.RPMAddMessageListener && applyMiddleware(rehydrationMiddleware, queueEarlyMessageMiddleware, messageMiddleware)
|
||||
);
|
||||
|
||||
store._didRehydrate = false;
|
||||
store._didRequestInitialState = false;
|
||||
|
||||
if (global.addMessageListener) {
|
||||
global.addMessageListener(INCOMING_MESSAGE_NAME, msg => {
|
||||
if (global.RPMAddMessageListener) {
|
||||
global.RPMAddMessageListener(INCOMING_MESSAGE_NAME, msg => {
|
||||
try {
|
||||
store.dispatch(msg.data);
|
||||
} catch (ex) {
|
||||
|
||||
@ -74,10 +74,10 @@ export class SnippetsMap extends Map {
|
||||
getTotalBookmarksCount() {
|
||||
return new Promise(resolve => {
|
||||
this._dispatch(ac.OnlyToMain({type: at.TOTAL_BOOKMARKS_REQUEST}));
|
||||
global.addMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
|
||||
global.RPMAddMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
|
||||
if (action.type === at.TOTAL_BOOKMARKS_RESPONSE) {
|
||||
resolve(action.data);
|
||||
global.removeMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
global.RPMRemoveMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -86,10 +86,10 @@ export class SnippetsMap extends Map {
|
||||
getAddonsInfo() {
|
||||
return new Promise(resolve => {
|
||||
this._dispatch(ac.OnlyToMain({type: at.ADDONS_INFO_REQUEST}));
|
||||
global.addMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
|
||||
global.RPMAddMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
|
||||
if (action.type === at.ADDONS_INFO_RESPONSE) {
|
||||
resolve(action.data);
|
||||
global.removeMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
global.RPMRemoveMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -318,8 +318,8 @@ export class SnippetsProvider {
|
||||
}, options);
|
||||
|
||||
// Add listener so we know when snippets are blocked on other pages
|
||||
if (global.addMessageListener) {
|
||||
global.addMessageListener("ActivityStream:MainToContent", this._onAction);
|
||||
if (global.RPMAddMessageListener) {
|
||||
global.RPMAddMessageListener("ActivityStream:MainToContent", this._onAction);
|
||||
}
|
||||
|
||||
// TODO: Requires enabling indexedDB on newtab
|
||||
@ -360,8 +360,8 @@ export class SnippetsProvider {
|
||||
uninit() {
|
||||
window.dispatchEvent(new Event(SNIPPETS_DISABLED_EVENT));
|
||||
this._forceOnboardingVisibility(false);
|
||||
if (global.removeMessageListener) {
|
||||
global.removeMessageListener("ActivityStream:MainToContent", this._onAction);
|
||||
if (global.RPMRemoveMessageListener) {
|
||||
global.RPMRemoveMessageListener("ActivityStream:MainToContent", this._onAction);
|
||||
}
|
||||
this.initialized = false;
|
||||
}
|
||||
|
||||
@ -391,28 +391,27 @@ module.exports = ReactIntl;
|
||||
/* 3 */
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
var g;
|
||||
|
||||
// This works in non-strict mode
|
||||
g = (function() {
|
||||
return this;
|
||||
})();
|
||||
|
||||
try {
|
||||
// This works if eval is allowed (see CSP)
|
||||
g = g || Function("return this")() || (1,eval)("this");
|
||||
} catch(e) {
|
||||
// This works if the window reference is available
|
||||
if(typeof window === "object")
|
||||
g = window;
|
||||
}
|
||||
|
||||
// g can still be undefined, but nothing to do about it...
|
||||
// We return undefined, instead of nothing here, so it's
|
||||
// easier to handle this case. if(!global) { ...}
|
||||
|
||||
module.exports = g;
|
||||
var g;
|
||||
|
||||
// This works in non-strict mode
|
||||
g = (function() {
|
||||
return this;
|
||||
})();
|
||||
|
||||
try {
|
||||
// This works if eval is allowed (see CSP)
|
||||
g = g || Function("return this")() || (1,eval)("this");
|
||||
} catch(e) {
|
||||
// This works if the window reference is available
|
||||
if(typeof window === "object")
|
||||
g = window;
|
||||
}
|
||||
|
||||
// g can still be undefined, but nothing to do about it...
|
||||
// We return undefined, instead of nothing here, so it's
|
||||
// easier to handle this case. if(!global) { ...}
|
||||
|
||||
module.exports = g;
|
||||
|
||||
/***/ }),
|
||||
/* 4 */
|
||||
@ -934,13 +933,13 @@ const OUTGOING_MESSAGE_NAME = "ASRouter:child-to-parent";
|
||||
|
||||
const ASRouterUtils = {
|
||||
addListener(listener) {
|
||||
global.addMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
global.RPMAddMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
},
|
||||
removeListener(listener) {
|
||||
global.removeMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
global.RPMRemoveMessageListener(INCOMING_MESSAGE_NAME, listener);
|
||||
},
|
||||
sendMessage(action) {
|
||||
global.sendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
global.RPMSendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
},
|
||||
blockById(id) {
|
||||
ASRouterUtils.sendMessage({ type: "BLOCK_MESSAGE_BY_ID", data: { id } });
|
||||
@ -967,7 +966,7 @@ const ASRouterUtils = {
|
||||
},
|
||||
sendTelemetry(ping) {
|
||||
const payload = __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionCreators */].ASRouterUserEvent(ping);
|
||||
global.sendAsyncMessage(__WEBPACK_IMPORTED_MODULE_2_content_src_lib_init_store__["a" /* OUTGOING_MESSAGE_NAME */], payload);
|
||||
global.RPMSendAsyncMessage(__WEBPACK_IMPORTED_MODULE_2_content_src_lib_init_store__["a" /* OUTGOING_MESSAGE_NAME */], payload);
|
||||
}
|
||||
};
|
||||
/* harmony export (immutable) */ __webpack_exports__["b"] = ASRouterUtils;
|
||||
@ -3357,7 +3356,7 @@ function mergeStateReducer(mainReducer) {
|
||||
const messageMiddleware = store => next => action => {
|
||||
const skipLocal = action.meta && action.meta.skipLocal;
|
||||
if (__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["d" /* actionUtils */].isSendToMain(action)) {
|
||||
sendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
RPMSendAsyncMessage(OUTGOING_MESSAGE_NAME, action);
|
||||
}
|
||||
if (!skipLocal) {
|
||||
next(action);
|
||||
@ -3436,13 +3435,13 @@ const queueEarlyMessageMiddleware = store => next => action => {
|
||||
* @return {object} A redux store
|
||||
*/
|
||||
function initStore(reducers, initialState) {
|
||||
const store = Object(__WEBPACK_IMPORTED_MODULE_1_redux__["createStore"])(mergeStateReducer(Object(__WEBPACK_IMPORTED_MODULE_1_redux__["combineReducers"])(reducers)), initialState, global.addMessageListener && Object(__WEBPACK_IMPORTED_MODULE_1_redux__["applyMiddleware"])(rehydrationMiddleware, queueEarlyMessageMiddleware, messageMiddleware));
|
||||
const store = Object(__WEBPACK_IMPORTED_MODULE_1_redux__["createStore"])(mergeStateReducer(Object(__WEBPACK_IMPORTED_MODULE_1_redux__["combineReducers"])(reducers)), initialState, global.RPMAddMessageListener && Object(__WEBPACK_IMPORTED_MODULE_1_redux__["applyMiddleware"])(rehydrationMiddleware, queueEarlyMessageMiddleware, messageMiddleware));
|
||||
|
||||
store._didRehydrate = false;
|
||||
store._didRequestInitialState = false;
|
||||
|
||||
if (global.addMessageListener) {
|
||||
global.addMessageListener(INCOMING_MESSAGE_NAME, msg => {
|
||||
if (global.RPMAddMessageListener) {
|
||||
global.RPMAddMessageListener(INCOMING_MESSAGE_NAME, msg => {
|
||||
try {
|
||||
store.dispatch(msg.data);
|
||||
} catch (ex) {
|
||||
@ -5315,10 +5314,10 @@ class SnippetsMap extends Map {
|
||||
getTotalBookmarksCount() {
|
||||
return new Promise(resolve => {
|
||||
this._dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionCreators */].OnlyToMain({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["c" /* actionTypes */].TOTAL_BOOKMARKS_REQUEST }));
|
||||
global.addMessageListener("ActivityStream:MainToContent", function onMessage({ data: action }) {
|
||||
global.RPMAddMessageListener("ActivityStream:MainToContent", function onMessage({ data: action }) {
|
||||
if (action.type === __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["c" /* actionTypes */].TOTAL_BOOKMARKS_RESPONSE) {
|
||||
resolve(action.data);
|
||||
global.removeMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
global.RPMRemoveMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -5327,10 +5326,10 @@ class SnippetsMap extends Map {
|
||||
getAddonsInfo() {
|
||||
return new Promise(resolve => {
|
||||
this._dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionCreators */].OnlyToMain({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["c" /* actionTypes */].ADDONS_INFO_REQUEST }));
|
||||
global.addMessageListener("ActivityStream:MainToContent", function onMessage({ data: action }) {
|
||||
global.RPMAddMessageListener("ActivityStream:MainToContent", function onMessage({ data: action }) {
|
||||
if (action.type === __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["c" /* actionTypes */].ADDONS_INFO_RESPONSE) {
|
||||
resolve(action.data);
|
||||
global.removeMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
global.RPMRemoveMessageListener("ActivityStream:MainToContent", onMessage);
|
||||
}
|
||||
});
|
||||
});
|
||||
@ -5567,8 +5566,8 @@ class SnippetsProvider {
|
||||
}, options);
|
||||
|
||||
// Add listener so we know when snippets are blocked on other pages
|
||||
if (global.addMessageListener) {
|
||||
global.addMessageListener("ActivityStream:MainToContent", _this4._onAction);
|
||||
if (global.RPMAddMessageListener) {
|
||||
global.RPMAddMessageListener("ActivityStream:MainToContent", _this4._onAction);
|
||||
}
|
||||
|
||||
// TODO: Requires enabling indexedDB on newtab
|
||||
@ -5610,8 +5609,8 @@ class SnippetsProvider {
|
||||
uninit() {
|
||||
window.dispatchEvent(new Event(SNIPPETS_DISABLED_EVENT));
|
||||
this._forceOnboardingVisibility(false);
|
||||
if (global.removeMessageListener) {
|
||||
global.removeMessageListener("ActivityStream:MainToContent", this._onAction);
|
||||
if (global.RPMRemoveMessageListener) {
|
||||
global.RPMRemoveMessageListener("ActivityStream:MainToContent", this._onAction);
|
||||
}
|
||||
this.initialized = false;
|
||||
}
|
||||
|
||||
@ -103,7 +103,6 @@ chrome/toolkit/skin/classic/global/preferences.css
|
||||
chrome/toolkit/skin/classic/global/progressmeter.css
|
||||
chrome/toolkit/skin/classic/global/radio.css
|
||||
chrome/toolkit/skin/classic/global/richlistbox.css
|
||||
chrome/toolkit/skin/classic/global/scale.css
|
||||
chrome/toolkit/skin/classic/global/scrollbars.css
|
||||
chrome/toolkit/skin/classic/global/scrollbox.css
|
||||
chrome/toolkit/skin/classic/global/splitter.css
|
||||
|
||||
@ -42,51 +42,8 @@ PluginContent.prototype = {
|
||||
// Cache of plugin crash information sent from the parent
|
||||
this.pluginCrashData = new Map();
|
||||
|
||||
// Note that the XBL binding is untrusted
|
||||
global.addEventListener("PluginBindingAttached", this, true, true);
|
||||
global.addEventListener("PluginCrashed", this, true);
|
||||
global.addEventListener("PluginOutdated", this, true);
|
||||
global.addEventListener("PluginInstantiated", this, true);
|
||||
global.addEventListener("PluginRemoved", this, true);
|
||||
global.addEventListener("pagehide", this, true);
|
||||
global.addEventListener("pageshow", this, true);
|
||||
global.addEventListener("unload", this);
|
||||
global.addEventListener("HiddenPlugin", this, true);
|
||||
|
||||
global.addMessageListener("BrowserPlugins:ActivatePlugins", this);
|
||||
global.addMessageListener("BrowserPlugins:NotificationShown", this);
|
||||
global.addMessageListener("BrowserPlugins:ContextMenuCommand", this);
|
||||
global.addMessageListener("BrowserPlugins:NPAPIPluginProcessCrashed", this);
|
||||
global.addMessageListener("BrowserPlugins:CrashReportSubmitted", this);
|
||||
global.addMessageListener("BrowserPlugins:Test:ClearCrashData", this);
|
||||
|
||||
Services.obs.addObserver(this, "decoder-doctor-notification");
|
||||
},
|
||||
|
||||
uninit() {
|
||||
let global = this.global;
|
||||
|
||||
global.removeEventListener("PluginBindingAttached", this, true);
|
||||
global.removeEventListener("PluginCrashed", this, true);
|
||||
global.removeEventListener("PluginOutdated", this, true);
|
||||
global.removeEventListener("PluginInstantiated", this, true);
|
||||
global.removeEventListener("PluginRemoved", this, true);
|
||||
global.removeEventListener("pagehide", this, true);
|
||||
global.removeEventListener("pageshow", this, true);
|
||||
global.removeEventListener("unload", this);
|
||||
global.removeEventListener("HiddenPlugin", this, true);
|
||||
|
||||
global.removeMessageListener("BrowserPlugins:ActivatePlugins", this);
|
||||
global.removeMessageListener("BrowserPlugins:NotificationShown", this);
|
||||
global.removeMessageListener("BrowserPlugins:ContextMenuCommand", this);
|
||||
global.removeMessageListener("BrowserPlugins:NPAPIPluginProcessCrashed", this);
|
||||
global.removeMessageListener("BrowserPlugins:CrashReportSubmitted", this);
|
||||
global.removeMessageListener("BrowserPlugins:Test:ClearCrashData", this);
|
||||
|
||||
Services.obs.removeObserver(this, "decoder-doctor-notification");
|
||||
|
||||
delete this.global;
|
||||
delete this.content;
|
||||
},
|
||||
|
||||
receiveMessage(msg) {
|
||||
@ -444,11 +401,6 @@ PluginContent.prototype = {
|
||||
handleEvent(event) {
|
||||
let eventType = event.type;
|
||||
|
||||
if (eventType == "unload") {
|
||||
this.uninit();
|
||||
return;
|
||||
}
|
||||
|
||||
if (eventType == "pagehide") {
|
||||
this.onPageHide(event);
|
||||
return;
|
||||
|
||||
@ -64,3 +64,23 @@ menuitem[appHandlerIcon="plugin"] {
|
||||
.actionsMenu > menupopup > menuitem {
|
||||
padding-inline-start: 3px;
|
||||
}
|
||||
|
||||
#appList {
|
||||
min-height: 212px;
|
||||
}
|
||||
|
||||
#appList > richlistitem {
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
#appList > richlistitem > image {
|
||||
margin: 5px;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
#appList > richlistitem > label {
|
||||
margin: 0px;
|
||||
padding: 5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@ -71,3 +71,23 @@ menuitem[appHandlerIcon] > .menu-iconic-left > .menu-iconic-icon {
|
||||
margin-inline-start: 0;
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
#appList {
|
||||
min-height: 212px;
|
||||
}
|
||||
|
||||
#appList > richlistitem {
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
#appList > richlistitem > image {
|
||||
margin: 5px;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
#appList > richlistitem > label {
|
||||
margin: 0px;
|
||||
padding: 5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@ -62,3 +62,23 @@ menuitem[appHandlerIcon="plugin"] {
|
||||
.actionsMenu > menupopup > menuitem {
|
||||
padding-inline-start: 4px;
|
||||
}
|
||||
|
||||
#appList {
|
||||
min-height: 212px;
|
||||
}
|
||||
|
||||
#appList > richlistitem {
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
#appList > richlistitem > image {
|
||||
margin: 5px;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
#appList > richlistitem > label {
|
||||
margin: 0px;
|
||||
padding: 5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@ -512,7 +512,8 @@ if __name__ == "__main__":
|
||||
extra_cflags = ["-static-libgcc"]
|
||||
extra_cxxflags = ["-static-libgcc", "-static-libstdc++"]
|
||||
extra_cflags2 = ["-fPIC"]
|
||||
extra_cxxflags2 = ["-fPIC", "-static-libstdc++"]
|
||||
# Silence clang's warnings about arguments not being used in compilation.
|
||||
extra_cxxflags2 = ["-fPIC", '-Qunused-arguments', "-static-libstdc++"]
|
||||
extra_asmflags = []
|
||||
extra_ldflags = []
|
||||
|
||||
|
||||
@ -38,7 +38,10 @@ build_binutils() {
|
||||
then
|
||||
# gold is disabled because we don't use it on automation, and also we ran into
|
||||
# some issues with it using this script in build-clang.py.
|
||||
binutils_configure_flags="--disable-gold --enable-plugins --disable-nls --with-sysroot=/"
|
||||
#
|
||||
# --enable-targets builds extra target support in ld.
|
||||
# Enabling aarch64 support brings in arm support, so we don't need to specify that too.
|
||||
binutils_configure_flags="--enable-targets=aarch64-unknown-linux-gnu --disable-gold --enable-plugins --disable-nls --with-sysroot=/"
|
||||
fi
|
||||
|
||||
mkdir $root_dir/binutils-objdir
|
||||
|
||||
@ -336,7 +336,8 @@ BasePrincipal::GetIsInIsolatedMozBrowserElement(bool* aIsInIsolatedMozBrowserEle
|
||||
nsresult
|
||||
BasePrincipal::GetAddonPolicy(nsISupports** aResult)
|
||||
{
|
||||
*aResult = AddonPolicy();
|
||||
RefPtr<extensions::WebExtensionPolicy> policy(AddonPolicy());
|
||||
policy.forget(aResult);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
@ -100,6 +100,19 @@ function setOutOfScopeLocations() {
|
||||
};
|
||||
}
|
||||
|
||||
function compressPausePoints(pausePoints) {
|
||||
const compressed = {}
|
||||
for (const line in pausePoints) {
|
||||
compressed[line] = {}
|
||||
for (const col in pausePoints[line]) {
|
||||
const point = pausePoints[line][col]
|
||||
compressed[line][col] = (point.break && 1) | (point.step && 2)
|
||||
}
|
||||
}
|
||||
|
||||
return compressed;
|
||||
}
|
||||
|
||||
function setPausePoints(sourceId) {
|
||||
return async ({
|
||||
dispatch,
|
||||
@ -113,9 +126,10 @@ function setPausePoints(sourceId) {
|
||||
}
|
||||
|
||||
const pausePoints = await (0, _parser.getPausePoints)(sourceId);
|
||||
const compressed = compressPausePoints(pausePoints);
|
||||
|
||||
if ((0, _devtoolsSourceMap.isGeneratedId)(sourceId)) {
|
||||
await client.setPausePoints(sourceId, pausePoints);
|
||||
await client.setPausePoints(sourceId, compressed);
|
||||
}
|
||||
|
||||
dispatch({
|
||||
|
||||
@ -65,6 +65,7 @@ function MarkupView(inspector, frame, controllerWindow) {
|
||||
EventEmitter.decorate(this);
|
||||
|
||||
this.inspector = inspector;
|
||||
this.highlighters = inspector.highlighters;
|
||||
this.walker = this.inspector.walker;
|
||||
this._frame = frame;
|
||||
this.win = this._frame.contentWindow;
|
||||
@ -1914,6 +1915,7 @@ MarkupView.prototype = {
|
||||
this.imagePreviewTooltip = null;
|
||||
|
||||
this.doc = null;
|
||||
this.highlighters = null;
|
||||
this.win = null;
|
||||
|
||||
this._lastDropTarget = null;
|
||||
|
||||
@ -40,7 +40,8 @@ add_task(async function() {
|
||||
info("Check the display node is shown and the value of #grid.");
|
||||
await selectNode("#grid", inspector);
|
||||
const gridContainer = await getContainerForSelector("#grid", inspector);
|
||||
const gridDisplayNode = gridContainer.elt.querySelector(".markupview-display-badge");
|
||||
const gridDisplayNode = gridContainer.elt.querySelector(
|
||||
".markup-badge[data-display]");
|
||||
is(gridDisplayNode.textContent, "grid", "Got the correct display type for #grid.");
|
||||
is(gridDisplayNode.style.display, "inline-block", "#grid display node is shown.");
|
||||
|
||||
@ -48,7 +49,7 @@ add_task(async function() {
|
||||
await selectNode("#subgrid", inspector);
|
||||
const subgridContainer = await getContainerForSelector("#subgrid", inspector);
|
||||
const subgridDisplayNode = subgridContainer.elt.querySelector(
|
||||
".markupview-display-badge");
|
||||
".markup-badge[data-display]");
|
||||
is(subgridDisplayNode.textContent, "subgrid",
|
||||
"Got the correct display type for #subgrid");
|
||||
is(subgridDisplayNode.style.display, "inline-block", "#subgrid display node is shown");
|
||||
@ -56,21 +57,24 @@ add_task(async function() {
|
||||
info("Check the display node is shown and the value of #flex.");
|
||||
await selectNode("#flex", inspector);
|
||||
const flexContainer = await getContainerForSelector("#flex", inspector);
|
||||
const flexDisplayNode = flexContainer.elt.querySelector(".markupview-display-badge");
|
||||
const flexDisplayNode = flexContainer.elt.querySelector(
|
||||
".markup-badge[data-display]");
|
||||
is(flexDisplayNode.textContent, "flex", "Got the correct display type for #flex");
|
||||
is(flexDisplayNode.style.display, "inline-block", "#flex display node is shown.");
|
||||
|
||||
info("Check the display node is shown and the value of #block.");
|
||||
await selectNode("#block", inspector);
|
||||
const blockContainer = await getContainerForSelector("#block", inspector);
|
||||
const blockDisplayNode = blockContainer.elt.querySelector(".markupview-display-badge");
|
||||
const blockDisplayNode = blockContainer.elt.querySelector(
|
||||
".markup-badge[data-display]");
|
||||
is(blockDisplayNode.textContent, "block", "Got the correct display type for #block");
|
||||
is(blockDisplayNode.style.display, "none", "#block display node is hidden.");
|
||||
|
||||
info("Check the display node is shown and the value of span.");
|
||||
await selectNode("span", inspector);
|
||||
const spanContainer = await getContainerForSelector("span", inspector);
|
||||
const spanDisplayNode = spanContainer.elt.querySelector(".markupview-display-badge");
|
||||
const spanDisplayNode = spanContainer.elt.querySelector(
|
||||
".markup-badge[data-display]");
|
||||
is(spanDisplayNode.textContent, "inline", "Got the correct display type for #span");
|
||||
is(spanDisplayNode.style.display, "none", "span display node is hidden.");
|
||||
});
|
||||
|
||||
@ -97,7 +97,7 @@ async function runTestData(inspector, testActor,
|
||||
{selector, before, changeStyle, after}) {
|
||||
await selectNode(selector, inspector);
|
||||
const container = await getContainerForSelector(selector, inspector);
|
||||
const displayNode = container.elt.querySelector(".markupview-display-badge");
|
||||
const displayNode = container.elt.querySelector(".markup-badge[data-display]");
|
||||
|
||||
is(displayNode.textContent, before.textContent,
|
||||
`Got the correct before display type for ${selector}: ${displayNode.textContent}`);
|
||||
|
||||
@ -34,7 +34,7 @@ add_task(async function() {
|
||||
const { inspector } = await openInspectorForURL(TEST_URL);
|
||||
|
||||
const markupContainer = await getContainerForSelector("#events", inspector);
|
||||
const evHolder = markupContainer.elt.querySelector(".markupview-event-badge");
|
||||
const evHolder = markupContainer.elt.querySelector(".markup-badge[data-event]");
|
||||
const tooltip = inspector.markup.eventDetailsTooltip;
|
||||
|
||||
info("Clicking to open event tooltip.");
|
||||
|
||||
@ -32,7 +32,7 @@ add_task(async function() {
|
||||
|
||||
async function runTests(inspector) {
|
||||
const markupContainer = await getContainerForSelector("#events", inspector);
|
||||
const evHolder = markupContainer.elt.querySelector(".markupview-event-badge");
|
||||
const evHolder = markupContainer.elt.querySelector(".markup-badge[data-event]");
|
||||
const tooltip = inspector.markup.eventDetailsTooltip;
|
||||
|
||||
info("Clicking to open event tooltip.");
|
||||
|
||||
@ -27,10 +27,10 @@ add_task(async function() {
|
||||
await inspector.markup.expandAll();
|
||||
|
||||
const container1 = await getContainerForSelector("#d1", inspector);
|
||||
const evHolder1 = container1.elt.querySelector(".markupview-event-badge");
|
||||
const evHolder1 = container1.elt.querySelector(".markup-badge[data-event]");
|
||||
|
||||
const container2 = await getContainerForSelector("#d2", inspector);
|
||||
const evHolder2 = container2.elt.querySelector(".markupview-event-badge");
|
||||
const evHolder2 = container2.elt.querySelector(".markup-badge[data-event]");
|
||||
|
||||
const tooltip = inspector.markup.eventDetailsTooltip;
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ async function checkEventsForNode(test, inspector, testActor) {
|
||||
await beforeTest(inspector, testActor);
|
||||
}
|
||||
|
||||
const evHolder = container.elt.querySelector(".markupview-event-badge");
|
||||
const evHolder = container.elt.querySelector(".markup-badge[data-event]");
|
||||
|
||||
if (expected.length === 0) {
|
||||
// if no event is expected, simply check that the event bubble is hidden
|
||||
|
||||
@ -34,6 +34,11 @@ function MarkupElementContainer(markupView, node) {
|
||||
MarkupContainer.prototype.initialize.call(this, markupView, node,
|
||||
"elementcontainer");
|
||||
|
||||
this.onGridHighlighterChange = this.onGridHighlighterChange.bind(this);
|
||||
|
||||
this.markup.highlighters.on("grid-highlighter-hidden", this.onGridHighlighterChange);
|
||||
this.markup.highlighters.on("grid-highlighter-shown", this.onGridHighlighterChange);
|
||||
|
||||
if (node.nodeType === nodeConstants.ELEMENT_NODE) {
|
||||
this.editor = new ElementEditor(this, node);
|
||||
} else {
|
||||
@ -44,6 +49,13 @@ function MarkupElementContainer(markupView, node) {
|
||||
}
|
||||
|
||||
MarkupElementContainer.prototype = extend(MarkupContainer.prototype, {
|
||||
destroy: function() {
|
||||
this.markup.highlighters.off("grid-highlighter-hidden", this.onGridHighlighterChange);
|
||||
this.markup.highlighters.off("grid-highlighter-shown", this.onGridHighlighterChange);
|
||||
|
||||
MarkupContainer.prototype.destroy.call(this);
|
||||
},
|
||||
|
||||
onContainerClick: function(event) {
|
||||
if (!event.target.hasAttribute("data-event")) {
|
||||
return;
|
||||
@ -52,6 +64,16 @@ MarkupElementContainer.prototype = extend(MarkupContainer.prototype, {
|
||||
this._buildEventTooltipContent(event.target);
|
||||
},
|
||||
|
||||
/**
|
||||
* Handler for "grid-highlighter-hidden" and "grid-highlighter-shown" event emitted from
|
||||
* the HighlightersOverlay. Toggles the active state of the display badge if it matches
|
||||
* the highlighted grid node.
|
||||
*/
|
||||
onGridHighlighterChange: function() {
|
||||
this.editor.displayBadge.classList.toggle("active",
|
||||
this.markup.highlighters.gridHighlighterShown === this.node);
|
||||
},
|
||||
|
||||
async _buildEventTooltipContent(target) {
|
||||
const tooltip = this.markup.eventDetailsTooltip;
|
||||
|
||||
|
||||
@ -60,6 +60,8 @@ function ElementEditor(container, node) {
|
||||
this.node = node;
|
||||
this.markup = this.container.markup;
|
||||
this.doc = this.markup.doc;
|
||||
this.inspector = this.markup.inspector;
|
||||
this.highlighters = this.markup.highlighters;
|
||||
this._cssProperties = getCssProperties(this.markup.toolbox);
|
||||
|
||||
this.attrElements = new Map();
|
||||
@ -72,6 +74,9 @@ function ElementEditor(container, node) {
|
||||
this.newAttr = null;
|
||||
this.closeElt = null;
|
||||
|
||||
this.onDisplayBadgeClick = this.onDisplayBadgeClick.bind(this);
|
||||
this.onTagEdit = this.onTagEdit.bind(this);
|
||||
|
||||
// Create the main editor
|
||||
this.buildMarkup();
|
||||
|
||||
@ -86,7 +91,7 @@ function ElementEditor(container, node) {
|
||||
maxWidth: () => getAutocompleteMaxWidth(this.tag, this.container.elt),
|
||||
trigger: "dblclick",
|
||||
stopOnReturn: true,
|
||||
done: this.onTagEdit.bind(this),
|
||||
done: this.onTagEdit,
|
||||
cssProperties: this._cssProperties
|
||||
});
|
||||
}
|
||||
@ -171,16 +176,17 @@ ElementEditor.prototype = {
|
||||
|
||||
close.appendChild(this.doc.createTextNode(">"));
|
||||
|
||||
this.eventNode = this.doc.createElement("div");
|
||||
this.eventNode.classList.add("markupview-event-badge");
|
||||
this.eventNode.dataset.event = "true";
|
||||
this.eventNode.textContent = "event";
|
||||
this.eventNode.title = INSPECTOR_L10N.getStr("markupView.event.tooltiptext");
|
||||
this.elt.appendChild(this.eventNode);
|
||||
this.eventBadge = this.doc.createElement("div");
|
||||
this.eventBadge.classList.add("markup-badge");
|
||||
this.eventBadge.dataset.event = "true";
|
||||
this.eventBadge.textContent = "event";
|
||||
this.eventBadge.title = INSPECTOR_L10N.getStr("markupView.event.tooltiptext");
|
||||
this.elt.appendChild(this.eventBadge);
|
||||
|
||||
this.displayNode = this.doc.createElement("div");
|
||||
this.displayNode.classList.add("markupview-display-badge");
|
||||
this.elt.appendChild(this.displayNode);
|
||||
this.displayBadge = this.doc.createElement("div");
|
||||
this.displayBadge.classList.add("markup-badge");
|
||||
this.displayBadge.addEventListener("click", this.onDisplayBadgeClick);
|
||||
this.elt.appendChild(this.displayBadge);
|
||||
},
|
||||
|
||||
set selected(value) {
|
||||
@ -272,18 +278,26 @@ ElementEditor.prototype = {
|
||||
}
|
||||
|
||||
// Update the event bubble display
|
||||
this.eventNode.style.display = this.node.hasEventListeners ? "inline-block" : "none";
|
||||
|
||||
// Update the display type node
|
||||
const showDisplayNode = this.node.displayType in DISPLAY_TYPES;
|
||||
this.displayNode.textContent = this.node.displayType;
|
||||
this.displayNode.dataset.display = showDisplayNode ? this.node.displayType : "";
|
||||
this.displayNode.style.display = showDisplayNode ? "inline-block" : "none";
|
||||
this.displayNode.title = showDisplayNode ? DISPLAY_TYPES[this.node.displayType] : "";
|
||||
this.eventBadge.style.display = this.node.hasEventListeners ? "inline-block" : "none";
|
||||
|
||||
this.updateDisplayBadge();
|
||||
this.updateTextEditor();
|
||||
},
|
||||
|
||||
/**
|
||||
* Update the markup display badge.
|
||||
*/
|
||||
updateDisplayBadge: function() {
|
||||
const showDisplayBadge = this.node.displayType in DISPLAY_TYPES;
|
||||
this.displayBadge.textContent = this.node.displayType;
|
||||
this.displayBadge.dataset.display = showDisplayBadge ? this.node.displayType : "";
|
||||
this.displayBadge.style.display = showDisplayBadge ? "inline-block" : "none";
|
||||
this.displayBadge.title = showDisplayBadge ?
|
||||
DISPLAY_TYPES[this.node.displayType] : "";
|
||||
this.displayBadge.classList.toggle("active",
|
||||
this.highlighters.gridHighlighterShown === this.node);
|
||||
},
|
||||
|
||||
/**
|
||||
* Update the inline text editor in case of a single text child node.
|
||||
*/
|
||||
@ -626,6 +640,21 @@ ElementEditor.prototype = {
|
||||
this.markup.inspector.once("markupmutation", onMutations);
|
||||
},
|
||||
|
||||
/**
|
||||
* Called when the display badge is clicked. Toggles on the grid highlighter for the
|
||||
* selected node if it is a grid container.
|
||||
*/
|
||||
onDisplayBadgeClick: function(event) {
|
||||
event.stopPropagation();
|
||||
|
||||
const target = event.target;
|
||||
if (target.dataset.display !== "grid" || target.dataset.display !== "inline-grid") {
|
||||
return;
|
||||
}
|
||||
|
||||
this.highlighters.toggleGridHighlighter(this.inspector.selection.nodeFront, "markup");
|
||||
},
|
||||
|
||||
/**
|
||||
* Called when the tag name editor has is done editing.
|
||||
*/
|
||||
@ -646,6 +675,8 @@ ElementEditor.prototype = {
|
||||
},
|
||||
|
||||
destroy: function() {
|
||||
this.displayBadge.removeEventListener("click", this.onDisplayBadgeClick);
|
||||
|
||||
for (const key in this.animationTimers) {
|
||||
clearTimeout(this.animationTimers[key]);
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ add_task(async function() {
|
||||
ok(isDisabled(button), "The button is hidden in the toolbar");
|
||||
|
||||
info("Check the color picker");
|
||||
await selectNode("#scale", inspector);
|
||||
await selectNode("#tree", inspector);
|
||||
|
||||
// Find the color swatch in the rule-view.
|
||||
let ruleView = inspector.getPanel("ruleview").view;
|
||||
|
||||
@ -12,11 +12,11 @@ add_task(async function() {
|
||||
|
||||
await startPicker(toolbox);
|
||||
|
||||
info("Selecting the scale");
|
||||
await moveMouseOver("#scale");
|
||||
info("Selecting the tree");
|
||||
await moveMouseOver("#tree");
|
||||
await doKeyPick({key: "VK_RETURN", options: {}});
|
||||
is(inspector.selection.nodeFront.className, "scale-slider",
|
||||
"The .scale-slider inside the scale was selected");
|
||||
is(inspector.selection.nodeFront.className, "tree-bodybox",
|
||||
"The .tree-bodybox inside the tree was selected");
|
||||
|
||||
function doKeyPick(msg) {
|
||||
info("Key pressed. Waiting for element to be picked");
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
<window title="Test that the picker works correctly with XBL anonymous nodes"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<scale id="scale" style="background:red"/>
|
||||
<tree id="tree" style="background:red"/>
|
||||
|
||||
</window>
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
:root {
|
||||
--markup-badge-active-background-color: var(--blue-50);
|
||||
--markup-badge-background-color: var(--grey-20);
|
||||
--markup-badge-border-color: #CACAD1;
|
||||
--markup-badge-color: var(--grey-90);
|
||||
@ -15,6 +16,7 @@
|
||||
}
|
||||
|
||||
.theme-dark:root {
|
||||
--markup-badge-active-background-color: var(--blue-60);
|
||||
--markup-badge-background-color: var(--grey-70);
|
||||
--markup-badge-border-color: var(--grey-50);
|
||||
--markup-badge-color: var(--grey-30);
|
||||
@ -394,9 +396,8 @@ ul.children + .tag-line::before {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/* Display and Event Badges */
|
||||
.markupview-display-badge,
|
||||
.markupview-event-badge {
|
||||
/* Markup Badges */
|
||||
.markup-badge {
|
||||
display: none;
|
||||
font-size: 9px;
|
||||
font-weight: normal;
|
||||
@ -411,11 +412,20 @@ ul.children + .tag-line::before {
|
||||
color: var(--markup-badge-color);
|
||||
}
|
||||
|
||||
.markupview-event-badge {
|
||||
.markup-badge.active {
|
||||
background-color: var(--markup-badge-active-background-color);
|
||||
border-color: var(--theme-selection-color);
|
||||
color: var(--theme-selection-color);
|
||||
}
|
||||
|
||||
.markup-badge[data-display="grid"],
|
||||
.markup-badge[data-event] {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.markupview-event-badge:focus,
|
||||
.markupview-event-badge:hover {
|
||||
.markup-badge[data-display="grid"]:focus,
|
||||
.markup-badge[data-display="grid"]:hover,
|
||||
.markup-badge[data-event]:focus,
|
||||
.markup-badge[data-event]:hover {
|
||||
background-color: var(--markup-badge-hover-background-color);
|
||||
}
|
||||
|
||||
@ -671,7 +671,22 @@ const SourceActor = ActorClassWithSpec(sourceSpec, {
|
||||
* }
|
||||
*/
|
||||
setPausePoints: function(pausePoints) {
|
||||
this.pausePoints = pausePoints;
|
||||
const uncompressed = {};
|
||||
const points = {
|
||||
0: {},
|
||||
1: { break: true },
|
||||
2: { step: true },
|
||||
3: { break: true, step: true }
|
||||
};
|
||||
|
||||
for (const line in pausePoints) {
|
||||
uncompressed[line] = {};
|
||||
for (const col in pausePoints[line]) {
|
||||
uncompressed[line][col] = points[pausePoints[line][col]];
|
||||
}
|
||||
}
|
||||
|
||||
this.pausePoints = uncompressed;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -133,7 +133,7 @@ NS_INTERFACE_MAP_END
|
||||
/* virtual */ JSObject*
|
||||
DominatorTree::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto)
|
||||
{
|
||||
return dom::DominatorTreeBinding::Wrap(aCx, this, aGivenProto);
|
||||
return dom::DominatorTree_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace devtools
|
||||
|
||||
@ -86,7 +86,7 @@ NS_INTERFACE_MAP_END
|
||||
/* virtual */ JSObject*
|
||||
HeapSnapshot::WrapObject(JSContext* aCx, HandleObject aGivenProto)
|
||||
{
|
||||
return HeapSnapshotBinding::Wrap(aCx, this, aGivenProto);
|
||||
return HeapSnapshot_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/*** Reading Heap Snapshots ***********************************************************************/
|
||||
|
||||
@ -124,7 +124,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ChildSHistory,
|
||||
JSObject*
|
||||
ChildSHistory::WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return ChildSHistoryBinding::Wrap(cx, this, aGivenProto);
|
||||
return ChildSHistory_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
nsISupports*
|
||||
|
||||
@ -60,7 +60,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ParentSHistory,
|
||||
JSObject*
|
||||
ParentSHistory::WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return ParentSHistoryBinding::Wrap(cx, this, aGivenProto);
|
||||
return ParentSHistory_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
nsISupports*
|
||||
|
||||
@ -43,7 +43,7 @@ AbortController::AbortController(nsIGlobalObject* aGlobal)
|
||||
JSObject*
|
||||
AbortController::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return AbortControllerBinding::Wrap(aCx, this, aGivenProto);
|
||||
return AbortController_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
nsIGlobalObject*
|
||||
|
||||
@ -45,7 +45,7 @@ AbortSignal::AbortSignal(bool aAborted)
|
||||
JSObject*
|
||||
AbortSignal::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return AbortSignalBinding::Wrap(aCx, this, aGivenProto);
|
||||
return AbortSignal_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
bool
|
||||
|
||||
@ -43,7 +43,7 @@ NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
|
||||
JSObject*
|
||||
Animation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return dom::AnimationBinding::Wrap(aCx, this, aGivenProto);
|
||||
return dom::Animation_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@ -47,7 +47,7 @@ CSSPseudoElement::GetParentObject() const
|
||||
JSObject*
|
||||
CSSPseudoElement::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return CSSPseudoElementBinding::Wrap(aCx, this, aGivenProto);
|
||||
return CSSPseudoElement_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -45,7 +45,7 @@ NS_IMPL_RELEASE_INHERITED(DocumentTimeline, AnimationTimeline)
|
||||
JSObject*
|
||||
DocumentTimeline::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DocumentTimelineBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DocumentTimeline_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* static */ already_AddRefed<DocumentTimeline>
|
||||
|
||||
@ -85,7 +85,7 @@ JSObject*
|
||||
KeyframeEffect::WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return KeyframeEffectBinding::Wrap(aCx, this, aGivenProto);
|
||||
return KeyframeEffect_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
IterationCompositeOperation KeyframeEffect::IterationComposite(
|
||||
|
||||
@ -206,7 +206,7 @@ AnonymousContent::WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aGivenProto,
|
||||
JS::MutableHandle<JSObject*> aReflector)
|
||||
{
|
||||
return AnonymousContentBinding::Wrap(aCx, this, aGivenProto, aReflector);
|
||||
return AnonymousContent_Binding::Wrap(aCx, this, aGivenProto, aReflector);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -315,7 +315,7 @@ Attr::Shutdown()
|
||||
JSObject*
|
||||
Attr::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return AttrBinding::Wrap(aCx, this, aGivenProto);
|
||||
return Attr_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -36,7 +36,7 @@ BarProp::GetParentObject() const
|
||||
JSObject*
|
||||
BarProp::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return BarPropBinding::Wrap(aCx, this, aGivenProto);
|
||||
return BarProp_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(BarProp, mDOMWindow)
|
||||
|
||||
@ -26,7 +26,7 @@ public:
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
|
||||
{
|
||||
return ChildProcessMessageManagerBinding::Wrap(aCx, this, aGivenProto);
|
||||
return ChildProcessMessageManager_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
@ -18,7 +18,7 @@ ChromeMessageBroadcaster::WrapObject(JSContext* aCx,
|
||||
{
|
||||
MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx));
|
||||
|
||||
return ChromeMessageBroadcasterBinding::Wrap(aCx, this, aGivenProto);
|
||||
return ChromeMessageBroadcaster_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -16,7 +16,7 @@ ChromeMessageSender::WrapObject(JSContext* aCx,
|
||||
{
|
||||
MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx));
|
||||
|
||||
return ChromeMessageSenderBinding::Wrap(aCx, this, aGivenProto);
|
||||
return ChromeMessageSender_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -22,7 +22,7 @@ ChromeNodeList::Constructor(const GlobalObject& aGlobal, ErrorResult& aRv)
|
||||
JSObject*
|
||||
ChromeNodeList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return ChromeNodeListBinding::Wrap(aCx, this, aGivenProto);
|
||||
return ChromeNodeList_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -68,7 +68,7 @@ Comment::Constructor(const GlobalObject& aGlobal,
|
||||
JSObject*
|
||||
Comment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return CommentBinding::Wrap(aCx, this, aGivenProto);
|
||||
return Comment_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -41,7 +41,7 @@ Crypto::~Crypto()
|
||||
/* virtual */ JSObject*
|
||||
Crypto::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return CryptoBinding::Wrap(aCx, this, aGivenProto);
|
||||
return Crypto_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -658,7 +658,7 @@ CustomElementRegistry::UpgradeCandidates(nsAtom* aKey,
|
||||
JSObject*
|
||||
CustomElementRegistry::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return CustomElementRegistryBinding::Wrap(aCx, this, aGivenProto);
|
||||
return CustomElementRegistry_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
nsISupports* CustomElementRegistry::GetParentObject() const
|
||||
|
||||
@ -59,7 +59,7 @@ DOMError::~DOMError()
|
||||
JSObject*
|
||||
DOMError::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMErrorBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMError_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* static */ already_AddRefed<DOMError>
|
||||
|
||||
@ -24,29 +24,29 @@ using namespace mozilla::dom;
|
||||
|
||||
enum DOM4ErrorTypeCodeMap {
|
||||
/* DOM4 errors from http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#domexception */
|
||||
IndexSizeError = DOMExceptionBinding::INDEX_SIZE_ERR,
|
||||
HierarchyRequestError = DOMExceptionBinding::HIERARCHY_REQUEST_ERR,
|
||||
WrongDocumentError = DOMExceptionBinding::WRONG_DOCUMENT_ERR,
|
||||
InvalidCharacterError = DOMExceptionBinding::INVALID_CHARACTER_ERR,
|
||||
NoModificationAllowedError = DOMExceptionBinding::NO_MODIFICATION_ALLOWED_ERR,
|
||||
NotFoundError = DOMExceptionBinding::NOT_FOUND_ERR,
|
||||
NotSupportedError = DOMExceptionBinding::NOT_SUPPORTED_ERR,
|
||||
IndexSizeError = DOMException_Binding::INDEX_SIZE_ERR,
|
||||
HierarchyRequestError = DOMException_Binding::HIERARCHY_REQUEST_ERR,
|
||||
WrongDocumentError = DOMException_Binding::WRONG_DOCUMENT_ERR,
|
||||
InvalidCharacterError = DOMException_Binding::INVALID_CHARACTER_ERR,
|
||||
NoModificationAllowedError = DOMException_Binding::NO_MODIFICATION_ALLOWED_ERR,
|
||||
NotFoundError = DOMException_Binding::NOT_FOUND_ERR,
|
||||
NotSupportedError = DOMException_Binding::NOT_SUPPORTED_ERR,
|
||||
// Can't remove until setNamedItem is removed
|
||||
InUseAttributeError = DOMExceptionBinding::INUSE_ATTRIBUTE_ERR,
|
||||
InvalidStateError = DOMExceptionBinding::INVALID_STATE_ERR,
|
||||
SyntaxError = DOMExceptionBinding::SYNTAX_ERR,
|
||||
InvalidModificationError = DOMExceptionBinding::INVALID_MODIFICATION_ERR,
|
||||
NamespaceError = DOMExceptionBinding::NAMESPACE_ERR,
|
||||
InvalidAccessError = DOMExceptionBinding::INVALID_ACCESS_ERR,
|
||||
TypeMismatchError = DOMExceptionBinding::TYPE_MISMATCH_ERR,
|
||||
SecurityError = DOMExceptionBinding::SECURITY_ERR,
|
||||
NetworkError = DOMExceptionBinding::NETWORK_ERR,
|
||||
AbortError = DOMExceptionBinding::ABORT_ERR,
|
||||
URLMismatchError = DOMExceptionBinding::URL_MISMATCH_ERR,
|
||||
QuotaExceededError = DOMExceptionBinding::QUOTA_EXCEEDED_ERR,
|
||||
TimeoutError = DOMExceptionBinding::TIMEOUT_ERR,
|
||||
InvalidNodeTypeError = DOMExceptionBinding::INVALID_NODE_TYPE_ERR,
|
||||
DataCloneError = DOMExceptionBinding::DATA_CLONE_ERR,
|
||||
InUseAttributeError = DOMException_Binding::INUSE_ATTRIBUTE_ERR,
|
||||
InvalidStateError = DOMException_Binding::INVALID_STATE_ERR,
|
||||
SyntaxError = DOMException_Binding::SYNTAX_ERR,
|
||||
InvalidModificationError = DOMException_Binding::INVALID_MODIFICATION_ERR,
|
||||
NamespaceError = DOMException_Binding::NAMESPACE_ERR,
|
||||
InvalidAccessError = DOMException_Binding::INVALID_ACCESS_ERR,
|
||||
TypeMismatchError = DOMException_Binding::TYPE_MISMATCH_ERR,
|
||||
SecurityError = DOMException_Binding::SECURITY_ERR,
|
||||
NetworkError = DOMException_Binding::NETWORK_ERR,
|
||||
AbortError = DOMException_Binding::ABORT_ERR,
|
||||
URLMismatchError = DOMException_Binding::URL_MISMATCH_ERR,
|
||||
QuotaExceededError = DOMException_Binding::QUOTA_EXCEEDED_ERR,
|
||||
TimeoutError = DOMException_Binding::TIMEOUT_ERR,
|
||||
InvalidNodeTypeError = DOMException_Binding::INVALID_NODE_TYPE_ERR,
|
||||
DataCloneError = DOMException_Binding::DATA_CLONE_ERR,
|
||||
InvalidPointerId = 0,
|
||||
EncodingError = 0,
|
||||
|
||||
@ -295,7 +295,7 @@ Exception::ToString(JSContext* aCx, nsACString& _retval)
|
||||
JSObject*
|
||||
Exception::WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return ExceptionBinding::Wrap(cx, this, aGivenProto);
|
||||
return Exception_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
@ -424,7 +424,7 @@ DOMException::Constructor(GlobalObject& /* unused */,
|
||||
JSObject*
|
||||
DOMException::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMExceptionBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMException_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* static */already_AddRefed<DOMException>
|
||||
|
||||
@ -30,7 +30,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation)
|
||||
JSObject*
|
||||
DOMImplementation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMImplementationBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMImplementation_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
already_AddRefed<DocumentType>
|
||||
|
||||
@ -53,7 +53,7 @@ public:
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
|
||||
{
|
||||
return mozilla::dom::IntersectionObserverEntryBinding::Wrap(aCx, this, aGivenProto);
|
||||
return mozilla::dom::IntersectionObserverEntry_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
DOMHighResTimeStamp Time()
|
||||
@ -135,7 +135,7 @@ public:
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
|
||||
{
|
||||
return mozilla::dom::IntersectionObserverBinding::Wrap(aCx, this, aGivenProto);
|
||||
return mozilla::dom::IntersectionObserver_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
nsISupports* GetParentObject() const
|
||||
|
||||
@ -36,7 +36,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMMatrixReadOnly, Release)
|
||||
JSObject*
|
||||
DOMMatrixReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMMatrixReadOnlyBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMMatrixReadOnly_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMMatrixReadOnly>
|
||||
@ -739,7 +739,7 @@ DOMMatrix::SetMatrixValue(const nsAString& aTransformList, ErrorResult& aRv)
|
||||
JSObject*
|
||||
DOMMatrix::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMMatrixBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMMatrix_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -68,7 +68,7 @@ public:
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
|
||||
{
|
||||
return mozilla::dom::DOMParserBinding::Wrap(aCx, this, aGivenProto);
|
||||
return mozilla::dom::DOMParser_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
// A way to create a non-global-associated DOMParser from C++.
|
||||
|
||||
@ -38,7 +38,7 @@ DOMPointReadOnly::Constructor(const GlobalObject& aGlobal, double aX, double aY,
|
||||
JSObject*
|
||||
DOMPointReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMPointReadOnlyBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMPointReadOnly_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMPoint>
|
||||
@ -62,5 +62,5 @@ DOMPoint::Constructor(const GlobalObject& aGlobal, double aX, double aY,
|
||||
JSObject*
|
||||
DOMPoint::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMPointBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMPoint_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ DOMQuad::~DOMQuad()
|
||||
JSObject*
|
||||
DOMQuad::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMQuadBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMQuad_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMQuad>
|
||||
|
||||
@ -25,7 +25,7 @@ JSObject*
|
||||
DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
MOZ_ASSERT(mParent);
|
||||
return DOMRectReadOnlyBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMRectReadOnly_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMRectReadOnly>
|
||||
@ -43,7 +43,7 @@ JSObject*
|
||||
DOMRect::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
MOZ_ASSERT(mParent);
|
||||
return DOMRectBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMRect_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
already_AddRefed<DOMRect>
|
||||
@ -71,7 +71,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMRectList)
|
||||
JSObject*
|
||||
DOMRectList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return mozilla::dom::DOMRectListBinding::Wrap(cx, this, aGivenProto);
|
||||
return mozilla::dom::DOMRectList_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
static double
|
||||
|
||||
@ -74,7 +74,7 @@ NS_IMPL_RELEASE_INHERITED(DOMRequest, DOMEventTargetHelper)
|
||||
/* virtual */ JSObject*
|
||||
DOMRequest::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMRequestBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMRequest_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -27,7 +27,7 @@ DOMStringList::~DOMStringList()
|
||||
JSObject*
|
||||
DOMStringList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DOMStringListBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DOMStringList_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -27,7 +27,7 @@ namespace dom {
|
||||
JSObject*
|
||||
DocumentFragment::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DocumentFragmentBinding::Wrap(aCx, this, aGivenProto);
|
||||
return DocumentFragment_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
bool
|
||||
|
||||
@ -43,7 +43,7 @@ namespace dom {
|
||||
JSObject*
|
||||
DocumentType::WrapNode(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return DocumentTypeBinding::Wrap(cx, this, aGivenProto);
|
||||
return DocumentType_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
DocumentType::DocumentType(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
|
||||
|
||||
@ -2275,7 +2275,7 @@ Element::DispatchClickEvent(nsPresContext* aPresContext,
|
||||
inputSource = sourceMouseEvent->inputSource;
|
||||
} else if (aSourceEvent->mClass == eKeyboardEventClass) {
|
||||
event.mFlags.mIsPositionless = true;
|
||||
inputSource = MouseEventBinding::MOZ_SOURCE_KEYBOARD;
|
||||
inputSource = MouseEvent_Binding::MOZ_SOURCE_KEYBOARD;
|
||||
}
|
||||
event.pressure = pressure;
|
||||
event.mClickCount = clickCount;
|
||||
@ -2424,8 +2424,8 @@ Element::MaybeCheckSameAttrVal(int32_t aNamespaceID,
|
||||
}
|
||||
}
|
||||
*aModType = modification ?
|
||||
static_cast<uint8_t>(MutationEventBinding::MODIFICATION) :
|
||||
static_cast<uint8_t>(MutationEventBinding::ADDITION);
|
||||
static_cast<uint8_t>(MutationEvent_Binding::MODIFICATION) :
|
||||
static_cast<uint8_t>(MutationEvent_Binding::ADDITION);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -2473,7 +2473,7 @@ Element::SetSingleClassFromParser(nsAtom* aSingleClassName)
|
||||
nullptr, // old value
|
||||
value,
|
||||
nullptr,
|
||||
static_cast<uint8_t>(MutationEventBinding::ADDITION),
|
||||
static_cast<uint8_t>(MutationEvent_Binding::ADDITION),
|
||||
false, // hasListeners
|
||||
false, // notify
|
||||
kCallAfterSetAttr,
|
||||
@ -2689,7 +2689,7 @@ Element::SetAttrAndNotify(int32_t aNamespaceID,
|
||||
|
||||
LifecycleCallbackArgs args = {
|
||||
nsDependentAtomString(aName),
|
||||
aModType == MutationEventBinding::ADDITION ?
|
||||
aModType == MutationEvent_Binding::ADDITION ?
|
||||
VoidString() : nsDependentAtomString(oldValueAtom),
|
||||
nsDependentAtomString(newValueAtom),
|
||||
(ns.IsEmpty() ? VoidString() : ns)
|
||||
@ -2924,7 +2924,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsAtom* aName,
|
||||
|
||||
if (aNotify) {
|
||||
nsNodeUtils::AttributeWillChange(this, aNameSpaceID, aName,
|
||||
MutationEventBinding::REMOVAL,
|
||||
MutationEvent_Binding::REMOVAL,
|
||||
nullptr);
|
||||
}
|
||||
|
||||
@ -3007,7 +3007,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsAtom* aName,
|
||||
// We can always pass oldValue here since there is no new value which could
|
||||
// have corrupted it.
|
||||
nsNodeUtils::AttributeChanged(this, aNameSpaceID, aName,
|
||||
MutationEventBinding::REMOVAL, &oldValue);
|
||||
MutationEvent_Binding::REMOVAL, &oldValue);
|
||||
}
|
||||
|
||||
if (aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::dir) {
|
||||
@ -3024,7 +3024,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsAtom* aName,
|
||||
oldValue.ToString(value);
|
||||
if (!value.IsEmpty())
|
||||
mutation.mPrevAttrValue = NS_Atomize(value);
|
||||
mutation.mAttrChange = MutationEventBinding::REMOVAL;
|
||||
mutation.mAttrChange = MutationEvent_Binding::REMOVAL;
|
||||
|
||||
mozAutoSubtreeModified subtree(OwnerDoc(), this);
|
||||
(new AsyncEventDispatcher(this, mutation))->RunDOMEventWhenSafe();
|
||||
|
||||
@ -680,8 +680,8 @@ public:
|
||||
* @param aOldValue [out] Set to the old value of the attribute, but only if
|
||||
* there are event listeners. If set, the type of aOldValue will be either
|
||||
* nsAttrValue::eString or nsAttrValue::eAtom.
|
||||
* @param aModType [out] Set to MutationEventBinding::MODIFICATION or to
|
||||
* MutationEventBinding::ADDITION, but only if this helper returns true
|
||||
* @param aModType [out] Set to MutationEvent_Binding::MODIFICATION or to
|
||||
* MutationEvent_Binding::ADDITION, but only if this helper returns true
|
||||
* @param aHasListeners [out] Set to true if there are mutation event
|
||||
* listeners listening for NS_EVENT_BITS_MUTATION_ATTRMODIFIED
|
||||
* @param aOldValueSet [out] Indicates whether an old attribute value has been
|
||||
@ -707,8 +707,8 @@ public:
|
||||
* @param aOldValue [out] Set to the old value of the attribute, but only if
|
||||
* there are event listeners. If set, the type of aOldValue will be either
|
||||
* nsAttrValue::eString or nsAttrValue::eAtom.
|
||||
* @param aModType [out] Set to MutationEventBinding::MODIFICATION or to
|
||||
* MutationEventBinding::ADDITION, but only if this helper returns true
|
||||
* @param aModType [out] Set to MutationEvent_Binding::MODIFICATION or to
|
||||
* MutationEvent_Binding::ADDITION, but only if this helper returns true
|
||||
* @param aHasListeners [out] Set to true if there are mutation event
|
||||
* listeners listening for NS_EVENT_BITS_MUTATION_ATTRMODIFIED
|
||||
* @param aOldValueSet [out] Indicates whether an old attribute value has been
|
||||
@ -1700,7 +1700,7 @@ protected:
|
||||
* non-null value does guarantee that a scripted caller
|
||||
* with the given principal is directly responsible for
|
||||
* the attribute change.
|
||||
* @param aModType MutationEventBinding::MODIFICATION or ADDITION. Only
|
||||
* @param aModType MutationEvent_Binding::MODIFICATION or ADDITION. Only
|
||||
* needed if aFireMutation or aNotify is true.
|
||||
* @param aFireMutation should mutation-events be fired?
|
||||
* @param aNotify should we notify document-observers?
|
||||
|
||||
@ -1518,8 +1518,9 @@ EventSourceImpl::DispatchAllMessageEvents()
|
||||
RefPtr<MessageEvent> event = new MessageEvent(mEventSource, nullptr,
|
||||
nullptr);
|
||||
|
||||
event->InitMessageEvent(nullptr, message->mEventName, false, false, jsData,
|
||||
mOrigin, message->mLastEventID, nullptr,
|
||||
event->InitMessageEvent(nullptr, message->mEventName, CanBubble::eNo,
|
||||
Cancelable::eNo, jsData, mOrigin,
|
||||
message->mLastEventID, nullptr,
|
||||
Sequence<OwningNonNull<MessagePort>>());
|
||||
event->SetTrusted(true);
|
||||
|
||||
@ -2033,7 +2034,7 @@ JSObject*
|
||||
EventSource::WrapObject(JSContext* aCx,
|
||||
JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return EventSourceBinding::Wrap(aCx, this, aGivenProto);
|
||||
return EventSource_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -328,7 +328,7 @@ FormData::SetNameDirectoryPair(FormDataTuple* aData,
|
||||
/* virtual */ JSObject*
|
||||
FormData::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return FormDataBinding::Wrap(aCx, this, aGivenProto);
|
||||
return FormData_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* static */ already_AddRefed<FormData>
|
||||
|
||||
@ -503,7 +503,7 @@ JSObject*
|
||||
nsAttrChildContentList::WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return NodeListBinding::Wrap(cx, this, aGivenProto);
|
||||
return NodeList_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
|
||||
@ -51,7 +51,7 @@ IdleDeadline::~IdleDeadline()
|
||||
JSObject*
|
||||
IdleDeadline::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return IdleDeadlineBinding::Wrap(aCx, this, aGivenProto);
|
||||
return IdleDeadline_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
DOMHighResTimeStamp
|
||||
|
||||
@ -33,7 +33,7 @@ IntlUtils::~IntlUtils()
|
||||
JSObject*
|
||||
IntlUtils::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return IntlUtilsBinding::Wrap(aCx, this, aGivenProto);
|
||||
return IntlUtils_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -1003,7 +1003,7 @@ Location::CallerSubsumes(nsIPrincipal* aSubjectPrincipal)
|
||||
JSObject*
|
||||
Location::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return LocationBinding::Wrap(aCx, this, aGivenProto);
|
||||
return Location_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // dom namespace
|
||||
|
||||
@ -133,7 +133,7 @@ MozQueryInterface::LegacyCall(JSContext* cx, JS::Handle<JS::Value> thisv,
|
||||
bool
|
||||
MozQueryInterface::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector)
|
||||
{
|
||||
return MozQueryInterfaceBinding::Wrap(aCx, this, aGivenProto, aReflector);
|
||||
return MozQueryInterface_Binding::Wrap(aCx, this, aGivenProto, aReflector);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -1379,7 +1379,7 @@ Navigator::NotifyVRDisplaysUpdated()
|
||||
void
|
||||
Navigator::NotifyActiveVRDisplaysChanged()
|
||||
{
|
||||
NavigatorBinding::ClearCachedActiveVRDisplaysValue(this);
|
||||
Navigator_Binding::ClearCachedActiveVRDisplaysValue(this);
|
||||
}
|
||||
|
||||
VRServiceTest*
|
||||
@ -1497,7 +1497,7 @@ Navigator::OnNavigation()
|
||||
JSObject*
|
||||
Navigator::WrapObject(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return NavigatorBinding::Wrap(cx, this, aGivenProto);
|
||||
return Navigator_Binding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* static */
|
||||
@ -1644,7 +1644,7 @@ Navigator::AppName(nsAString& aAppName, bool aUsePrefOverriddenValue)
|
||||
void
|
||||
Navigator::ClearUserAgentCache()
|
||||
{
|
||||
NavigatorBinding::ClearCachedUserAgentValue(this);
|
||||
Navigator_Binding::ClearCachedUserAgentValue(this);
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
||||
@ -142,7 +142,7 @@ public:
|
||||
nsAString& aUserAgent);
|
||||
|
||||
// Clears the user agent cache by calling:
|
||||
// NavigatorBinding::ClearCachedUserAgentValue(this);
|
||||
// Navigator_Binding::ClearCachedUserAgentValue(this);
|
||||
void ClearUserAgentCache();
|
||||
|
||||
bool Vibrate(uint32_t aDuration);
|
||||
|
||||
@ -202,7 +202,7 @@ NodeIterator::NextOrPrevNode(NodePointer::MoveToMethodType aMove,
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (filtered == NodeFilterBinding::FILTER_ACCEPT) {
|
||||
if (filtered == NodeFilter_Binding::FILTER_ACCEPT) {
|
||||
mPointer = mWorkingPointer;
|
||||
return testNode.forget();
|
||||
}
|
||||
@ -235,7 +235,7 @@ void NodeIterator::ContentRemoved(nsIContent* aChild,
|
||||
bool
|
||||
NodeIterator::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto, JS::MutableHandle<JSObject*> aReflector)
|
||||
{
|
||||
return NodeIteratorBinding::Wrap(cx, this, aGivenProto, aReflector);
|
||||
return NodeIterator_Binding::Wrap(cx, this, aGivenProto, aReflector);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -31,7 +31,7 @@ ParentProcessMessageManager::WrapObject(JSContext* aCx,
|
||||
{
|
||||
MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx));
|
||||
|
||||
return ParentProcessMessageManagerBinding::Wrap(aCx, this, aGivenProto);
|
||||
return ParentProcessMessageManager_Binding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
|
||||
@ -160,7 +160,7 @@ PostMessageEvent::Run()
|
||||
}
|
||||
|
||||
event->InitMessageEvent(nullptr, NS_LITERAL_STRING("message"),
|
||||
false /*non-bubbling */, false /*cancelable */,
|
||||
CanBubble::eNo, Cancelable::eNo,
|
||||
messageData, mCallerOrigin,
|
||||
EmptyString(), source, ports);
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user