mps =
- do_GetService("@mozilla.org/gecko-media-plugin-service;1");
- if (NS_WARN_IF(!mps)) {
- return false;
- }
- const KeySystemConfig* implementation = nullptr;
- if (!HaveGMPFor(mps,
- NS_ConvertUTF16toUTF8(aKeySystem),
- NS_LITERAL_CSTRING(GMP_API_DECRYPTOR)) ||
- !(implementation = GetKeySystemConfig(aKeySystem))) {
+ KeySystemConfig implementation;
+ if (!GetKeySystemConfig(aKeySystem, implementation)) {
return false;
}
for (const MediaKeySystemConfiguration& candidate : aConfigs) {
- if (mozilla::dom::GetSupportedConfig(mps,
- *implementation,
+ if (mozilla::dom::GetSupportedConfig(implementation,
candidate,
aOutConfig,
aDiagnostics)) {
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug825703.html b/dom/media/tests/mochitest/test_peerConnection_bug825703.html
index 7a1c06a1384f..c25079753ed7 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug825703.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug825703.html
@@ -66,6 +66,8 @@ runNetworkTest(() => {
{ urls: ["stun:127.0.0.1", "stun:localhost"] },
{ urls:"stuns:localhost", foo:"" },
{ urls:"turn:[::1]:3478", username:"p", credential:"p" },
+ { urls:"turn:[::1]:3478", username:"", credential:"" },
+ { urls:"turns:[::1]:3478", username:"", credential:"" },
{ urls:"turn:localhost:3478?transport=udp", username:"p", credential:"p" },
{ urls: ["turn:[::1]:3478", "turn:localhost"], username:"p", credential:"p" },
{ urls:"turns:localhost:3478?transport=udp", username:"p", credential:"p" },
diff --git a/editor/composer/test/test_bug1205983.html b/editor/composer/test/test_bug1205983.html
index 5ed9cdfb56b7..da9eaef0e3fe 100644
--- a/editor/composer/test/test_bug1205983.html
+++ b/editor/composer/test/test_bug1205983.html
@@ -1,126 +1,126 @@
-
-
-
-
- Test for Bug 1205983
-
-
-
-
-Mozilla Bug 1205983
-
-
-
-German heute ist ein guter Tag
-
-
-
-
-
-
-
+
+
+
+
+ Test for Bug 1205983
+
+
+
+
+Mozilla Bug 1205983
+
+
+
+German heute ist ein guter Tag
+
+
+
+
+
+
+
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index f92406e38169..14b602ac2399 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -222,6 +222,7 @@ if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
'-Wno-type-limits',
'-Wno-missing-field-initializers',
'-Wno-conversion',
+ '-Wno-unused-but-set-variable',
]
if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
CFLAGS += [
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 41febc1eb735..ddfd7b0c314c 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -825,6 +825,7 @@ GLContext::InitWithPrefixImpl(const char* prefix, bool trygl)
"Mali-450 MP",
"PowerVR SGX 530",
"PowerVR SGX 540",
+ "PowerVR SGX 544MP",
"NVIDIA Tegra",
"Android Emulator",
"Gallium 0.4 on llvmpipe",
@@ -1801,6 +1802,17 @@ GLContext::InitExtensions()
MarkExtensionUnsupported(OES_EGL_sync);
}
+#ifdef MOZ_WIDGET_ANDROID
+ if (Vendor() == GLVendor::Imagination &&
+ Renderer() == GLRenderer::SGX544MP &&
+ AndroidBridge::Bridge()->GetAPIVersion() < 21)
+ {
+ // Bug 1026404
+ MarkExtensionUnsupported(OES_EGL_image);
+ MarkExtensionUnsupported(OES_EGL_image_external);
+ }
+#endif
+
if (Vendor() == GLVendor::ARM &&
(Renderer() == GLRenderer::Mali400MP ||
Renderer() == GLRenderer::Mali450MP))
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 0f3c26588dc8..9b80eb2a9b83 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -180,6 +180,7 @@ enum class GLRenderer {
Mali450MP,
SGX530,
SGX540,
+ SGX544MP,
Tegra,
AndroidEmulator,
GalliumLlvmpipe,
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 0cad8d019470..aa4c6dcfd507 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2382,6 +2382,10 @@ CanOptimizeForDenseStorage(HandleObject arr, uint32_t startingIndex, uint32_t co
if (!arr->is() && !arr->is())
return false;
+ /* If it's a frozen array, always pick the slow path */
+ if (arr->is() && arr->as().denseElementsAreFrozen())
+ return false;
+
/*
* Don't optimize if the array might be in the midst of iteration. We
* rely on this to be able to safely move dense array elements around with
diff --git a/js/src/tests/ecma_5/Array/frozen-dense-array.js b/js/src/tests/ecma_5/Array/frozen-dense-array.js
index 783e1a710f20..9db63036f370 100644
--- a/js/src/tests/ecma_5/Array/frozen-dense-array.js
+++ b/js/src/tests/ecma_5/Array/frozen-dense-array.js
@@ -9,11 +9,13 @@ var summary = "Dense array properties shouldn't be modified when they're frozen"
print(BUGNUMBER + ": " + summary);
var a = Object.freeze([4, 5, 1]);
-var methods = [
- 'reverse',
- 'shift',
- 'pop',
-];
+
+function assertArrayIsExpected() {
+ assertEq(a.length, 3);
+ assertEq(a[0], 4);
+ assertEq(a[1], 5);
+ assertEq(a[2], 1);
+}
assertThrowsInstanceOf(() => a.reverse(), TypeError);
assertThrowsInstanceOf(() => a.shift(), TypeError);
@@ -24,18 +26,36 @@ assertThrowsInstanceOf(() => a.fill(0), TypeError);
assertThrowsInstanceOf(() => a.splice(0, 1, 1), TypeError);
assertThrowsInstanceOf(() => a.push("foo"), TypeError);
assertThrowsInstanceOf(() => { "use strict"; a.length = 5; }, TypeError);
+assertThrowsInstanceOf(() => { "use strict"; a[2] = "foo"; }, TypeError);
assertThrowsInstanceOf(() => { "use strict"; delete a[0]; }, TypeError);
+assertThrowsInstanceOf(() => a.splice(Math.a), TypeError);
// Shouldn't throw, since this is not strict mode, but shouldn't change the
// value of the property.
a.length = 5;
+a[2] = "foo";
assertEq(delete a[0], false);
+assertArrayIsExpected();
-assertEq(a.length, 3);
-assertEq(a[0], 4);
-assertEq(a[1], 5);
-assertEq(a[2], 1);
+var watchpointCalled = false;
+// NOTE: Be careful with the position of this test, since this sparsifies the
+// elements and you might not test what you think you're testing otherwise.
+a.watch(2, function(prop, oldValue, newValue) {
+ watchpointCalled = true;
+ assertEq(prop, 2);
+ assertEq(oldValue, 1);
+ assertEq(newValue, "foo");
+});
+
+assertArrayIsExpected();
+
+a.length = 5;
+a[2] = "foo";
+assertEq(watchpointCalled, true);
+assertEq(delete a[0], false);
+
+assertArrayIsExpected();
if (typeof reportCompare === "function")
reportCompare(true, true);
diff --git a/js/src/vm/NativeObject-inl.h b/js/src/vm/NativeObject-inl.h
index 1d9fc76bbfa7..48a42a8db83b 100644
--- a/js/src/vm/NativeObject-inl.h
+++ b/js/src/vm/NativeObject-inl.h
@@ -99,7 +99,7 @@ NativeObject::removeDenseElementForSparseIndex(ExclusiveContext* cx,
{
MarkObjectGroupFlags(cx, obj, OBJECT_FLAG_NON_PACKED | OBJECT_FLAG_SPARSE_INDEXES);
if (obj->containsDenseElement(index))
- obj->setDenseElement(index, MagicValue(JS_ELEMENTS_HOLE));
+ obj->setDenseElementUnchecked(index, MagicValue(JS_ELEMENTS_HOLE));
}
inline bool
diff --git a/js/src/vm/NativeObject.cpp b/js/src/vm/NativeObject.cpp
index 669f019da5b1..0afb77f3dec5 100644
--- a/js/src/vm/NativeObject.cpp
+++ b/js/src/vm/NativeObject.cpp
@@ -519,8 +519,19 @@ NativeObject::sparsifyDenseElement(ExclusiveContext* cx, HandleNativeObject obj,
removeDenseElementForSparseIndex(cx, obj, index);
uint32_t slot = obj->slotSpan();
- if (!obj->addDataProperty(cx, INT_TO_JSID(index), slot, JSPROP_ENUMERATE)) {
- obj->setDenseElement(index, value);
+
+ RootedId id(cx, INT_TO_JSID(index));
+
+ ShapeTable::Entry* entry = nullptr;
+ if (obj->inDictionaryMode())
+ entry = &obj->lastProperty()->table().search(id);
+
+ // NOTE: We don't use addDataProperty because we don't want the
+ // extensibility check if we're, for example, sparsifying frozen objects..
+ if (!addPropertyInternal(cx, obj, id, nullptr, nullptr, slot,
+ obj->getElementsHeader()->elementAttributes(),
+ 0, entry, true)) {
+ obj->setDenseElementUnchecked(index, value);
return false;
}
@@ -548,7 +559,7 @@ NativeObject::sparsifyDenseElements(js::ExclusiveContext* cx, HandleNativeObject
}
if (initialized)
- obj->setDenseInitializedLength(0);
+ obj->setDenseInitializedLengthUnchecked(0);
/*
* Reduce storage for dense elements which are now holes. Explicitly mark
@@ -1008,7 +1019,7 @@ NativeObject::addDataProperty(ExclusiveContext* cx, jsid idArg, uint32_t slot, u
Shape*
NativeObject::addDataProperty(ExclusiveContext* cx, HandlePropertyName name,
- uint32_t slot, unsigned attrs)
+ uint32_t slot, unsigned attrs)
{
MOZ_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
RootedNativeObject self(cx, this);
diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index 3eb816bd850b..b5f3fd8346a3 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -305,6 +305,12 @@ class ObjectElements
flags &= ~FROZEN;
}
+ uint8_t elementAttributes() const {
+ if (isFrozen())
+ return JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY;
+ return JSPROP_ENUMERATE;
+ }
+
// This is enough slots to store an object of this class. See the static
// assertion below.
static const size_t VALUES_PER_HEADER = 2;
@@ -864,7 +870,14 @@ class NativeObject : public ShapedObject
protected:
inline bool updateSlotsForSpan(ExclusiveContext* cx, size_t oldSpan, size_t newSpan);
- public:
+ private:
+ void prepareElementRangeForOverwrite(size_t start, size_t end) {
+ MOZ_ASSERT(end <= getDenseInitializedLength());
+ MOZ_ASSERT(!denseElementsAreCopyOnWrite());
+ for (size_t i = start; i < end; i++)
+ elements_[i].HeapSlot::~HeapSlot();
+ }
+
/*
* Trigger the write barrier on a range of slots that will no longer be
* reachable.
@@ -874,14 +887,7 @@ class NativeObject : public ShapedObject
getSlotAddressUnchecked(i)->HeapSlot::~HeapSlot();
}
- void prepareElementRangeForOverwrite(size_t start, size_t end) {
- MOZ_ASSERT(end <= getDenseInitializedLength());
- MOZ_ASSERT(!denseElementsAreCopyOnWrite());
- MOZ_ASSERT(!denseElementsAreFrozen());
- for (size_t i = start; i < end; i++)
- elements_[i].HeapSlot::~HeapSlot();
- }
-
+ public:
static bool rollbackProperties(ExclusiveContext* cx, HandleNativeObject obj,
uint32_t slotSpan);
@@ -1015,24 +1021,37 @@ class NativeObject : public ShapedObject
}
}
- public:
- void setDenseInitializedLength(uint32_t length) {
+ // See the comment over setDenseElementUnchecked, this applies in the same way.
+ void setDenseInitializedLengthUnchecked(uint32_t length) {
MOZ_ASSERT(length <= getDenseCapacity());
MOZ_ASSERT(!denseElementsAreCopyOnWrite());
- MOZ_ASSERT(!denseElementsAreFrozen());
prepareElementRangeForOverwrite(length, getElementsHeader()->initializedLength);
getElementsHeader()->initializedLength = length;
}
- inline void ensureDenseInitializedLength(ExclusiveContext* cx,
- uint32_t index, uint32_t extra);
- void setDenseElement(uint32_t index, const Value& val) {
+ // Use this function with care. This is done to allow sparsifying frozen
+ // objects, but should only be called in a few places, and should be
+ // audited carefully!
+ void setDenseElementUnchecked(uint32_t index, const Value& val) {
MOZ_ASSERT(index < getDenseInitializedLength());
MOZ_ASSERT(!denseElementsAreCopyOnWrite());
- MOZ_ASSERT(!denseElementsAreFrozen());
elements_[index].set(this, HeapSlot::Element, index, val);
}
+ public:
+ void setDenseInitializedLength(uint32_t length) {
+ MOZ_ASSERT(!denseElementsAreFrozen());
+ setDenseInitializedLengthUnchecked(length);
+ }
+
+ inline void ensureDenseInitializedLength(ExclusiveContext* cx,
+ uint32_t index, uint32_t extra);
+
+ void setDenseElement(uint32_t index, const Value& val) {
+ MOZ_ASSERT(!denseElementsAreFrozen());
+ setDenseElementUnchecked(index, val);
+ }
+
void initDenseElement(uint32_t index, const Value& val) {
MOZ_ASSERT(index < getDenseInitializedLength());
MOZ_ASSERT(!denseElementsAreCopyOnWrite());
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index d8b7d9f0aad0..fa12086a0061 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -175,9 +175,7 @@ GetShapeAttributes(JSObject* obj, Shape* shape)
if (IsImplicitDenseOrTypedArrayElement(shape)) {
if (obj->is())
return JSPROP_ENUMERATE | JSPROP_PERMANENT;
- if (obj->as().getElementsHeader()->isFrozen())
- return JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY;
- return JSPROP_ENUMERATE;
+ return obj->as().getElementsHeader()->elementAttributes();
}
return shape->attributes();
diff --git a/layout/reftests/w3c-css/submitted/masking/mask-image-6.html b/layout/reftests/w3c-css/submitted/masking/mask-image-6.html
index c865e992ca7b..ac31e4cf4ef3 100644
--- a/layout/reftests/w3c-css/submitted/masking/mask-image-6.html
+++ b/layout/reftests/w3c-css/submitted/masking/mask-image-6.html
@@ -17,6 +17,7 @@
font-size: 100px;
line-height: 100px;
mask-image: url(support/transparent-100x50-blue-100x50.png);
+ mask-position: center;
mask-repeat: repeat;
}
diff --git a/layout/reftests/w3c-css/submitted/masking/mask-repeat-1-ref.html b/layout/reftests/w3c-css/submitted/masking/mask-repeat-1-ref.html
index fe36924f932b..01ed86d1270b 100644
--- a/layout/reftests/w3c-css/submitted/masking/mask-repeat-1-ref.html
+++ b/layout/reftests/w3c-css/submitted/masking/mask-repeat-1-ref.html
@@ -34,9 +34,7 @@
-
+
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 7c5099f554dd..362d5c911549 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -12246,20 +12246,12 @@ CSSParserImpl::ParseImageLayersItem(
if (eCSSProperty_mask == aTable[nsStyleImageLayers::shorthand]) {
aState.mOrigin->mValue.SetIntValue(NS_STYLE_IMAGELAYER_ORIGIN_BORDER,
eCSSUnit_Enumerated);
- aState.mRepeat->mXValue.SetIntValue(NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT,
- eCSSUnit_Enumerated);
-
- positionXArr->Item(1).SetPercentValue(0.5f);
- positionYArr->Item(1).SetPercentValue(0.5f);
} else {
aState.mOrigin->mValue.SetIntValue(NS_STYLE_IMAGELAYER_ORIGIN_PADDING,
eCSSUnit_Enumerated);
- aState.mRepeat->mXValue.SetIntValue(NS_STYLE_IMAGELAYER_REPEAT_REPEAT,
- eCSSUnit_Enumerated);
-
- positionXArr->Item(1).SetPercentValue(0.0f);
- positionYArr->Item(1).SetPercentValue(0.0f);
}
+ positionXArr->Item(1).SetPercentValue(0.0f);
+ positionYArr->Item(1).SetPercentValue(0.0f);
aState.mSize->mXValue.SetAutoValue();
aState.mSize->mYValue.SetAutoValue();
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 7a35741a3ed3..766eea29085f 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -6142,7 +6142,7 @@ nsComputedDOMStyle::DoGetMask()
firstLayer.mMaskMode != NS_STYLE_MASK_MODE_MATCH_SOURCE ||
!nsStyleImageLayers::IsInitialPositionForLayerType(
firstLayer.mPosition, nsStyleImageLayers::LayerType::Mask) ||
- !firstLayer.mRepeat.IsInitialValue(nsStyleImageLayers::LayerType::Mask) ||
+ !firstLayer.mRepeat.IsInitialValue() ||
!firstLayer.mSize.IsInitialValue() ||
!(firstLayer.mImage.GetType() == eStyleImageType_Null ||
firstLayer.mImage.GetType() == eStyleImageType_Image)) {
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 60bb76fc4fa5..f0a63f82e92d 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -7259,7 +7259,7 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
// background-repeat: enum, inherit, initial [pair list]
nsStyleImageLayers::Repeat initialRepeat;
- initialRepeat.SetInitialValues(nsStyleImageLayers::LayerType::Background);
+ initialRepeat.SetInitialValues();
SetImageLayerPairList(aContext, *aRuleData->ValueForBackgroundRepeat(),
bg->mImage.mLayers,
parentBG->mImage.mLayers,
@@ -7308,9 +7308,7 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
// background-position-x/y: enum, length, percent (flags), inherit [list]
Position::Coord initialPositionCoord;
- initialPositionCoord.mPercent =
- nsStyleImageLayers::GetInitialPositionForLayerType(
- nsStyleImageLayers::LayerType::Background);
+ initialPositionCoord.mPercent = 0.0f;
initialPositionCoord.mLength = 0;
initialPositionCoord.mHasPercent = true;
@@ -9960,7 +9958,7 @@ nsRuleNode::ComputeSVGResetData(void* aStartStruct,
// mask-repeat: enum, inherit, initial [pair list]
nsStyleImageLayers::Repeat initialRepeat;
- initialRepeat.SetInitialValues(nsStyleImageLayers::LayerType::Mask);
+ initialRepeat.SetInitialValues();
SetImageLayerPairList(aContext, *aRuleData->ValueForMaskRepeat(),
svgReset->mMask.mLayers,
parentSVGReset->mMask.mLayers,
@@ -9991,9 +9989,7 @@ nsRuleNode::ComputeSVGResetData(void* aStartStruct,
// mask-position-x/y: enum, length, percent (flags), inherit [list]
Position::Coord initialPositionCoord;
- initialPositionCoord.mPercent =
- nsStyleImageLayers::GetInitialPositionForLayerType(
- nsStyleImageLayers::LayerType::Mask);
+ initialPositionCoord.mPercent = 0.0f;
initialPositionCoord.mLength = 0;
initialPositionCoord.mHasPercent = true;
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 16d9e80d9a5e..d8a20e433303 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2625,11 +2625,10 @@ nsStyleImageLayers::HasLayerWithImage() const
bool
nsStyleImageLayers::IsInitialPositionForLayerType(Position aPosition, LayerType aType)
{
- float intialValue = nsStyleImageLayers::GetInitialPositionForLayerType(aType);
- if (aPosition.mXPosition.mPercent == intialValue &&
+ if (aPosition.mXPosition.mPercent == 0.0f &&
aPosition.mXPosition.mLength == 0 &&
aPosition.mXPosition.mHasPercent &&
- aPosition.mYPosition.mPercent == intialValue &&
+ aPosition.mYPosition.mPercent == 0.0f &&
aPosition.mYPosition.mLength == 0 &&
aPosition.mYPosition.mHasPercent) {
return true;
@@ -2765,33 +2764,6 @@ nsStyleImageLayers::Size::operator==(const Size& aOther) const
(mHeightType != eLengthPercentage || mHeight == aOther.mHeight);
}
-bool
-nsStyleImageLayers::Repeat::IsInitialValue(LayerType aType) const
-{
- if (aType == LayerType::Background) {
- return mXRepeat == NS_STYLE_IMAGELAYER_REPEAT_REPEAT &&
- mYRepeat == NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
- } else {
- MOZ_ASSERT(aType == LayerType::Mask);
- return mXRepeat == NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT &&
- mYRepeat == NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT;
- }
-}
-
-void
-nsStyleImageLayers::Repeat::SetInitialValues(LayerType aType)
-{
- if (aType == LayerType::Background) {
- mXRepeat = NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
- mYRepeat = NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
- } else {
- MOZ_ASSERT(aType == LayerType::Mask);
-
- mXRepeat = NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT;
- mYRepeat = NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT;
- }
-}
-
nsStyleImageLayers::Layer::Layer()
: mClip(NS_STYLE_IMAGELAYER_CLIP_BORDER)
, mAttachment(NS_STYLE_IMAGELAYER_ATTACHMENT_SCROLL)
@@ -2810,11 +2782,9 @@ nsStyleImageLayers::Layer::~Layer()
void
nsStyleImageLayers::Layer::Initialize(nsStyleImageLayers::LayerType aType)
{
- mRepeat.SetInitialValues(aType);
+ mRepeat.SetInitialValues();
- float initialPositionValue =
- nsStyleImageLayers::GetInitialPositionForLayerType(aType);
- mPosition.SetInitialPercentValues(initialPositionValue);
+ mPosition.SetInitialPercentValues(0.0f);
if (aType == LayerType::Background) {
mOrigin = NS_STYLE_IMAGELAYER_ORIGIN_PADDING;
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 5a7e85197a30..1d4cb3e2f027 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -670,10 +670,6 @@ struct nsStyleImageLayers {
static bool IsInitialPositionForLayerType(mozilla::Position aPosition, LayerType aType);
- static float GetInitialPositionForLayerType(LayerType aType) {
- return (aType == LayerType::Background) ? 0.0f : 0.5f;
- }
-
struct Size;
friend struct Size;
struct Size {
@@ -745,7 +741,10 @@ struct nsStyleImageLayers {
// Initialize nothing
Repeat() {}
- bool IsInitialValue(LayerType aType) const;
+ bool IsInitialValue() const {
+ return mXRepeat == NS_STYLE_IMAGELAYER_REPEAT_REPEAT &&
+ mYRepeat == NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
+ }
bool DependsOnPositioningAreaSize() const {
return mXRepeat == NS_STYLE_IMAGELAYER_REPEAT_SPACE ||
@@ -753,7 +752,10 @@ struct nsStyleImageLayers {
}
// Initialize to initial values
- void SetInitialValues(LayerType aType);
+ void SetInitialValues() {
+ mXRepeat = NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
+ mYRepeat = NS_STYLE_IMAGELAYER_REPEAT_REPEAT;
+ }
bool operator==(const Repeat& aOther) const {
return mXRepeat == aOther.mXRepeat &&
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index eba700132337..337eff9cf50f 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -7021,49 +7021,49 @@ if (SupportsMaskShorthand()) {
type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
/* FIXME: All mask-border-* should be added when we implement them. */
subproperties: ["mask-clip", "mask-image", "mask-mode", "mask-origin", "mask-position-x", "mask-position-y", "mask-repeat", "mask-size" , "mask-composite"],
- initial_values: [ "match-source", "none", "no-repeat", "add", "50% 50%", "center center", "50% 50% / auto", "center / auto", "center center / auto", "50% 50% / auto auto",
- "center none", "center center none", "none center", "none center center", "none 50% 50%", "center / auto none",
- "center center / auto auto none",
- "match-source none no-repeat add center center", "center center no-repeat none add", "none no-repeat add center center / auto", "center center / auto no-repeat none add match-source", "none no-repeat add 50% 50% / auto auto match-source",
+ initial_values: [ "match-source", "none", "repeat", "add", "0% 0%", "top left", "0% 0% / auto", "top left / auto", "left top / auto", "0% 0% / auto auto",
+ "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "top left / auto none", "left top / auto none",
+ "top left / auto auto none",
+ "match-source none repeat add top left", "top left repeat none add", "none repeat add top left / auto", "top left / auto repeat none add match-source", "none repeat add 0% 0% / auto auto match-source",
"border-box", "border-box border-box" ],
other_values: [
- "none alpha no-repeat add center",
+ "none alpha repeat add left top",
"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)",
- "no-repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') alpha center add",
+ "no-repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') alpha left top add",
"repeat-x",
"repeat-y",
- "repeat",
- "none repeat-y alpha add 50% 50%",
+ "no-repeat",
+ "none repeat-y alpha add 0% 0%",
"subtract",
- "50% center subtract alpha no-repeat none",
+ "0% top subtract alpha repeat none",
"top",
"left",
- "0% 0%",
- "top left",
- "center / 100px",
- "center / contain",
- "center / cover",
+ "50% 50%",
+ "center",
+ "top / 100px",
+ "left / contain",
+ "left / cover",
"10px / 10%",
"10em / calc(20px)",
- "center center / 100px 100px",
- "center center / 100px auto",
- "center center / 100px 10%",
- "center center / 100px calc(20px)",
- "bottom right add none alpha no-repeat",
- "0% alpha",
- "alpha 0%",
- "0%",
+ "top left / 100px 100px",
+ "top left / 100px auto",
+ "top left / 100px 10%",
+ "top left / 100px calc(20px)",
+ "bottom right add none alpha repeat",
+ "50% alpha",
+ "alpha 50%",
+ "50%",
"url(#mymask)",
- "-moz-radial-gradient(10% bottom, #ffffff, black) add repeat",
- "-moz-linear-gradient(10px 10px -45deg, red, blue) no-repeat",
- "-moz-linear-gradient(10px 10px -0.125turn, red, blue) no-repeat",
- "-moz-repeating-radial-gradient(10% bottom, #ffffff, black) add repeat",
- "-moz-repeating-linear-gradient(10px 10px -45deg, red, blue) no-repeat",
+ "-moz-radial-gradient(10% bottom, #ffffff, black) add no-repeat",
+ "-moz-linear-gradient(10px 10px -45deg, red, blue) repeat",
+ "-moz-linear-gradient(10px 10px -0.125turn, red, blue) repeat",
+ "-moz-repeating-radial-gradient(10% bottom, #ffffff, black) add no-repeat",
+ "-moz-repeating-linear-gradient(10px 10px -45deg, red, blue) repeat",
"-moz-element(#test) alpha",
/* multiple mask-image */
"url(404.png), url(404.png)",
"repeat-x, subtract, none",
- "50% top url(404.png), url(404.png) 50% top",
+ "0% top url(404.png), url(404.png) 50% top",
"subtract repeat-y top left url(404.png), repeat-x alpha",
"url(404.png), -moz-linear-gradient(20px 20px -45deg, blue, green), -moz-element(#a) alpha",
"top left / contain, bottom right / cover",
@@ -7079,10 +7079,10 @@ if (SupportsMaskShorthand()) {
/* mixes with keywords have to be in correct order */
"50% left", "top 50%",
/* no quirks mode colors */
- "-moz-radial-gradient(10% bottom, ffffff, black) add repeat",
+ "-moz-radial-gradient(10% bottom, ffffff, black) add no-repeat",
/* no quirks mode lengths */
- "-moz-linear-gradient(10 10px -45deg, red, blue) no-repeat",
- "-moz-linear-gradient(10px 10 -45deg, red, blue) no-repeat",
+ "-moz-linear-gradient(10 10px -45deg, red, blue) repeat",
+ "-moz-linear-gradient(10px 10 -45deg, red, blue) repeat",
"linear-gradient(red -99, yellow, green, blue 120%)",
/* bug 258080: don't accept background-position separated */
"left url(404.png) top", "top url(404.png) left",
@@ -7147,9 +7147,8 @@ if (SupportsMaskShorthand()) {
domProp: "maskPosition",
inherited: false,
type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
- initial_values: [ "left 50% top 50%", "left 50% center", "center", "center center", "50% 50%", "50% center", "center 50%" ],
- other_values: [ "top", "left", "right", "bottom", "center bottom", "bottom center", "center right", "right center", "center top", "top center", "center left", "left center", "right bottom", "bottom right", "0%", "top left, top left", "top left, top right", "top right, top left", "left top, 0% 0%", "10% 20%, 30%, 40%", "top left, bottom right", "right bottom, left top", "0%", "0px", "30px", "0%, 10%, 20%, 30%", "top, top, top, top, top",
- "top 0% left 0%", "top 0% left", "top left", "left top", "0% 0%", "0% top", "left 0%",
+ initial_values: [ "top 0% left 0%", "top 0% left", "top left", "left top", "0% 0%", "0% top", "left 0%" ],
+ other_values: [ "top", "left", "right", "bottom", "center", "center bottom", "bottom center", "center right", "right center", "center top", "top center", "center left", "left center", "right bottom", "bottom right", "50%", "top left, top left", "top left, top right", "top right, top left", "left top, 0% 0%", "10% 20%, 30%, 40%", "top left, bottom right", "right bottom, left top", "0%", "0px", "30px", "0%, 10%, 20%, 30%", "top, top, top, top, top",
"calc(20px)",
"calc(20px) 10px",
"10px calc(20px)",
@@ -7191,8 +7190,8 @@ if (SupportsMaskShorthand()) {
domProp: "maskPositionX",
inherited: false,
type: CSS_TYPE_LONGHAND,
- initial_values: [ "center", "50%" ],
- other_values: [ "right", "left", "0%", "left, left", "left, right", "right, left", "left, 0%", "10%, 20%, 40%", "0px", "30px", "0%, 10%, 20%, 30%", "left, left, left, left, left",
+ initial_values: [ "left", "0%" ],
+ other_values: [ "right", "center", "50%", "center, center", "center, right", "right, center", "center, 50%", "10%, 20%, 40%", "1px", "30px", "50%, 10%, 20%, 30%", "center, center, center, center, center",
"calc(20px)",
"calc(20px + 1em)",
"calc(20px / 2)",
@@ -7217,8 +7216,8 @@ if (SupportsMaskShorthand()) {
domProp: "maskPositionY",
inherited: false,
type: CSS_TYPE_LONGHAND,
- initial_values: [ "center", "50%" ],
- other_values: [ "bottom", "top", "0%", "top, top", "top, bottom", "bottom, top", "top, 0%", "10%, 20%, 40%", "0px", "30px", "0%, 10%, 20%, 30%", "top, top, top, top, top",
+ initial_values: [ "top", "0%" ],
+ other_values: [ "bottom", "center", "50%", "center, center", "center, bottom", "bottom, center", "center, 0%", "10%, 20%, 40%", "1px", "30px", "50%, 10%, 20%, 30%", "center, center, center, center, center",
"calc(20px)",
"calc(20px + 1em)",
"calc(20px / 2)",
@@ -7243,15 +7242,16 @@ if (SupportsMaskShorthand()) {
domProp: "maskRepeat",
inherited: false,
type: CSS_TYPE_LONGHAND,
- initial_values: [ "no-repeat", "no-repeat no-repeat" ],
- other_values: [ "repeat-x", "repeat-y", "repeat",
+ initial_values: [ "repeat", "repeat repeat" ],
+ other_values: [ "repeat-x", "repeat-y", "no-repeat",
"repeat-x, repeat-x",
- "no-repeat, repeat",
- "repeat-y, repeat, repeat-y",
- "no-repeat, no-repeat, no-repeat",
- "no-repeat repeat",
+ "repeat, no-repeat",
+ "repeat-y, no-repeat, repeat-y",
+ "repeat, repeat, repeat",
+ "repeat no-repeat",
+ "no-repeat repeat",
+ "no-repeat no-repeat",
"repeat no-repeat",
- "repeat repeat",
"no-repeat no-repeat, no-repeat no-repeat",
],
invalid_values: [ "repeat repeat repeat",
diff --git a/layout/style/test/test_computed_style.html b/layout/style/test/test_computed_style.html
index 194bb85268d3..1961f99e9908 100644
--- a/layout/style/test/test_computed_style.html
+++ b/layout/style/test/test_computed_style.html
@@ -277,14 +277,14 @@ var noframe_container = document.getElementById("content");
"mask-mode": [
"alpha", "luminance"
],
- // any mask-position value other then "50%" "50% 50%" "center"
+ // any mask-position value other then "0%" "top" "left"
// "center center".
"mask-position": [
- "left", "right", "top", "bottom", "0%", "100%"
+ "0%", "center", "right", "bottom", "50%", "100%"
],
- // any mask-repeat value other then "no-repeat" "no-repeat no-repeat".
+ // any mask-repeat value other then "repeat" "repeat repeat".
"mask-repeat": [
- "repeat-x", "repeat-y", "repeat", "space", "round"
+ "repeat-x", "repeat-y", "no-repeat", "space", "round"
],
// any mask-size value other then "auto" "auto auto".
"mask-size": [
@@ -310,10 +310,10 @@ var noframe_container = document.getElementById("content");
"match-source"
],
"mask-position": [
- "50%", "50% 50%", "center"
+ "0% 0%", "left top"
],
"mask-repeat": [
- "no-repeat", "no-repeat no-repeat"
+ "repeat", "repeat repeat"
],
"mask-size": [
"auto", "auto auto"
diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
index 5437d659bd58..6e706e49c228 100644
--- a/layout/xul/nsMenuPopupFrame.cpp
+++ b/layout/xul/nsMenuPopupFrame.cpp
@@ -880,6 +880,13 @@ nsMenuPopupFrame::ShowPopup(bool aIsContextMenu)
// Clear mouse capture when a popup is opened.
if (mPopupType == ePopupTypeMenu) {
+ EventStateManager* activeESM =
+ static_cast(
+ EventStateManager::GetActiveEventStateManager());
+ if (activeESM) {
+ EventStateManager::ClearGlobalActiveContent(activeESM);
+ }
+
nsIPresShell::SetCapturingContent(nullptr, 0);
}
diff --git a/media/mtransport/nricectx.cpp b/media/mtransport/nricectx.cpp
index a12b8d2d9dad..8fbd6894a1ae 100644
--- a/media/mtransport/nricectx.cpp
+++ b/media/mtransport/nricectx.cpp
@@ -243,11 +243,6 @@ nsresult NrIceTurnServer::ToNicerTurnStruct(nr_ice_turn_server *server) const {
if (NS_FAILED(rv))
return rv;
- if (username_.empty())
- return NS_ERROR_INVALID_ARG;
- if (password_.empty())
- return NS_ERROR_INVALID_ARG;
-
if (!(server->username=r_strdup(username_.c_str())))
return NS_ERROR_OUT_OF_MEMORY;
diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c b/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
index fb05287c08b3..08810a92dc3a 100644
--- a/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
@@ -672,7 +672,7 @@ static int nr_ice_get_default_local_address(nr_ice_ctx *ctx, int ip_version, nr_
if ((r=nr_ice_get_default_address(ctx, ip_version, &default_addr)))
ABORT(r);
- for(i=0; iaddr, &default_addr)))
+ ABORT(r);
+ strlcpy(addrp->addr.ifname, "default route", sizeof(addrp->addr.ifname));
+ }
_status=0;
abort:
@@ -700,11 +704,10 @@ static int nr_ice_get_local_addresses(nr_ice_ctx *ctx)
if (!ctx->local_addrs) {
/* First, gather all the local addresses we have */
if((r=nr_stun_find_local_addresses(local_addrs,MAXADDRS,&addr_ct))) {
- r_log(LOG_ICE,LOG_ERR,"ICE(%s): unable to find local addresses",ctx->label);
- ABORT(r);
+ r_log(LOG_ICE,LOG_ERR,"ICE(%s): unable to gather local addresses, trying default route",ctx->label);
}
- if (ctx->force_net_interface[0]) {
+ if (ctx->force_net_interface[0] && addr_ct) {
/* Limit us to only addresses on a single interface */
int force_addr_ct = 0;
for(i=0;iflags & NR_ICE_CTX_FLAGS_ONLY_DEFAULT_ADDRS) {
+ if ((!addr_ct) || (ctx->flags & NR_ICE_CTX_FLAGS_ONLY_DEFAULT_ADDRS)) {
/* Get just the default IPv4 and IPv6 addrs */
if(!nr_ice_get_default_local_address(ctx, NR_IPV4, local_addrs, addr_ct,
&default_addrs[default_addr_ct])) {
@@ -731,6 +734,10 @@ static int nr_ice_get_local_addresses(nr_ice_ctx *ctx)
&default_addrs[default_addr_ct])) {
++default_addr_ct;
}
+ if (!default_addr_ct) {
+ r_log(LOG_ICE,LOG_ERR,"ICE(%s): failed to find default addresses",ctx->label);
+ ABORT(R_FAILED);
+ }
addrs = default_addrs;
addr_ct = default_addr_ct;
}
diff --git a/media/mtransport/third_party/nICEr/src/net/local_addr.c b/media/mtransport/third_party/nICEr/src/net/local_addr.c
index fd710b0ef1f5..c251f2215d56 100644
--- a/media/mtransport/third_party/nICEr/src/net/local_addr.c
+++ b/media/mtransport/third_party/nICEr/src/net/local_addr.c
@@ -56,5 +56,6 @@ int nr_local_addr_fmt_info_string(nr_local_addr *addr, char *buf, int len)
snprintf(buf, len, "%s%s, estimated speed: %d kbps",
vpn, type, addr->interface.estimated_speed);
+ buf[len - 1] = '\0';
return (0);
}
diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs.c b/media/mtransport/third_party/nICEr/src/stun/addrs.c
index ef13621f095a..6c7bc7a4bb91 100644
--- a/media/mtransport/third_party/nICEr/src/stun/addrs.c
+++ b/media/mtransport/third_party/nICEr/src/stun/addrs.c
@@ -149,9 +149,11 @@ abort:
static int
stun_get_win32_addrs(nr_local_addr addrs[], int maxaddrs, int *count)
{
- int r,_status;
+ int r, _status;
PIP_ADAPTER_ADDRESSES AdapterAddresses = NULL, tmpAddress = NULL;
- ULONG buflen;
+ // recomended per https://msdn.microsoft.com/en-us/library/windows/desktop/aa365915(v=vs.85).aspx
+ static const ULONG initialBufLen = 15000;
+ ULONG buflen = initialBufLen;
char bin_hashed_ifname[NR_MD5_HASH_LENGTH];
char hex_hashed_ifname[MAXIFNAME];
int n = 0;
@@ -159,31 +161,30 @@ stun_get_win32_addrs(nr_local_addr addrs[], int maxaddrs, int *count)
*count = 0;
if (maxaddrs <= 0)
- ABORT(R_INTERNAL);
+ ABORT(R_BAD_ARGS);
- /* Call GetAdaptersAddresses() twice. First, just to get the buf length */
+ /* According to MSDN (see above) we have try GetAdapterAddresses() multiple times */
+ for (n = 0; n < 5; n++) {
+ AdapterAddresses = (PIP_ADAPTER_ADDRESSES) RMALLOC(buflen);
+ if (AdapterAddresses == NULL) {
+ r_log(NR_LOG_STUN, LOG_ERR, "Error allocating buf for GetAdaptersAddresses()");
+ ABORT(R_NO_MEMORY);
+ }
- buflen = 0;
+ r = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER, NULL, AdapterAddresses, &buflen);
+ if (r == NO_ERROR) {
+ break;
+ }
+ r_log(NR_LOG_STUN, LOG_ERR, "GetAdaptersAddresses() returned error (%d)", r);
+ RFREE(AdapterAddresses);
+ }
- r = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterAddresses, &buflen);
- if (r != ERROR_BUFFER_OVERFLOW) {
- r_log(NR_LOG_STUN, LOG_ERR, "Error getting buf len from GetAdaptersAddresses()");
+ if (n >= 5) {
+ r_log(NR_LOG_STUN, LOG_ERR, "5 failures calling GetAdaptersAddresses()");
ABORT(R_INTERNAL);
}
- AdapterAddresses = (PIP_ADAPTER_ADDRESSES) RMALLOC(buflen);
- if (AdapterAddresses == NULL) {
- r_log(NR_LOG_STUN, LOG_ERR, "Error allocating buf for GetAdaptersAddresses()");
- ABORT(R_NO_MEMORY);
- }
-
- /* for real, this time */
-
- r = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterAddresses, &buflen);
- if (r != NO_ERROR) {
- r_log(NR_LOG_STUN, LOG_ERR, "Error getting addresses from GetAdaptersAddresses()");
- ABORT(R_INTERNAL);
- }
+ n = 0;
/* Loop through the adapters */
@@ -258,7 +259,10 @@ stun_getifaddrs(nr_local_addr addrs[], int maxaddrs, int *count)
struct ifaddrs* if_addrs_head=NULL;
struct ifaddrs* if_addr;
- *count=0;
+ *count = 0;
+
+ if (maxaddrs <= 0)
+ ABORT(R_BAD_ARGS);
if (getifaddrs(&if_addrs_head) == -1) {
r_log(NR_LOG_STUN, LOG_ERR, "getifaddrs error e = %d", errno);
@@ -395,6 +399,7 @@ nr_stun_remove_duplicate_addrs(nr_local_addr addrs[], int remove_loopback, int r
*count = n;
+ memset(addrs, 0, *count * sizeof(*addrs));
/* copy temporary array into passed in/out array */
for (i = 0; i < *count; ++i) {
if ((r=nr_local_addr_copy(&addrs[i], &tmp[i])))
@@ -412,7 +417,7 @@ nr_stun_remove_duplicate_addrs(nr_local_addr addrs[], int remove_loopback, int r
int
nr_stun_get_addrs(nr_local_addr addrs[], int maxaddrs, int drop_loopback, int drop_link_local, int *count)
{
- int _status=0;
+ int r,_status=0;
int i;
char typestr[100];
@@ -422,14 +427,16 @@ nr_stun_get_addrs(nr_local_addr addrs[], int maxaddrs, int drop_loopback, int dr
_status = stun_getifaddrs(addrs, maxaddrs, count);
#endif
- nr_stun_remove_duplicate_addrs(addrs, drop_loopback, drop_link_local, count);
+ if ((r=nr_stun_remove_duplicate_addrs(addrs, drop_loopback, drop_link_local, count)))
+ ABORT(r);
for (i = 0; i < *count; ++i) {
- nr_local_addr_fmt_info_string(addrs+i,typestr,sizeof(typestr));
- r_log(NR_LOG_STUN, LOG_DEBUG, "Address %d: %s on %s, type: %s\n",
+ nr_local_addr_fmt_info_string(addrs+i,typestr,sizeof(typestr));
+ r_log(NR_LOG_STUN, LOG_DEBUG, "Address %d: %s on %s, type: %s\n",
i,addrs[i].addr.as_string,addrs[i].addr.ifname,typestr);
}
+abort:
return _status;
}
diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_util.c b/media/mtransport/third_party/nICEr/src/stun/stun_util.c
index a881e5f97ed8..e347e542f482 100644
--- a/media/mtransport/third_party/nICEr/src/stun/stun_util.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_util.c
@@ -119,12 +119,12 @@ int
nr_stun_find_local_addresses(nr_local_addr addrs[], int maxaddrs, int *count)
{
int r,_status;
- NR_registry *children = 0;
+ //NR_registry *children = 0;
+
+ *count = 0;
if ((r=NR_reg_get_child_count(NR_STUN_REG_PREF_ADDRESS_PRFX, (unsigned int*)count)))
- if (r == R_NOT_FOUND)
- *count = 0;
- else
+ if (r != R_NOT_FOUND)
ABORT(r);
if (*count == 0) {
@@ -182,7 +182,7 @@ nr_stun_find_local_addresses(nr_local_addr addrs[], int maxaddrs, int *count)
_status=0;
abort:
- RFREE(children);
+ //RFREE(children);
return _status;
}
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.mm b/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.mm
index 1ee1029b51fb..e309df5996c6 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.mm
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.mm
@@ -162,7 +162,14 @@ using namespace videocapturemodule;
*width = videoDimensions.width;
*height = videoDimensions.height;
- *maxFPS = maxFrameRateRange.maxFrameRate;
+
+ // This is to fix setCaptureHeight() which fails for some webcams supporting non-integer framerates.
+ // In setCaptureHeight(), we match the best framerate range by searching a range whose max framerate
+ // is most close to (but smaller than or equal to) the target. Since maxFPS of capability is integer,
+ // we fill in the capability maxFPS with the floor value (e.g., 29) of the real supported fps
+ // (e.g., 29.97). If the target is set to 29, we failed to match the best format with max framerate
+ // 29.97 since it is over the target. Therefore, we need to return a ceiling value as the maxFPS here.
+ *maxFPS = static_cast(ceil(maxFrameRateRange.maxFrameRate));
*rawType = [VideoCaptureMacAVFoundationUtility fourCCToRawVideoType:CMFormatDescriptionGetMediaSubType(format.formatDescription)];
return [NSNumber numberWithInt:0];
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm b/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm
index 467817303cb9..dc6b696f5cb7 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm
@@ -238,32 +238,36 @@ using namespace videocapturemodule;
return;
}
+ CMFormatDescriptionRef formatDescription =
+ CMSampleBufferGetFormatDescription(sampleBuffer);
+ webrtc::RawVideoType rawType =
+ [VideoCaptureMacAVFoundationUtility fourCCToRawVideoType:CMFormatDescriptionGetMediaSubType(formatDescription)];
+ CMVideoDimensions dimensions =
+ CMVideoFormatDescriptionGetDimensions(formatDescription);
+
VideoCaptureCapability tempCaptureCapability;
- tempCaptureCapability.width = _frameWidth;
- tempCaptureCapability.height = _frameHeight;
+ tempCaptureCapability.width = dimensions.width;
+ tempCaptureCapability.height = dimensions.height;
tempCaptureCapability.maxFPS = _frameRate;
- tempCaptureCapability.rawType = _rawType;
+ tempCaptureCapability.rawType = rawType;
- if (webrtc::kVideoMJPEG == _rawType) {
- CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);
+ CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);
- if (blockBuffer) {
- char* baseAddress;
- size_t frameSize;
- size_t lengthAtOffset;
- CMBlockBufferGetDataPointer(blockBuffer, 0, &lengthAtOffset, &frameSize, &baseAddress);
+ if (blockBuffer) {
+ char* baseAddress;
+ size_t frameSize;
+ size_t lengthAtOffset;
+ CMBlockBufferGetDataPointer(blockBuffer, 0, &lengthAtOffset, &frameSize, &baseAddress);
- NSAssert(lengthAtOffset == frameSize, @"lengthAtOffset != frameSize)");
+ NSAssert(lengthAtOffset == frameSize, @"lengthAtOffset != frameSize)");
- _owner->IncomingFrame((unsigned char*)baseAddress, frameSize,
+ _owner->IncomingFrame((unsigned char*)baseAddress, frameSize,
tempCaptureCapability, 0);
- }
} else {
// Get a CMSampleBuffer's Core Video image buffer for the media data
CVImageBufferRef videoFrame = CMSampleBufferGetImageBuffer(sampleBuffer);
- const int kFlags = 0;
- if (CVPixelBufferLockBaseAddress(videoFrame, kFlags) == kCVReturnSuccess) {
+ if (CVPixelBufferLockBaseAddress(videoFrame, kCVPixelBufferLock_ReadOnly) == kCVReturnSuccess) {
void* baseAddress = CVPixelBufferGetBaseAddress(videoFrame);
size_t bytesPerRow = CVPixelBufferGetBytesPerRow(videoFrame);
size_t frameHeight = CVPixelBufferGetHeight(videoFrame);
@@ -271,7 +275,7 @@ using namespace videocapturemodule;
_owner->IncomingFrame((unsigned char*)baseAddress, frameSize,
tempCaptureCapability, 0);
- CVPixelBufferUnlockBaseAddress(videoFrame, kFlags);
+ CVPixelBufferUnlockBaseAddress(videoFrame, kCVPixelBufferLock_ReadOnly);
}
}
[_lock unlock];
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 8cad5465ec61..ba4b99f08129 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -624,6 +624,8 @@ pref("media.android-remote-codec.enabled", false);
// Enable MSE
pref("media.mediasource.enabled", true);
+pref("media.mediadrm-widevinecdm.visible", true);
+
// optimize images memory usage
pref("image.downscale-during-decode.enabled", true);
diff --git a/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java b/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
new file mode 100644
index 000000000000..b9253f057fd9
--- /dev/null
+++ b/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
@@ -0,0 +1,91 @@
+/* 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/. */
+
+
+package org.mozilla.gecko.media;
+
+import java.util.UUID;
+
+import org.mozilla.gecko.annotation.WrapForJNI;
+import org.mozilla.gecko.AppConstants;
+
+import android.media.MediaCodecInfo;
+import android.media.MediaCodecList;
+import android.media.MediaCrypto;
+import android.media.MediaDrm;
+import android.util.Log;
+import android.os.Build;
+
+public final class MediaDrmProxy {
+ private static final String LOGTAG = "GeckoMediaDrmProxy";
+ private static final boolean DEBUG = false;
+ private static final UUID WIDEVINE_SCHEME_UUID =
+ new UUID(0xedef8ba979d64aceL, 0xa3c827dcd51d21edL);
+
+ private static final String WIDEVINE_KEY_SYSTEM = "com.widevine.alpha";
+ @WrapForJNI
+ private static final String AAC = "audio/mp4a-latm";
+ @WrapForJNI
+ private static final String AVC = "video/avc";
+ @WrapForJNI
+ private static final String VORBIS = "audio/vorbis";
+ @WrapForJNI
+ private static final String VP8 = "video/x-vnd.on2.vp8";
+ @WrapForJNI
+ private static final String VP9 = "video/x-vnd.on2.vp9";
+ @WrapForJNI
+ private static final String OPUS = "audio/opus";
+
+ private static boolean isSystemSupported() {
+ // Support versions >= LOLLIPOP
+ if (AppConstants.Versions.preLollipop) {
+ if (DEBUG) Log.d(LOGTAG, "System Not supported !!, current SDK version is " + Build.VERSION.SDK_INT);
+ return false;
+ }
+ return true;
+ }
+
+ @WrapForJNI
+ public static boolean isSchemeSupported(String keySystem) {
+ if (!isSystemSupported()) {
+ return false;
+ }
+ if (keySystem.equals(WIDEVINE_KEY_SYSTEM)) {
+ return MediaDrm.isCryptoSchemeSupported(WIDEVINE_SCHEME_UUID)
+ && MediaCrypto.isCryptoSchemeSupported(WIDEVINE_SCHEME_UUID);
+ }
+ if (DEBUG) Log.d(LOGTAG, "isSchemeSupported key sytem = " + keySystem);
+ return false;
+ }
+
+ @WrapForJNI
+ public static boolean IsCryptoSchemeSupported(String keySystem,
+ String container) {
+ if (!isSystemSupported()) {
+ return false;
+ }
+ if (keySystem.equals(WIDEVINE_KEY_SYSTEM)) {
+ return MediaDrm.isCryptoSchemeSupported(WIDEVINE_SCHEME_UUID, container);
+ }
+ if (DEBUG) Log.d(LOGTAG, "cannot decrypt key sytem = " + keySystem + ", container = " + container);
+ return false;
+ }
+
+ @WrapForJNI
+ public static boolean CanDecode(String mimeType) {
+ for (int i = 0; i < MediaCodecList.getCodecCount(); ++i) {
+ MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
+ if (info.isEncoder()) {
+ continue;
+ }
+ for (String m : info.getSupportedTypes()) {
+ if (m.equals(mimeType)) {
+ return true;
+ }
+ }
+ }
+ if (DEBUG) Log.d(LOGTAG, "cannot decode mimetype = " + mimeType);
+ return false;
+ }
+}
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index c11da8b9bba4..6553ac37f000 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -557,6 +557,7 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'media/FormatParam.java',
'media/JellyBeanAsyncCodec.java',
'media/MediaControlService.java',
+ 'media/MediaDrmProxy.java',
'media/MediaManager.java',
'media/RemoteManager.java',
'media/Sample.java',
diff --git a/python/mozboot/mozboot/archlinux.py b/python/mozboot/mozboot/archlinux.py
index 01142715f886..12ce6b4a4692 100644
--- a/python/mozboot/mozboot/archlinux.py
+++ b/python/mozboot/mozboot/archlinux.py
@@ -168,8 +168,8 @@ class ArchlinuxBootstrapper(BaseBootstrapper):
self.run_as_root(command)
- def run(self, command):
- subprocess.check_call(command, stdin=sys.stdin)
+ def run(self, command, env=None):
+ subprocess.check_call(command, stdin=sys.stdin, env=env)
def download(self, uri):
command = ['curl', '-L', '-O', uri]
@@ -189,8 +189,10 @@ class ArchlinuxBootstrapper(BaseBootstrapper):
def makepkg(self, name):
command = ['makepkg', '-s']
- self.run(command)
- pack = glob.glob(name + '*.tar.xz')[0]
+ makepkg_env = os.environ.copy()
+ makepkg_env['PKGEXT'] = '.pkg.tar.xz'
+ self.run(command, env=makepkg_env)
+ pack = glob.glob(name + '*.pkg.tar.xz')[0]
command = ['pacman', '-U']
if self.no_interactive:
command.append('--noconfirm')
diff --git a/browser/locales/searchjson.py b/python/mozbuild/mozbuild/action/generate_searchjson.py
similarity index 100%
rename from browser/locales/searchjson.py
rename to python/mozbuild/mozbuild/action/generate_searchjson.py
diff --git a/browser/locales/searchplugins.py b/python/mozbuild/mozbuild/action/output_searchplugins_list.py
similarity index 100%
rename from browser/locales/searchplugins.py
rename to python/mozbuild/mozbuild/action/output_searchplugins_list.py
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
index cc8e74be800a..12b2a27c458b 100644
--- a/python/mozbuild/mozbuild/backend/common.py
+++ b/python/mozbuild/mozbuild/backend/common.py
@@ -4,6 +4,7 @@
from __future__ import absolute_import, unicode_literals
+import cPickle as pickle
import itertools
import json
import os
@@ -370,19 +371,18 @@ class CommonBackend(BuildBackend):
# Write out a machine-readable file describing every test.
topobjdir = self.environment.topobjdir
- with self._write_file(mozpath.join(topobjdir, 'all-tests.json')) as fh:
- json.dump(self._test_manager.tests_by_path, fh)
+ with self._write_file(mozpath.join(topobjdir, 'all-tests.pkl'), mode='rb') as fh:
+ pickle.dump(dict(self._test_manager.tests_by_path), fh, protocol=2)
- with self._write_file(mozpath.join(topobjdir, 'test-defaults.json')) as fh:
- json.dump(self._test_manager.manifest_defaults, fh)
+ with self._write_file(mozpath.join(topobjdir, 'test-defaults.pkl'), mode='rb') as fh:
+ pickle.dump(self._test_manager.manifest_defaults, fh, protocol=2)
- path = mozpath.join(self.environment.topobjdir, 'test-installs.json')
- with self._write_file(path) as fh:
- json.dump({k: v for k, v in self._test_manager.installs_by_path.items()
- if k in self._test_manager.deferred_installs},
- fh,
- sort_keys=True,
- indent=4)
+ path = mozpath.join(self.environment.topobjdir, 'test-installs.pkl')
+ with self._write_file(path, mode='rb') as fh:
+ pickle.dump({k: v for k, v in self._test_manager.installs_by_path.items()
+ if k in self._test_manager.deferred_installs},
+ fh,
+ protocol=2)
# Write out a machine-readable file describing binaries.
with self._write_file(mozpath.join(topobjdir, 'binaries.json')) as fh:
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index df4fa958d3eb..87f50f497379 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
+import cPickle as pickle
import json
import os
import unittest
@@ -524,11 +525,11 @@ class TestRecursiveMakeBackend(BackendTester):
'[include:xpcshell.ini]',
])
- all_tests_path = mozpath.join(env.topobjdir, 'all-tests.json')
+ all_tests_path = mozpath.join(env.topobjdir, 'all-tests.pkl')
self.assertTrue(os.path.exists(all_tests_path))
- with open(all_tests_path, 'rt') as fh:
- o = json.load(fh)
+ with open(all_tests_path, 'rb') as fh:
+ o = pickle.load(fh)
self.assertIn('xpcshell.js', o)
self.assertIn('dir1/test_bar.js', o)
@@ -550,12 +551,12 @@ class TestRecursiveMakeBackend(BackendTester):
def test_test_manifest_deffered_installs_written(self):
"""Shared support files are written to their own data file by the backend."""
env = self._consume('test-manifest-shared-support', RecursiveMakeBackend)
- all_tests_path = mozpath.join(env.topobjdir, 'all-tests.json')
+ all_tests_path = mozpath.join(env.topobjdir, 'all-tests.pkl')
self.assertTrue(os.path.exists(all_tests_path))
- test_installs_path = mozpath.join(env.topobjdir, 'test-installs.json')
+ test_installs_path = mozpath.join(env.topobjdir, 'test-installs.pkl')
with open(test_installs_path, 'r') as fh:
- test_installs = json.load(fh)
+ test_installs = pickle.load(fh)
self.assertEqual(set(test_installs.keys()),
set(['child/test_sub.js',
@@ -572,7 +573,7 @@ class TestRecursiveMakeBackend(BackendTester):
# First, read the generated for ini manifest contents.
m = InstallManifest(path=test_files_manifest)
- # Then, synthesize one from the test-installs.json file. This should
+ # Then, synthesize one from the test-installs.pkl file. This should
# allow us to re-create a subset of the above.
synthesized_manifest = InstallManifest()
for item, installs in test_installs.items():
@@ -850,11 +851,11 @@ class TestRecursiveMakeBackend(BackendTester):
"""Ensure test suites honor package_tests=False."""
env = self._consume('test-manifests-package-tests', RecursiveMakeBackend)
- all_tests_path = mozpath.join(env.topobjdir, 'all-tests.json')
+ all_tests_path = mozpath.join(env.topobjdir, 'all-tests.pkl')
self.assertTrue(os.path.exists(all_tests_path))
- with open(all_tests_path, 'rt') as fh:
- o = json.load(fh)
+ with open(all_tests_path, 'rb') as fh:
+ o = pickle.load(fh)
self.assertIn('mochitest.js', o)
self.assertIn('not_packaged.java', o)
diff --git a/python/mozbuild/mozbuild/test/test_preprocessor.py b/python/mozbuild/mozbuild/test/test_preprocessor.py
index b0d0748afedd..9aba948538a9 100644
--- a/python/mozbuild/mozbuild/test/test_preprocessor.py
+++ b/python/mozbuild/mozbuild/test/test_preprocessor.py
@@ -619,13 +619,13 @@ class TestPreprocessor(unittest.TestCase):
with MockedOpen({'f': '#include foo\n'}):
with self.assertRaises(Preprocessor.Error) as e:
self.pp.do_include('f')
- self.assertEqual(e.key, 'FILE_NOT_FOUND')
+ self.assertEqual(e.exception.key, 'FILE_NOT_FOUND')
def test_include_undefined_variable(self):
with MockedOpen({'f': '#filter substitution\n#include @foo@\n'}):
with self.assertRaises(Preprocessor.Error) as e:
self.pp.do_include('f')
- self.assertEqual(e.key, 'UNDEFINED_VAR')
+ self.assertEqual(e.exception.key, 'UNDEFINED_VAR')
def test_include_literal_at(self):
files = {
diff --git a/python/mozbuild/mozbuild/test/test_testing.py b/python/mozbuild/mozbuild/test/test_testing.py
index 853109413482..e71892e241ae 100644
--- a/python/mozbuild/mozbuild/test/test_testing.py
+++ b/python/mozbuild/mozbuild/test/test_testing.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
+import cPickle as pickle
import os
import shutil
import tempfile
@@ -21,8 +22,7 @@ from mozbuild.testing import (
)
-ALL_TESTS_JSON = b'''
-{
+ALL_TESTS = {
"accessible/tests/mochitest/actions/test_anchors.html": [
{
"dir_relpath": "accessible/tests/mochitest/actions",
@@ -154,11 +154,11 @@ ALL_TESTS_JSON = b'''
"tags": "devtools"
}
]
-}'''.strip()
+}
-TEST_DEFAULTS = b'''{
- "/Users/gps/src/firefox/toolkit/mozapps/update/test/unit/xpcshell_updater.ini": {"support-files": "\\ndata/**\\nxpcshell_updater.ini"}
-}'''
+TEST_DEFAULTS = {
+ "/Users/gps/src/firefox/toolkit/mozapps/update/test/unit/xpcshell_updater.ini": {"support-files": "\ndata/**\nxpcshell_updater.ini"}
+}
class Base(unittest.TestCase):
@@ -172,13 +172,13 @@ class Base(unittest.TestCase):
self._temp_files = []
def _get_test_metadata(self):
- all_tests = NamedTemporaryFile()
- all_tests.write(ALL_TESTS_JSON)
+ all_tests = NamedTemporaryFile(mode='wb')
+ pickle.dump(ALL_TESTS, all_tests)
all_tests.flush()
self._temp_files.append(all_tests)
- test_defaults = NamedTemporaryFile()
- test_defaults.write(TEST_DEFAULTS)
+ test_defaults = NamedTemporaryFile(mode='wb')
+ pickle.dump(TEST_DEFAULTS, test_defaults)
test_defaults.flush()
self._temp_files.append(test_defaults)
@@ -251,10 +251,10 @@ class TestTestResolver(Base):
topobjdir = tempfile.mkdtemp()
self._temp_dirs.append(topobjdir)
- with open(os.path.join(topobjdir, 'all-tests.json'), 'wt') as fh:
- fh.write(ALL_TESTS_JSON)
- with open(os.path.join(topobjdir, 'test-defaults.json'), 'wt') as fh:
- fh.write(TEST_DEFAULTS)
+ with open(os.path.join(topobjdir, 'all-tests.pkl'), 'wb') as fh:
+ pickle.dump(ALL_TESTS, fh)
+ with open(os.path.join(topobjdir, 'test-defaults.pkl'), 'wb') as fh:
+ pickle.dump(TEST_DEFAULTS, fh)
o = MozbuildObject(self.FAKE_TOPSRCDIR, None, None, topobjdir=topobjdir)
diff --git a/python/mozbuild/mozbuild/testing.py b/python/mozbuild/mozbuild/testing.py
index ac891d4b9c98..3409f98219c5 100644
--- a/python/mozbuild/mozbuild/testing.py
+++ b/python/mozbuild/mozbuild/testing.py
@@ -4,7 +4,7 @@
from __future__ import absolute_import, unicode_literals
-import json
+import cPickle as pickle
import os
import sys
@@ -56,12 +56,12 @@ class TestMetadata(object):
self._tests_by_flavor = defaultdict(set)
self._test_dirs = set()
- with open(all_tests, 'rt') as fh:
- test_data = json.load(fh)
+ with open(all_tests, 'rb') as fh:
+ test_data = pickle.load(fh)
defaults = None
if test_defaults:
- with open(test_defaults, 'rt') as fh:
- defaults = json.load(fh)
+ with open(test_defaults, 'rb') as fh:
+ defaults = pickle.load(fh)
for path, tests in test_data.items():
for metadata in tests:
if defaults:
@@ -178,14 +178,14 @@ class TestResolver(MozbuildObject):
# If installing tests is going to result in re-generating the build
# backend, we need to do this here, so that the updated contents of
- # all-tests.json make it to the set of tests to run.
+ # all-tests.pkl make it to the set of tests to run.
self._run_make(target='run-tests-deps', pass_thru=True,
print_directory=False)
self._tests = TestMetadata(os.path.join(self.topobjdir,
- 'all-tests.json'),
+ 'all-tests.pkl'),
test_defaults=os.path.join(self.topobjdir,
- 'test-defaults.json'))
+ 'test-defaults.pkl'))
self._test_rewrites = {
'a11y': os.path.join(self.topobjdir, '_tests', 'testing',
@@ -417,9 +417,9 @@ def _resolve_installs(paths, topobjdir, manifest):
by the build backend corresponding to those keys, and add them
to the given manifest.
"""
- filename = os.path.join(topobjdir, 'test-installs.json')
- with open(filename, 'r') as fh:
- resolved_installs = json.load(fh)
+ filename = os.path.join(topobjdir, 'test-installs.pkl')
+ with open(filename, 'rb') as fh:
+ resolved_installs = pickle.load(fh)
for path in paths:
path = path[2:]
diff --git a/services/sync/modules/addonsreconciler.js b/services/sync/modules/addonsreconciler.js
index b24130c13505..a60fc8d56667 100644
--- a/services/sync/modules/addonsreconciler.js
+++ b/services/sync/modules/addonsreconciler.js
@@ -445,6 +445,7 @@ AddonsReconciler.prototype = {
}
let record = this._addons[id];
+ record.isSyncable = addon.isSyncable;
if (!record.installed) {
// It is possible the record is marked as uninstalled because an
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 1712dcd2dcba..13ddf9186f08 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3822,6 +3822,13 @@
"bug_numbers": [1283007],
"description": "Time spent fallocating Variable-Length PrefixSet (ms)"
},
+ "URLCLASSIFIER_VLPS_LOAD_CORRUPT": {
+ "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
+ "expires_in_version": "58",
+ "kind": "boolean",
+ "bug_numbers": [1305581],
+ "description": "Whether or not a variable-length prefix set loaded from disk is corrupted (true = file corrupted)."
+ },
"URLCLASSIFIER_LC_PREFIXES": {
"alert_emails": ["safebrowsing-telemetry@mozilla.org"],
"expires_in_version": "never",
@@ -3867,7 +3874,7 @@
"kind": "enumerated",
"n_values": 10,
"bug_numbers": [1305801],
- "description": "An error was encountered while parsing a partial update returned by a Safe Browsing V4 server (0 = addition of an already existing prefix, 1 = parser got into an infinite loop, 2 = removal index out of bounds)"
+ "description": "An error was encountered while parsing a partial update returned by a Safe Browsing V4 server (0 = addition of an already existing prefix, 1 = parser got into an infinite loop, 2 = removal index out of bounds, 3 = checksum mismatch, 4 = missing checksum)"
},
"CSP_DOCUMENTS_COUNT": {
"alert_emails": ["seceng@mozilla.com"],
diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm
index 68f3cb3c3f84..9e8cd9aec308 100644
--- a/toolkit/components/telemetry/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/TelemetrySend.jsm
@@ -907,6 +907,9 @@ var TelemetrySendImpl = {
this._pendingPingRequests.set(id, request);
+ // Prevent the request channel from running though URLClassifier (bug 1296802)
+ request.channel.loadFlags &= ~Ci.nsIChannel.LOAD_CLASSIFY_URI;
+
let startTime = new Date();
let deferred = PromiseUtils.defer();
diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp
index 9aaac3de43d7..930ebd4ece77 100644
--- a/toolkit/components/url-classifier/Classifier.cpp
+++ b/toolkit/components/url-classifier/Classifier.cpp
@@ -983,11 +983,11 @@ Classifier::UpdateTableV4(nsTArray* aUpdates,
nsresult rv = NS_OK;
- // prefixes2 is only used in partial update. If there are multiple
- // updates for the same table, prefixes1 & prefixes2 will act as
- // input and output in turn to reduce memory copy overhead.
+ // If there are multiple updates for the same table, prefixes1 & prefixes2
+ // will act as input and output in turn to reduce memory copy overhead.
PrefixStringMap prefixes1, prefixes2;
- PrefixStringMap* output = &prefixes1;
+ PrefixStringMap* input = &prefixes1;
+ PrefixStringMap* output = &prefixes2;
TableUpdateV4* lastAppliedUpdate = nullptr;
for (uint32_t i = 0; i < aUpdates->Length(); i++) {
@@ -1000,24 +1000,18 @@ Classifier::UpdateTableV4(nsTArray* aUpdates,
NS_ENSURE_TRUE(updateV4, NS_ERROR_FAILURE);
if (updateV4->IsFullUpdate()) {
- TableUpdateV4::PrefixStdStringMap& map = updateV4->Prefixes();
-
+ input->Clear();
output->Clear();
- for (auto iter = map.Iter(); !iter.Done(); iter.Next()) {
- // prefixes is an nsClassHashtable object stores prefix string.
- // It will take the ownership of the put object.
- nsCString* prefix = new nsCString(iter.Data()->GetPrefixString());
- output->Put(iter.Key(), prefix);
+ rv = lookupCache->ApplyUpdate(updateV4, *input, *output);
+ if (NS_FAILED(rv)) {
+ return rv;
}
} else {
- PrefixStringMap* input = nullptr;
// If both prefix sets are empty, this means we are doing a partial update
// without a prior full/partial update in the loop. In this case we should
// get prefixes from the lookup cache first.
if (prefixes1.IsEmpty() && prefixes2.IsEmpty()) {
lookupCache->GetPrefixes(prefixes1);
- input = &prefixes1;
- output = &prefixes2;
} else {
MOZ_ASSERT(prefixes1.IsEmpty() ^ prefixes2.IsEmpty());
@@ -1028,8 +1022,10 @@ Classifier::UpdateTableV4(nsTArray* aUpdates,
output = prefixes1.IsEmpty() ? &prefixes1 : &prefixes2;
}
- rv = lookupCache->ApplyPartialUpdate(updateV4, *input, *output);
- NS_ENSURE_SUCCESS(rv, rv);
+ rv = lookupCache->ApplyUpdate(updateV4, *input, *output);
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
input->Clear();
}
diff --git a/toolkit/components/url-classifier/LookupCacheV4.cpp b/toolkit/components/url-classifier/LookupCacheV4.cpp
index 38752dd1e0ce..82e22d030d7c 100644
--- a/toolkit/components/url-classifier/LookupCacheV4.cpp
+++ b/toolkit/components/url-classifier/LookupCacheV4.cpp
@@ -5,6 +5,8 @@
#include "LookupCacheV4.h"
#include "HashStore.h"
+#include "mozilla/Unused.h"
+#include
// MOZ_LOG=UrlClassifierDbService:5
extern mozilla::LazyLogModule gUrlClassifierDbServiceLog;
@@ -114,7 +116,22 @@ LookupCacheV4::StoreToFile(nsIFile* aFile)
nsresult
LookupCacheV4::LoadFromFile(nsIFile* aFile)
{
- return mVLPrefixSet->LoadFromFile(aFile);
+ nsresult rv = mVLPrefixSet->LoadFromFile(aFile);
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+
+ nsCString state, checksum;
+ rv = LoadMetadata(state, checksum);
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+
+ rv = VerifyChecksum(checksum);
+ Telemetry::Accumulate(Telemetry::URLCLASSIFIER_VLPS_LOAD_CORRUPT,
+ rv == NS_ERROR_FILE_CORRUPTED);
+
+ return rv;
}
size_t
@@ -137,12 +154,18 @@ AppendPrefixToMap(PrefixStringMap& prefixes, nsDependentCSubstring& prefix)
// Please see https://bug1287058.bmoattachments.org/attachment.cgi?id=8795366
// for detail about partial update algorithm.
nsresult
-LookupCacheV4::ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
- PrefixStringMap& aInputMap,
- PrefixStringMap& aOutputMap)
+LookupCacheV4::ApplyUpdate(TableUpdateV4* aTableUpdate,
+ PrefixStringMap& aInputMap,
+ PrefixStringMap& aOutputMap)
{
MOZ_ASSERT(aOutputMap.IsEmpty());
+ nsCOMPtr crypto;
+ nsresult rv = InitCrypto(crypto);
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+
// oldPSet contains prefixes we already have or we just merged last round.
// addPSet contains prefixes stored in tableUpdate which should be merged with oldPSet.
VLPrefixSet oldPSet(aInputMap);
@@ -159,40 +182,47 @@ LookupCacheV4::ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
nsDependentCSubstring smallestOldPrefix;
nsDependentCSubstring smallestAddPrefix;
+ bool isOldMapEmpty = false, isAddMapEmpty = false;
+
// This is used to avoid infinite loop for partial update algorithm.
// The maximum loops will be the number of old prefixes plus the number of add prefixes.
- uint32_t index = oldPSet.Count() + addPSet.Count() + 1;
+ int32_t index = oldPSet.Count() + addPSet.Count() + 1;
for(;index > 0; index--) {
// Get smallest prefix from the old prefix set if we don't have one
- if (smallestOldPrefix.IsEmpty()) {
- // If prefixes from the old prefix set are all merged,
- // then we can merge the entire add prefix set directly.
- if (!oldPSet.GetSmallestPrefix(smallestOldPrefix)) {
- AppendPrefixToMap(aOutputMap, smallestAddPrefix);
- addPSet.Merge(aOutputMap);
- break;
- }
+ if (smallestOldPrefix.IsEmpty() && !isOldMapEmpty) {
+ isOldMapEmpty = !oldPSet.GetSmallestPrefix(smallestOldPrefix);
}
// Get smallest prefix from add prefix set if we don't have one
- if (smallestAddPrefix.IsEmpty()) {
- // If add prefixes are all merged and there is no removalIndices left,
- // then merge the entire old prefix set directly. If there are still
- // removalIndices left, we should still merge prefixes one by one
- // to know which prefix from old prefix set should be removed.
- if (!addPSet.GetSmallestPrefix(smallestAddPrefix) &&
- removalIndex >= removalArray.Length()) {
- AppendPrefixToMap(aOutputMap, smallestOldPrefix);
- oldPSet.Merge(aOutputMap);
- break;
- }
+ if (smallestAddPrefix.IsEmpty() && !isAddMapEmpty) {
+ isAddMapEmpty = !addPSet.GetSmallestPrefix(smallestAddPrefix);
}
- // Compare the smallest string in old prefix set and add prefix set, merge the
- // smaller one into new map to ensure merged string still follows
- // lexigraphic order.
- if (smallestOldPrefix < smallestAddPrefix ||
- smallestAddPrefix.IsEmpty()) {
+ bool pickOld;
+
+ // If both prefix sets are not empty, then compare to find the smaller one.
+ if (!isOldMapEmpty && !isAddMapEmpty) {
+ if (smallestOldPrefix == smallestAddPrefix) {
+ LOG(("Add prefix should not exist in the original prefix set."));
+ Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
+ DUPLICATE_PREFIX);
+ return NS_ERROR_FAILURE;
+ }
+
+ // Compare the smallest string in old prefix set and add prefix set,
+ // merge the smaller one into new map to ensure merged string still
+ // follows lexigraphic order.
+ pickOld = smallestOldPrefix < smallestAddPrefix;
+ } else if (!isOldMapEmpty && isAddMapEmpty) {
+ pickOld = true;
+ } else if (isOldMapEmpty && !isAddMapEmpty) {
+ pickOld = false;
+ // If both maps are empty, then partial update is complete.
+ } else {
+ break;
+ }
+
+ if (pickOld) {
numOldPrefixPicked++;
// If the number of picks from old map matches the removalIndex, then this prefix
@@ -202,36 +232,108 @@ LookupCacheV4::ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
removalIndex++;
} else {
AppendPrefixToMap(aOutputMap, smallestOldPrefix);
+
+ crypto->Update(reinterpret_cast(const_cast(
+ smallestOldPrefix.BeginReading())),
+ smallestOldPrefix.Length());
}
smallestOldPrefix.SetLength(0);
- } else if (smallestOldPrefix > smallestAddPrefix ||
- smallestOldPrefix.IsEmpty()){
- AppendPrefixToMap(aOutputMap, smallestAddPrefix);
- smallestAddPrefix.SetLength(0);
} else {
- NS_WARNING("Add prefix should not exist in the original prefix set.");
- Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
- DUPLICATE_PREFIX);
- return NS_ERROR_FAILURE;
+ AppendPrefixToMap(aOutputMap, smallestAddPrefix);
+
+ crypto->Update(reinterpret_cast(const_cast(
+ smallestAddPrefix.BeginReading())),
+ smallestAddPrefix.Length());
+
+ smallestAddPrefix.SetLength(0);
}
}
// We expect index will be greater to 0 because max number of runs will be
// the number of original prefix plus add prefix.
if (index <= 0) {
- NS_WARNING("There are still prefixes remaining after reaching maximum runs.");
+ LOG(("There are still prefixes remaining after reaching maximum runs."));
Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
INFINITE_LOOP);
return NS_ERROR_FAILURE;
}
if (removalIndex < removalArray.Length()) {
- NS_WARNING("There are still prefixes to remove after exhausting the old PrefixSet.");
+ LOG(("There are still prefixes to remove after exhausting the old PrefixSet."));
Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
WRONG_REMOVAL_INDICES);
return NS_ERROR_FAILURE;
}
+ nsAutoCString checksum;
+ crypto->Finish(false, checksum);
+ if (aTableUpdate->Checksum().IsEmpty()) {
+ LOG(("Update checksum missing."));
+ Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
+ MISSING_CHECKSUM);
+
+ // Generate our own checksum to tableUpdate to ensure there is always
+ // checksum in .metadata
+ std::string stdChecksum(checksum.BeginReading(), checksum.Length());
+ aTableUpdate->NewChecksum(stdChecksum);
+
+ } else if (aTableUpdate->Checksum() != checksum){
+ LOG(("Checksum mismatch after applying partial update"));
+ Telemetry::Accumulate(Telemetry::URLCLASSIFIER_UPDATE_ERROR_TYPE,
+ CHECKSUM_MISMATCH);
+ return NS_ERROR_FAILURE;
+ }
+
+ return NS_OK;
+}
+
+nsresult
+LookupCacheV4::InitCrypto(nsCOMPtr& aCrypto)
+{
+ nsresult rv;
+ aCrypto = do_CreateInstance(NS_CRYPTO_HASH_CONTRACTID, &rv);
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+ }
+
+ rv = aCrypto->Init(nsICryptoHash::SHA256);
+ Unused << NS_WARN_IF(NS_FAILED(rv));
+
+ return rv;
+}
+
+nsresult
+LookupCacheV4::VerifyChecksum(const nsACString& aChecksum)
+{
+ nsCOMPtr crypto;
+ nsresult rv = InitCrypto(crypto);
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+
+ PrefixStringMap map;
+ mVLPrefixSet->GetPrefixes(map);
+
+ VLPrefixSet loadPSet(map);
+ uint32_t index = loadPSet.Count() + 1;
+ for(;index > 0; index--) {
+ nsDependentCSubstring prefix;
+ if (!loadPSet.GetSmallestPrefix(prefix)) {
+ break;
+ }
+ crypto->Update(reinterpret_cast(const_cast(
+ prefix.BeginReading())),
+ prefix.Length());
+ }
+
+ nsAutoCString checksum;
+ crypto->Finish(false, checksum);
+
+ if (checksum != aChecksum) {
+ LOG(("Checksum mismatch when loading prefixes from file."));
+ return NS_ERROR_FILE_CORRUPTED;
+ }
+
return NS_OK;
}
diff --git a/toolkit/components/url-classifier/LookupCacheV4.h b/toolkit/components/url-classifier/LookupCacheV4.h
index 28ac7155b3fb..f2af1b64bcd2 100644
--- a/toolkit/components/url-classifier/LookupCacheV4.h
+++ b/toolkit/components/url-classifier/LookupCacheV4.h
@@ -29,11 +29,10 @@ public:
nsresult GetPrefixes(PrefixStringMap& aPrefixMap);
- // ApplyPartialUpdate will merge partial update data stored in aTableUpdate
- // with prefixes in aInputMap.
- nsresult ApplyPartialUpdate(TableUpdateV4* aTableUpdate,
- PrefixStringMap& aInputMap,
- PrefixStringMap& aOutputMap);
+ // ApplyUpdate will merge data stored in aTableUpdate with prefixes in aInputMap.
+ nsresult ApplyUpdate(TableUpdateV4* aTableUpdate,
+ PrefixStringMap& aInputMap,
+ PrefixStringMap& aOutputMap);
nsresult WriteMetadata(TableUpdateV4* aTableUpdate);
nsresult LoadMetadata(nsACString& aState, nsACString& aChecksum);
@@ -49,10 +48,15 @@ protected:
private:
virtual int Ver() const override { return VER; }
+ nsresult InitCrypto(nsCOMPtr& aCrypto);
+ nsresult VerifyChecksum(const nsACString& aChecksum);
+
enum UPDATE_ERROR_TYPES {
DUPLICATE_PREFIX = 0,
INFINITE_LOOP = 1,
WRONG_REMOVAL_INDICES = 2,
+ CHECKSUM_MISMATCH = 3,
+ MISSING_CHECKSUM = 4,
};
RefPtr mVLPrefixSet;
diff --git a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
index f1749dbb90c6..6736e3b1ecfe 100644
--- a/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
+++ b/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierTableUpdateV4.cpp
@@ -1,3 +1,6 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
#include "Classifier.h"
#include "HashStore.h"
#include "nsAppDirectoryServiceDefs.h"
@@ -13,6 +16,10 @@ using namespace mozilla::safebrowsing;
typedef nsCString _Prefix;
typedef nsTArray<_Prefix> _PrefixArray;
+#define GTEST_SAFEBROWSING_DIR NS_LITERAL_CSTRING("safebrowsing")
+#define GTEST_TABLE NS_LITERAL_CSTRING("gtest-malware-proto")
+#define GTEST_PREFIXFILE NS_LITERAL_CSTRING("gtest-malware-proto.pset")
+
// This function removes common elements of inArray and outArray from
// outArray. This is used by partial update testcase to ensure partial update
// data won't contain prefixes we already have.
@@ -37,6 +44,17 @@ RemoveElements(const nsTArray& removal, _PrefixArray& outArray)
}
}
+static void
+MergeAndSortArray(const _PrefixArray& array1,
+ const _PrefixArray& array2,
+ _PrefixArray& output)
+{
+ output.Clear();
+ output.AppendElements(array1);
+ output.AppendElements(array2);
+ output.Sort();
+}
+
// This function converts lexigraphic-sorted prefixes to a hashtable
// which key is prefix size and value is concatenated prefix string.
static void
@@ -52,6 +70,24 @@ PrefixArrayToPrefixStringMap(const _PrefixArray& prefixArray,
}
}
+static void
+CalculateCheckSum(_PrefixArray& prefixArray, nsCString& checksum)
+{
+ prefixArray.Sort();
+
+ nsresult rv;
+ nsCOMPtr cryptoHash =
+ do_CreateInstance(NS_CRYPTO_HASH_CONTRACTID, &rv);
+
+ cryptoHash->Init(nsICryptoHash::SHA256);
+ for (uint32_t i = 0; i < prefixArray.Length(); i++) {
+ const _Prefix& prefix = prefixArray[i];
+ cryptoHash->Update(reinterpret_cast(
+ const_cast(prefix.get())), prefix.Length());
+ }
+ cryptoHash->Finish(false, checksum);
+}
+
// N: Number of prefixes, MIN/MAX: minimum/maximum prefix size
// This function will append generated prefixes to outArray.
static void
@@ -103,10 +139,11 @@ CreateRandomRemovalIndices(uint32_t N,
static void
GenerateUpdateData(bool fullUpdate,
PrefixStringMap& add,
- nsTArray& removal,
+ nsTArray* removal,
+ nsCString* checksum,
nsTArray& tableUpdates)
{
- TableUpdateV4* tableUpdate = new TableUpdateV4(NS_LITERAL_CSTRING("gtest-malware-proto"));
+ TableUpdateV4* tableUpdate = new TableUpdateV4(GTEST_TABLE);
tableUpdate->SetFullUpdate(fullUpdate);
for (auto iter = add.ConstIter(); !iter.Done(); iter.Next()) {
@@ -116,7 +153,16 @@ GenerateUpdateData(bool fullUpdate,
tableUpdate->NewPrefixes(iter.Key(), str);
}
- tableUpdate->NewRemovalIndices(removal.Elements(), removal.Length());
+ if (removal) {
+ tableUpdate->NewRemovalIndices(removal->Elements(), removal->Length());
+ }
+
+ if (checksum) {
+ std::string stdChecksum;
+ stdChecksum.assign(const_cast(checksum->BeginReading()), checksum->Length());
+
+ tableUpdate->NewChecksum(stdChecksum);
+ }
tableUpdates.AppendElement(tableUpdate);
}
@@ -126,14 +172,13 @@ VerifyPrefixSet(PrefixStringMap& expected)
{
// Verify the prefix set is written to disk.
nsCOMPtr file;
- NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
- getter_AddRefs(file));
+ NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
- file->AppendNative(NS_LITERAL_CSTRING("safebrowsing"));
- file->AppendNative(NS_LITERAL_CSTRING("gtest-malware-proto.pset"));
+ file->AppendNative(GTEST_SAFEBROWSING_DIR);
+ file->AppendNative(GTEST_PREFIXFILE);
RefPtr load = new VariableLengthPrefixSet;
- load->Init(NS_LITERAL_CSTRING("gtest-malware-proto"));
+ load->Init(GTEST_TABLE);
PrefixStringMap prefixesInFile;
load->LoadFromFile(file);
@@ -151,8 +196,7 @@ static void
Clear()
{
nsCOMPtr file;
- NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
- getter_AddRefs(file));
+ NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
UniquePtr classifier(new Classifier());
classifier->Open(*file);
@@ -163,8 +207,7 @@ static void
testUpdateFail(nsTArray& tableUpdates)
{
nsCOMPtr file;
- NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
- getter_AddRefs(file));
+ NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
UniquePtr classifier(new Classifier());
classifier->Open(*file);
@@ -180,8 +223,7 @@ testUpdate(nsTArray& tableUpdates,
PrefixStringMap& expected)
{
nsCOMPtr file;
- NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
- getter_AddRefs(file));
+ NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
UniquePtr classifier(new Classifier());
classifier->Open(*file);
@@ -195,52 +237,73 @@ testUpdate(nsTArray& tableUpdates,
}
static void
-testFullUpdate(PrefixStringMap& add)
+testFullUpdate(PrefixStringMap& add, nsCString* checksum)
{
- nsTArray empty;
nsTArray tableUpdates;
- GenerateUpdateData(true, add, empty, tableUpdates);
+
+ GenerateUpdateData(true, add, nullptr, checksum, tableUpdates);
testUpdate(tableUpdates, add);
}
static void
testPartialUpdate(PrefixStringMap& add,
- nsTArray& removal,
+ nsTArray* removal,
+ nsCString* checksum,
PrefixStringMap& expected)
{
nsTArray tableUpdates;
- GenerateUpdateData(false, add, removal, tableUpdates);
+ GenerateUpdateData(false, add, removal, checksum, tableUpdates);
testUpdate(tableUpdates, expected);
}
+static void
+testOpenLookupCache()
+{
+ nsCOMPtr file;
+ NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
+ file->AppendNative(GTEST_SAFEBROWSING_DIR);
+ RunTestInNewThread([&] () -> void {
+ LookupCacheV4 cache(nsCString(GTEST_TABLE), file);
+ nsresult rv = cache.Init();
+ ASSERT_EQ(rv, NS_OK);
+
+ rv = cache.Open();
+ ASSERT_EQ(rv, NS_OK);
+ });
+}
+
+// Tests start from here.
TEST(UrlClassifierTableUpdateV4, FixLenghtPSetFullUpdate)
{
srand(time(NULL));
_PrefixArray array;
PrefixStringMap map;
+ nsCString checksum;
CreateRandomSortedPrefixArray(5000, 4, 4, array);
PrefixArrayToPrefixStringMap(array, map);
+ CalculateCheckSum(array, checksum);
- testFullUpdate(map);
+ testFullUpdate(map, &checksum);
Clear();
}
-
TEST(UrlClassifierTableUpdateV4, VariableLenghtPSetFullUpdate)
{
_PrefixArray array;
PrefixStringMap map;
+ nsCString checksum;
CreateRandomSortedPrefixArray(5000, 5, 32, array);
PrefixArrayToPrefixStringMap(array, map);
+ CalculateCheckSum(array, checksum);
- testFullUpdate(map);
+ testFullUpdate(map, &checksum);
Clear();
}
@@ -250,30 +313,41 @@ TEST(UrlClassifierTableUpdateV4, MixedPSetFullUpdate)
{
_PrefixArray array;
PrefixStringMap map;
+ nsCString checksum;
CreateRandomSortedPrefixArray(5000, 4, 4, array);
CreateRandomSortedPrefixArray(1000, 5, 32, array);
PrefixArrayToPrefixStringMap(array, map);
+ CalculateCheckSum(array, checksum);
- testFullUpdate(map);
+ testFullUpdate(map, &checksum);
Clear();
}
TEST(UrlClassifierTableUpdateV4, PartialUpdateWithRemoval)
{
- _PrefixArray fArray, pArray, mergedArray;
- PrefixStringMap fMap, pMap, mergedMap;
+ _PrefixArray fArray;
+ // Apply a full update first.
{
+ PrefixStringMap fMap;
+ nsCString checksum;
+
CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- testFullUpdate(fMap);
+ testFullUpdate(fMap, &checksum);
}
+ // Apply a partial update with removal.
{
+ _PrefixArray pArray, mergedArray;
+ PrefixStringMap pMap, mergedMap;
+ nsCString checksum;
+
CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
RemoveIntersection(fArray, pArray);
@@ -285,12 +359,11 @@ TEST(UrlClassifierTableUpdateV4, PartialUpdateWithRemoval)
RemoveElements(removal, fArray);
// Calculate the expected prefix map.
- mergedArray.AppendElements(fArray);
- mergedArray.AppendElements(pArray);
- mergedArray.Sort();
+ MergeAndSortArray(fArray, pArray, mergedArray);
PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+ CalculateCheckSum(mergedArray, checksum);
- testPartialUpdate(pMap, removal, mergedMap);
+ testPartialUpdate(pMap, &removal, &checksum, mergedMap);
}
Clear();
@@ -298,19 +371,26 @@ TEST(UrlClassifierTableUpdateV4, PartialUpdateWithRemoval)
TEST(UrlClassifierTableUpdateV4, PartialUpdateWithoutRemoval)
{
- _PrefixArray fArray, pArray, mergedArray;
- PrefixStringMap fMap, pMap, mergedMap;
+ _PrefixArray fArray;
+ // Apply a full update first.
{
+ PrefixStringMap fMap;
+ nsCString checksum;
+
CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- testFullUpdate(fMap);
+ testFullUpdate(fMap, &checksum);
}
+ // Apply a partial update without removal
{
- nsTArray empty;
+ _PrefixArray pArray, mergedArray;
+ PrefixStringMap pMap, mergedMap;
+ nsCString checksum;
CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
@@ -318,12 +398,11 @@ TEST(UrlClassifierTableUpdateV4, PartialUpdateWithoutRemoval)
PrefixArrayToPrefixStringMap(pArray, pMap);
// Calculate the expected prefix map.
- mergedArray.AppendElements(fArray);
- mergedArray.AppendElements(pArray);
- mergedArray.Sort();
+ MergeAndSortArray(fArray, pArray, mergedArray);
PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+ CalculateCheckSum(mergedArray, checksum);
- testPartialUpdate(pMap, empty, mergedMap);
+ testPartialUpdate(pMap, nullptr, &checksum, mergedMap);
}
Clear();
@@ -333,18 +412,25 @@ TEST(UrlClassifierTableUpdateV4, PartialUpdateWithoutRemoval)
// in old prefix set.
TEST(UrlClassifierTableUpdateV4, PartialUpdatePrefixAlreadyExist)
{
- _PrefixArray fArray, pArray;
- PrefixStringMap fMap, pMap;
+ _PrefixArray fArray;
+ // Apply a full update fist.
{
+ PrefixStringMap fMap;
+ nsCString checksum;
+
CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- testFullUpdate(fMap);
+ testFullUpdate(fMap, &checksum);
}
+ // Apply a partial update which contains a prefix in previous full update.
+ // This should cause an update error.
{
- nsTArray empty;
+ _PrefixArray pArray;
+ PrefixStringMap pMap;
nsTArray tableUpdates;
// Pick one prefix from full update prefix and add it to partial update.
@@ -353,7 +439,7 @@ TEST(UrlClassifierTableUpdateV4, PartialUpdatePrefixAlreadyExist)
CreateRandomSortedPrefixArray(200, 4, 32, pArray);
PrefixArrayToPrefixStringMap(pArray, pMap);
- GenerateUpdateData(false, pMap, empty, tableUpdates);
+ GenerateUpdateData(false, pMap, nullptr, nullptr, tableUpdates);
testUpdateFail(tableUpdates);
}
@@ -365,13 +451,14 @@ TEST(UrlClassifierTableUpdateV4, OnlyPartialUpdate)
{
_PrefixArray pArray;
PrefixStringMap pMap;
- nsTArray empty;
+ nsCString checksum;
CreateRandomSortedPrefixArray(5000, 4, 4, pArray);
CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
PrefixArrayToPrefixStringMap(pArray, pMap);
+ CalculateCheckSum(pArray, checksum);
- testPartialUpdate(pMap, empty, pMap);
+ testPartialUpdate(pMap, nullptr, &checksum, pMap);
Clear();
}
@@ -379,26 +466,36 @@ TEST(UrlClassifierTableUpdateV4, OnlyPartialUpdate)
// Test partial update without any ADD prefixes, only removalIndices.
TEST(UrlClassifierTableUpdateV4, PartialUpdateOnlyRemoval)
{
- _PrefixArray fArray, pArray;
- PrefixStringMap fMap, pMap, mergedMap;
+ _PrefixArray fArray;
+ // Apply a full update first.
{
+ PrefixStringMap fMap;
+ nsCString checksum;
+
CreateRandomSortedPrefixArray(5000, 4, 4, fArray);
CreateRandomSortedPrefixArray(1000, 5, 32, fArray);
PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- testFullUpdate(fMap);
+ testFullUpdate(fMap, &checksum);
}
+ // Apply a partial update without add prefix, only contain removal indices.
{
+ _PrefixArray pArray;
+ PrefixStringMap pMap, mergedMap;
+ nsCString checksum;
+
// Remove 1/5 of elements of original prefix set.
nsTArray removal;
CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
RemoveElements(removal, fArray);
PrefixArrayToPrefixStringMap(fArray, mergedMap);
+ CalculateCheckSum(fArray, checksum);
- testPartialUpdate(pMap, removal, mergedMap);
+ testPartialUpdate(pMap, &removal, &checksum, mergedMap);
}
Clear();
@@ -409,49 +506,50 @@ TEST(UrlClassifierTableUpdateV4, MultipleTableUpdates)
{
_PrefixArray fArray, pArray, mergedArray;
PrefixStringMap fMap, pMap, mergedMap;
+ nsCString checksum;
- {
- nsTArray empty;
- nsTArray tableUpdates;
+ nsTArray tableUpdates;
- // Generate first full udpate
- CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
- CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
- PrefixArrayToPrefixStringMap(fArray, fMap);
+ // Generate first full udpate
+ CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
+ CreateRandomSortedPrefixArray(2000, 5, 32, fArray);
+ PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- GenerateUpdateData(true, fMap, empty, tableUpdates);
+ GenerateUpdateData(true, fMap, nullptr, &checksum, tableUpdates);
- // Generate second partial update
- CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
- CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
- RemoveIntersection(fArray, pArray);
- PrefixArrayToPrefixStringMap(pArray, pMap);
+ // Generate second partial update
+ CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
+ CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+ RemoveIntersection(fArray, pArray);
+ PrefixArrayToPrefixStringMap(pArray, pMap);
- GenerateUpdateData(false, pMap, empty, tableUpdates);
+ MergeAndSortArray(fArray, pArray, mergedArray);
+ CalculateCheckSum(mergedArray, checksum);
- // Generate thrid partial update
- fArray.AppendElements(pArray);
- fArray.Sort();
- pArray.Clear();
- CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
- CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
- RemoveIntersection(fArray, pArray);
- PrefixArrayToPrefixStringMap(pArray, pMap);
+ GenerateUpdateData(false, pMap, nullptr, &checksum, tableUpdates);
- // Remove 1/5 of elements of original prefix set.
- nsTArray removal;
- CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
- RemoveElements(removal, fArray);
+ // Generate thrid partial update
+ fArray.AppendElements(pArray);
+ fArray.Sort();
+ pArray.Clear();
+ CreateRandomSortedPrefixArray(3000, 4, 4, pArray);
+ CreateRandomSortedPrefixArray(1000, 5, 32, pArray);
+ RemoveIntersection(fArray, pArray);
+ PrefixArrayToPrefixStringMap(pArray, pMap);
- GenerateUpdateData(false, pMap, removal, tableUpdates);
+ // Remove 1/5 of elements of original prefix set.
+ nsTArray removal;
+ CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
+ RemoveElements(removal, fArray);
- mergedArray.AppendElements(fArray);
- mergedArray.AppendElements(pArray);
- mergedArray.Sort();
- PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+ MergeAndSortArray(fArray, pArray, mergedArray);
+ PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+ CalculateCheckSum(mergedArray, checksum);
- testUpdate(tableUpdates, mergedMap);
- }
+ GenerateUpdateData(false, pMap, &removal, &checksum, tableUpdates);
+
+ testUpdate(tableUpdates, mergedMap);
Clear();
}
@@ -460,19 +558,27 @@ TEST(UrlClassifierTableUpdateV4, MultipleTableUpdates)
// in one tableupdate array.
TEST(UrlClassifierTableUpdateV4, MultiplePartialUpdateTableUpdates)
{
- _PrefixArray fArray, pArray, mergedArray;
- PrefixStringMap fMap, pMap, mergedMap;
+ _PrefixArray fArray;
+ // Apply a full update first
{
+ PrefixStringMap fMap;
+ nsCString checksum;
+
// Generate first full udpate
CreateRandomSortedPrefixArray(10000, 4, 4, fArray);
CreateRandomSortedPrefixArray(3000, 5, 32, fArray);
PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- testFullUpdate(fMap);
+ testFullUpdate(fMap, &checksum);
}
+ // Apply multiple partial updates in one table update
{
+ _PrefixArray pArray, mergedArray;
+ PrefixStringMap pMap, mergedMap;
+ nsCString checksum;
nsTArray removal;
nsTArray tableUpdates;
@@ -486,7 +592,10 @@ TEST(UrlClassifierTableUpdateV4, MultiplePartialUpdateTableUpdates)
CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
RemoveElements(removal, fArray);
- GenerateUpdateData(false, pMap, removal, tableUpdates);
+ MergeAndSortArray(fArray, pArray, mergedArray);
+ CalculateCheckSum(mergedArray, checksum);
+
+ GenerateUpdateData(false, pMap, &removal, &checksum, tableUpdates);
fArray.AppendElements(pArray);
fArray.Sort();
@@ -503,12 +612,11 @@ TEST(UrlClassifierTableUpdateV4, MultiplePartialUpdateTableUpdates)
CreateRandomRemovalIndices(fArray.Length() / 5, fArray.Length(), removal);
RemoveElements(removal, fArray);
- GenerateUpdateData(false, pMap, removal, tableUpdates);
-
- mergedArray.AppendElements(fArray);
- mergedArray.AppendElements(pArray);
- mergedArray.Sort();
+ MergeAndSortArray(fArray, pArray, mergedArray);
PrefixArrayToPrefixStringMap(mergedArray, mergedMap);
+ CalculateCheckSum(mergedArray, checksum);
+
+ GenerateUpdateData(false, pMap, &removal, &checksum, tableUpdates);
testUpdate(tableUpdates, mergedMap);
}
@@ -519,17 +627,25 @@ TEST(UrlClassifierTableUpdateV4, MultiplePartialUpdateTableUpdates)
// Test removal indices are larger than the original prefix set.
TEST(UrlClassifierTableUpdateV4, RemovalIndexTooLarge)
{
- _PrefixArray fArray, pArray;
- PrefixStringMap fMap, pMap;
+ _PrefixArray fArray;
+ // Apply a full update first
{
+ PrefixStringMap fMap;
+ nsCString checksum;
+
CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
- testFullUpdate(fMap);
+ testFullUpdate(fMap, &checksum);
}
+ // Apply a partial update with removal indice array larger than
+ // old prefix set(fArray). This should cause an error.
{
+ _PrefixArray pArray;
+ PrefixStringMap pMap;
nsTArray removal;
nsTArray tableUpdates;
@@ -541,9 +657,113 @@ TEST(UrlClassifierTableUpdateV4, RemovalIndexTooLarge)
removal.AppendElement(i);
}
- GenerateUpdateData(false, pMap, removal, tableUpdates);
+ GenerateUpdateData(false, pMap, &removal, nullptr, tableUpdates);
testUpdateFail(tableUpdates);
}
Clear();
}
+
+TEST(UrlClassifierTableUpdateV4, ChecksumMismatch)
+{
+ // Apply a full update first
+ {
+ _PrefixArray fArray;
+ PrefixStringMap fMap;
+ nsCString checksum;
+
+ CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
+ PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
+
+ testFullUpdate(fMap, &checksum);
+ }
+
+ // Apply a partial update with incorrect checksum
+ {
+ _PrefixArray pArray;
+ PrefixStringMap pMap;
+ nsCString checksum;
+ nsTArray tableUpdates;
+
+ CreateRandomSortedPrefixArray(200, 4, 32, pArray);
+ PrefixArrayToPrefixStringMap(pArray, pMap);
+
+ // Checksum should be calculated with both old prefix set and add prefix set,
+ // here we only calculate checksum with add prefix set to check if applyUpdate
+ // will return failure.
+ CalculateCheckSum(pArray, checksum);
+
+ GenerateUpdateData(false, pMap, nullptr, &checksum, tableUpdates);
+ testUpdateFail(tableUpdates);
+ }
+
+ Clear();
+}
+
+TEST(UrlClassifierTableUpdateV4, ApplyUpdateThenLoad)
+{
+ // Apply update with checksum
+ {
+ _PrefixArray fArray;
+ PrefixStringMap fMap;
+ nsCString checksum;
+
+ CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
+ PrefixArrayToPrefixStringMap(fArray, fMap);
+ CalculateCheckSum(fArray, checksum);
+
+ testFullUpdate(fMap, &checksum);
+
+ // Open lookup cache will load prefix set and verify the checksum
+ testOpenLookupCache();
+ }
+
+ Clear();
+
+ // Apply update without checksum
+ {
+ _PrefixArray fArray;
+ PrefixStringMap fMap;
+
+ CreateRandomSortedPrefixArray(1000, 4, 32, fArray);
+ PrefixArrayToPrefixStringMap(fArray, fMap);
+
+ testFullUpdate(fMap, nullptr);
+
+ testOpenLookupCache();
+ }
+
+ Clear();
+}
+
+// This test is used to avoid an eror from nsICryptoHash
+TEST(UrlClassifierTableUpdateV4, ApplyUpdateWithFixedChecksum)
+{
+ _PrefixArray fArray = { _Prefix("enus"), _Prefix("apollo"), _Prefix("mars"),
+ _Prefix("Hecatonchires cyclopes"),
+ _Prefix("vesta"), _Prefix("neptunus"), _Prefix("jupiter"),
+ _Prefix("diana"), _Prefix("minerva"), _Prefix("ceres"),
+ _Prefix("Aidos,Adephagia,Adikia,Aletheia"),
+ _Prefix("hecatonchires"), _Prefix("alcyoneus"), _Prefix("hades"),
+ _Prefix("vulcanus"), _Prefix("juno"), _Prefix("mercury"),
+ _Prefix("Stheno, Euryale and Medusa")
+ };
+ fArray.Sort();
+
+ PrefixStringMap fMap;
+ PrefixArrayToPrefixStringMap(fArray, fMap);
+
+ nsCString checksum("\xae\x18\x94\xd7\xd0\x83\x5f\xc1"
+ "\x58\x59\x5c\x2c\x72\xb9\x6e\x5e"
+ "\xf4\xe8\x0a\x6b\xff\x5e\x6b\x81"
+ "\x65\x34\x06\x16\x06\x59\xa0\x67");
+
+ testFullUpdate(fMap, &checksum);
+
+ // Open lookup cache will load prefix set and verify the checksum
+ testOpenLookupCache();
+
+ Clear();
+}
+
diff --git a/toolkit/components/url-classifier/tests/unit/test_listmanager.js b/toolkit/components/url-classifier/tests/unit/test_listmanager.js
index 0d297cb9f15c..ba11d930ee6f 100644
--- a/toolkit/components/url-classifier/tests/unit/test_listmanager.js
+++ b/toolkit/components/url-classifier/tests/unit/test_listmanager.js
@@ -69,7 +69,7 @@ let gUpdatedCntForTableData = 0; // For TEST_TABLE_DATA_LIST.
let gIsV4Updated = false; // For TEST_TABLE_DATA_V4.
const NEW_CLIENT_STATE = 'sta\0te';
-const CHECKSUM = 'check\0sum';
+const CHECKSUM = '\x30\x67\xc7\x2c\x5e\x50\x1c\x31\xe3\xfe\xca\x73\xf0\x47\xdc\x34\x1a\x95\x63\x99\xec\x70\x5e\x0a\xee\x9e\xfb\x17\xa1\x55\x35\x78';
prefBranch.setBoolPref("browser.safebrowsing.debug", true);
@@ -262,14 +262,14 @@ function run_test() {
// 'threat_type': 2, // SOCIAL_ENGINEERING_PUBLIC
// 'response_type': 2, // FULL_UPDATE
// 'new_client_state': 'sta\x00te', // NEW_CLIENT_STATE
- // 'checksum': { "sha256": 'check\x00sum' }, // CHECKSUM
+ // 'checksum': { "sha256": CHECKSUM }, // CHECKSUM
// 'additions': { 'compression_type': RAW,
// 'prefix_size': 4,
// 'raw_hashes': "00000001000000020000000300000004"}
// }
// ]
//
- let content = "\x0A\x33\x08\x02\x20\x02\x2A\x18\x08\x01\x12\x14\x08\x04\x12\x10\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\x3A\x06\x73\x74\x61\x00\x74\x65\x42\x0B\x0A\x09\x63\x68\x65\x63\x6B\x00\x73\x75\x6D\x12\x08\x08\x08\x10\x80\x94\xEB\xDC\x03";
+ let content = "\x0A\x4A\x08\x02\x20\x02\x2A\x18\x08\x01\x12\x14\x08\x04\x12\x10\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\x3A\x06\x73\x74\x61\x00\x74\x65\x42\x22\x0A\x20\x30\x67\xC7\x2C\x5E\x50\x1C\x31\xE3\xFE\xCA\x73\xF0\x47\xDC\x34\x1A\x95\x63\x99\xEC\x70\x5E\x0A\xEE\x9E\xFB\x17\xA1\x55\x35\x78\x12\x08\x08\x08\x10\x80\x94\xEB\xDC\x03";
response.bodyOutputStream.write(content, content.length);
diff --git a/toolkit/content/tests/widgets/mochitest.ini b/toolkit/content/tests/widgets/mochitest.ini
index f545ac0bf8bb..0385d100b479 100644
--- a/toolkit/content/tests/widgets/mochitest.ini
+++ b/toolkit/content/tests/widgets/mochitest.ini
@@ -29,6 +29,7 @@ tags = fullscreen
skip-if = toolkit == 'android' #TIMED_OUT
[test_videocontrols_vtt.html]
skip-if = toolkit == 'android'
+[test_videocontrols_iframe_fullscreen.html]
[test_videocontrols_audio.html]
[test_videocontrols_audio_direction.html]
[test_videocontrols_jsdisabled.html]
diff --git a/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html b/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
new file mode 100644
index 000000000000..6391dcc1b74f
--- /dev/null
+++ b/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
@@ -0,0 +1,64 @@
+
+
+
+ Video controls test - iframe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index ae6ca4fdf538..f89191a088a3 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -1202,6 +1202,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1275,8 +1316,7 @@
PopupNotifications._swapBrowserNotifications(aOtherBrowser, this);
try {
- this.QueryInterface(Components.interfaces.nsIFrameLoaderOwner)
- .swapFrameLoaders(aOtherBrowser);
+ this.swapFrameLoaders(aOtherBrowser);
} catch (ex) {
// This may not be implemented for browser elements that are not
// attached to a BrowserDOMWindow.
diff --git a/widget/android/fennec/FennecJNIWrappers.cpp b/widget/android/fennec/FennecJNIWrappers.cpp
index 73b5ea876e32..f1ae22e6e597 100644
--- a/widget/android/fennec/FennecJNIWrappers.cpp
+++ b/widget/android/fennec/FennecJNIWrappers.cpp
@@ -248,6 +248,45 @@ constexpr char CodecProxy::NativeCallbacks::OnOutput_t::signature[];
constexpr char CodecProxy::NativeCallbacks::OnOutputFormatChanged_t::name[];
constexpr char CodecProxy::NativeCallbacks::OnOutputFormatChanged_t::signature[];
+const char MediaDrmProxy::name[] =
+ "org/mozilla/gecko/media/MediaDrmProxy";
+
+constexpr char MediaDrmProxy::CanDecode_t::name[];
+constexpr char MediaDrmProxy::CanDecode_t::signature[];
+
+auto MediaDrmProxy::CanDecode(mozilla::jni::String::Param a0) -> bool
+{
+ return mozilla::jni::Method::Call(MediaDrmProxy::Context(), nullptr, a0);
+}
+
+constexpr char MediaDrmProxy::IsCryptoSchemeSupported_t::name[];
+constexpr char MediaDrmProxy::IsCryptoSchemeSupported_t::signature[];
+
+auto MediaDrmProxy::IsCryptoSchemeSupported(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1) -> bool
+{
+ return mozilla::jni::Method::Call(MediaDrmProxy::Context(), nullptr, a0, a1);
+}
+
+constexpr char MediaDrmProxy::IsSchemeSupported_t::name[];
+constexpr char MediaDrmProxy::IsSchemeSupported_t::signature[];
+
+auto MediaDrmProxy::IsSchemeSupported(mozilla::jni::String::Param a0) -> bool
+{
+ return mozilla::jni::Method::Call(MediaDrmProxy::Context(), nullptr, a0);
+}
+
+const char16_t MediaDrmProxy::AAC[] = u"audio/mp4a-latm";
+
+const char16_t MediaDrmProxy::AVC[] = u"video/avc";
+
+const char16_t MediaDrmProxy::OPUS[] = u"audio/opus";
+
+const char16_t MediaDrmProxy::VORBIS[] = u"audio/vorbis";
+
+const char16_t MediaDrmProxy::VP8[] = u"video/x-vnd.on2.vp8";
+
+const char16_t MediaDrmProxy::VP9[] = u"video/x-vnd.on2.vp9";
+
const char Sample::name[] =
"org/mozilla/gecko/media/Sample";
diff --git a/widget/android/fennec/FennecJNIWrappers.h b/widget/android/fennec/FennecJNIWrappers.h
index d573cc9df46e..a57a4cbd98d6 100644
--- a/widget/android/fennec/FennecJNIWrappers.h
+++ b/widget/android/fennec/FennecJNIWrappers.h
@@ -922,6 +922,91 @@ public:
template class Natives;
};
+class MediaDrmProxy : public mozilla::jni::ObjectBase
+{
+public:
+ static const char name[];
+
+ explicit MediaDrmProxy(const Context& ctx) : ObjectBase(ctx) {}
+
+ struct CanDecode_t {
+ typedef MediaDrmProxy Owner;
+ typedef bool ReturnType;
+ typedef bool SetterType;
+ typedef mozilla::jni::Args<
+ mozilla::jni::String::Param> Args;
+ static constexpr char name[] = "CanDecode";
+ static constexpr char signature[] =
+ "(Ljava/lang/String;)Z";
+ static const bool isStatic = true;
+ static const mozilla::jni::ExceptionMode exceptionMode =
+ mozilla::jni::ExceptionMode::ABORT;
+ static const mozilla::jni::CallingThread callingThread =
+ mozilla::jni::CallingThread::ANY;
+ static const mozilla::jni::DispatchTarget dispatchTarget =
+ mozilla::jni::DispatchTarget::CURRENT;
+ };
+
+ static auto CanDecode(mozilla::jni::String::Param) -> bool;
+
+ struct IsCryptoSchemeSupported_t {
+ typedef MediaDrmProxy Owner;
+ typedef bool ReturnType;
+ typedef bool SetterType;
+ typedef mozilla::jni::Args<
+ mozilla::jni::String::Param,
+ mozilla::jni::String::Param> Args;
+ static constexpr char name[] = "IsCryptoSchemeSupported";
+ static constexpr char signature[] =
+ "(Ljava/lang/String;Ljava/lang/String;)Z";
+ static const bool isStatic = true;
+ static const mozilla::jni::ExceptionMode exceptionMode =
+ mozilla::jni::ExceptionMode::ABORT;
+ static const mozilla::jni::CallingThread callingThread =
+ mozilla::jni::CallingThread::ANY;
+ static const mozilla::jni::DispatchTarget dispatchTarget =
+ mozilla::jni::DispatchTarget::CURRENT;
+ };
+
+ static auto IsCryptoSchemeSupported(mozilla::jni::String::Param, mozilla::jni::String::Param) -> bool;
+
+ struct IsSchemeSupported_t {
+ typedef MediaDrmProxy Owner;
+ typedef bool ReturnType;
+ typedef bool SetterType;
+ typedef mozilla::jni::Args<
+ mozilla::jni::String::Param> Args;
+ static constexpr char name[] = "isSchemeSupported";
+ static constexpr char signature[] =
+ "(Ljava/lang/String;)Z";
+ static const bool isStatic = true;
+ static const mozilla::jni::ExceptionMode exceptionMode =
+ mozilla::jni::ExceptionMode::ABORT;
+ static const mozilla::jni::CallingThread callingThread =
+ mozilla::jni::CallingThread::ANY;
+ static const mozilla::jni::DispatchTarget dispatchTarget =
+ mozilla::jni::DispatchTarget::CURRENT;
+ };
+
+ static auto IsSchemeSupported(mozilla::jni::String::Param) -> bool;
+
+ static const char16_t AAC[];
+
+ static const char16_t AVC[];
+
+ static const char16_t OPUS[];
+
+ static const char16_t VORBIS[];
+
+ static const char16_t VP8[];
+
+ static const char16_t VP9[];
+
+ static const mozilla::jni::CallingThread callingThread =
+ mozilla::jni::CallingThread::ANY;
+
+};
+
class Sample : public mozilla::jni::ObjectBase
{
public:
diff --git a/xpcom/threads/MozPromise.h b/xpcom/threads/MozPromise.h
index b2c17e322f50..3de858a15779 100644
--- a/xpcom/threads/MozPromise.h
+++ b/xpcom/threads/MozPromise.h
@@ -14,6 +14,7 @@
#include "mozilla/Mutex.h"
#include "mozilla/Monitor.h"
#include "mozilla/Tuple.h"
+#include "mozilla/TypeTraits.h"
#include "nsTArray.h"
#include "nsThreadUtils.h"
@@ -968,6 +969,23 @@ private:
nsAutoPtr> mMethodCall;
};
+constexpr bool Any()
+{
+ return false;
+}
+
+template
+constexpr bool Any(T1 a)
+{
+ return static_cast(a);
+}
+
+template
+constexpr bool Any(T1 a, Ts... aOthers)
+{
+ return a || Any(aOthers...);
+}
+
} // namespace detail
template
@@ -975,6 +993,8 @@ static RefPtr
InvokeAsync(AbstractThread* aTarget, ThisType* aThisVal, const char* aCallerName,
RefPtr(ThisType::*aMethod)(ArgTypes...), ActualArgTypes&&... aArgs)
{
+ static_assert(!detail::Any(IsReference::value...),
+ "Cannot pass reference types through InvokeAsync, see bug 1313497 if you require it");
typedef detail::MethodCall MethodCallType;
typedef detail::ProxyRunnable ProxyRunnableType;