Backed out 5 changesets (bug 1940797, bug 1940800, bug 1940819, bug 1939881, bug 1939903) for causing build bustages in ContentChild.cpp CLOSED TREE
Backed out changeset f632ead9f4bd (bug 1939903) Backed out changeset 30e9f5c7c5b7 (bug 1940800) Backed out changeset 7ce4c97719aa (bug 1940797) Backed out changeset f994cb8875ff (bug 1939881) Backed out changeset ac7780c78455 (bug 1940819)
This commit is contained in:
@@ -60,7 +60,6 @@
|
||||
#include "mozilla/RemoteDecoderManagerChild.h"
|
||||
#include "mozilla/KeySystemConfig.h"
|
||||
#include "mozilla/WheelHandlingHelper.h"
|
||||
#include "nsIRFPTargetSetIDL.h"
|
||||
#include "nsContentSecurityUtils.h"
|
||||
#include "nsString.h"
|
||||
#include "nsNativeTheme.h"
|
||||
@@ -2445,7 +2444,7 @@ void ChromeUtils::GetAllPossibleUtilityActorNames(GlobalObject& aGlobal,
|
||||
/* static */
|
||||
bool ChromeUtils::ShouldResistFingerprinting(
|
||||
GlobalObject& aGlobal, JSRFPTarget aTarget,
|
||||
nsIRFPTargetSetIDL* aOverriddenFingerprintingSettings,
|
||||
const Nullable<uint64_t>& aOverriddenFingerprintingSettings,
|
||||
const Optional<bool>& aIsPBM) {
|
||||
RFPTarget target;
|
||||
switch (aTarget) {
|
||||
@@ -2479,16 +2478,10 @@ bool ChromeUtils::ShouldResistFingerprinting(
|
||||
}
|
||||
}
|
||||
|
||||
Maybe<RFPTargetSet> overriddenFingerprintingSettings;
|
||||
if (aOverriddenFingerprintingSettings) {
|
||||
uint64_t low, hi;
|
||||
aOverriddenFingerprintingSettings->GetLow(&low);
|
||||
aOverriddenFingerprintingSettings->GetHigh(&hi);
|
||||
std::bitset<128> bitset;
|
||||
bitset |= hi;
|
||||
bitset <<= 64;
|
||||
bitset |= low;
|
||||
overriddenFingerprintingSettings.emplace(RFPTargetSet(bitset));
|
||||
Maybe<RFPTarget> overriddenFingerprintingSettings;
|
||||
if (!aOverriddenFingerprintingSettings.IsNull()) {
|
||||
overriddenFingerprintingSettings.emplace(
|
||||
RFPTarget(aOverriddenFingerprintingSettings.Value()));
|
||||
}
|
||||
|
||||
// This global object appears to be the global window, not for individual
|
||||
|
||||
Reference in New Issue
Block a user