зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 79425c851114 (bug 1755372) for causing build bustages on Connection.cpp. CLOSED TREE
This commit is contained in:
Родитель
f65a148d41
Коммит
1171737ea7
|
@ -1806,9 +1806,7 @@ network::Connection* Navigator::GetConnection(ErrorResult& aRv) {
|
||||||
aRv.Throw(NS_ERROR_UNEXPECTED);
|
aRv.Throw(NS_ERROR_UNEXPECTED);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
nsCOMPtr<Document> doc = mWindow->GetExtantDoc();
|
mConnection = network::Connection::CreateForWindow(mWindow);
|
||||||
mConnection = network::Connection::CreateForWindow(
|
|
||||||
mWindow, nsContentUtils::ShouldResistFingerprinting(doc));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return mConnection;
|
return mConnection;
|
||||||
|
|
|
@ -23,13 +23,11 @@ namespace mozilla::dom::network {
|
||||||
// we're not the only class with that name.
|
// we're not the only class with that name.
|
||||||
NS_IMPL_ISUPPORTS_INHERITED0(dom::network::Connection, DOMEventTargetHelper)
|
NS_IMPL_ISUPPORTS_INHERITED0(dom::network::Connection, DOMEventTargetHelper)
|
||||||
|
|
||||||
Connection::Connection(nsPIDOMWindowInner* aWindow,
|
Connection::Connection(nsPIDOMWindowInner* aWindow)
|
||||||
bool aShouldResistFingerprinting)
|
|
||||||
: DOMEventTargetHelper(aWindow),
|
: DOMEventTargetHelper(aWindow),
|
||||||
mType(static_cast<ConnectionType>(kDefaultType)),
|
mType(static_cast<ConnectionType>(kDefaultType)),
|
||||||
mIsWifi(kDefaultIsWifi),
|
mIsWifi(kDefaultIsWifi),
|
||||||
mDHCPGateway(kDefaultDHCPGateway),
|
mDHCPGateway(kDefaultDHCPGateway),
|
||||||
mShouldResistFingerprinting(aShouldResistFingerprinting),
|
|
||||||
mBeenShutDown(false) {
|
mBeenShutDown(false) {
|
||||||
Telemetry::Accumulate(Telemetry::NETWORK_CONNECTION_COUNT, 1);
|
Telemetry::Accumulate(Telemetry::NETWORK_CONNECTION_COUNT, 1);
|
||||||
}
|
}
|
||||||
|
@ -65,16 +63,16 @@ void Connection::Update(ConnectionType aType, bool aIsWifi,
|
||||||
mIsWifi = aIsWifi;
|
mIsWifi = aIsWifi;
|
||||||
mDHCPGateway = aDHCPGateway;
|
mDHCPGateway = aDHCPGateway;
|
||||||
|
|
||||||
if (aNotify && previousType != aType && !mShouldResistFingerprinting) {
|
if (aNotify && previousType != aType &&
|
||||||
|
!nsContentUtils::ShouldResistFingerprinting()) {
|
||||||
DispatchTrustedEvent(CHANGE_EVENT_NAME);
|
DispatchTrustedEvent(CHANGE_EVENT_NAME);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
Connection* Connection::CreateForWindow(nsPIDOMWindowInner* aWindow,
|
Connection* Connection::CreateForWindow(nsPIDOMWindowInner* aWindow) {
|
||||||
bool aShouldResistFingerprinting) {
|
|
||||||
MOZ_ASSERT(aWindow);
|
MOZ_ASSERT(aWindow);
|
||||||
return new ConnectionMainThread(aWindow, aShouldResistFingerprinting);
|
return new ConnectionMainThread(aWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
|
|
|
@ -28,8 +28,7 @@ class Connection : public DOMEventTargetHelper {
|
||||||
public:
|
public:
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
|
|
||||||
static Connection* CreateForWindow(nsPIDOMWindowInner* aWindow,
|
static Connection* CreateForWindow(nsPIDOMWindowInner* aWindow);
|
||||||
bool aShouldResistFingerprinting);
|
|
||||||
|
|
||||||
static already_AddRefed<Connection> CreateForWorker(
|
static already_AddRefed<Connection> CreateForWorker(
|
||||||
WorkerPrivate* aWorkerPrivate, ErrorResult& aRv);
|
WorkerPrivate* aWorkerPrivate, ErrorResult& aRv);
|
||||||
|
@ -61,7 +60,7 @@ class Connection : public DOMEventTargetHelper {
|
||||||
IMPL_EVENT_HANDLER(typechange)
|
IMPL_EVENT_HANDLER(typechange)
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Connection(nsPIDOMWindowInner* aWindow, bool aShouldResistFingerprinting);
|
Connection(nsPIDOMWindowInner* aWindow);
|
||||||
virtual ~Connection();
|
virtual ~Connection();
|
||||||
|
|
||||||
void Update(ConnectionType aType, bool aIsWifi, uint32_t aDHCPGateway,
|
void Update(ConnectionType aType, bool aIsWifi, uint32_t aDHCPGateway,
|
||||||
|
@ -86,11 +85,6 @@ class Connection : public DOMEventTargetHelper {
|
||||||
uint32_t mDHCPGateway;
|
uint32_t mDHCPGateway;
|
||||||
|
|
||||||
bool mBeenShutDown;
|
bool mBeenShutDown;
|
||||||
|
|
||||||
/**
|
|
||||||
* If ResistFingerprinting is enabled or disabled.
|
|
||||||
*/
|
|
||||||
bool mShouldResistFingerprinting;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace network
|
} // namespace network
|
||||||
|
|
|
@ -10,9 +10,8 @@
|
||||||
|
|
||||||
namespace mozilla::dom::network {
|
namespace mozilla::dom::network {
|
||||||
|
|
||||||
ConnectionMainThread::ConnectionMainThread(nsPIDOMWindowInner* aWindow,
|
ConnectionMainThread::ConnectionMainThread(nsPIDOMWindowInner* aWindow)
|
||||||
bool aShouldResistFingerprinting)
|
: Connection(aWindow) {
|
||||||
: Connection(aWindow, aShouldResistFingerprinting) {
|
|
||||||
hal::RegisterNetworkObserver(this);
|
hal::RegisterNetworkObserver(this);
|
||||||
|
|
||||||
hal::NetworkInformation networkInfo;
|
hal::NetworkInformation networkInfo;
|
||||||
|
|
|
@ -18,8 +18,7 @@ namespace network {
|
||||||
class ConnectionMainThread final : public Connection,
|
class ConnectionMainThread final : public Connection,
|
||||||
public hal::NetworkObserver {
|
public hal::NetworkObserver {
|
||||||
public:
|
public:
|
||||||
explicit ConnectionMainThread(nsPIDOMWindowInner* aWindow,
|
explicit ConnectionMainThread(nsPIDOMWindowInner* aWindow);
|
||||||
bool aShouldResistFingerprinting);
|
|
||||||
|
|
||||||
// For IObserver
|
// For IObserver
|
||||||
void Notify(const hal::NetworkInformation& aNetworkInfo) override;
|
void Notify(const hal::NetworkInformation& aNetworkInfo) override;
|
||||||
|
|
|
@ -140,9 +140,7 @@ class NotifyRunnable : public WorkerRunnable {
|
||||||
/* static */
|
/* static */
|
||||||
already_AddRefed<ConnectionWorker> ConnectionWorker::Create(
|
already_AddRefed<ConnectionWorker> ConnectionWorker::Create(
|
||||||
WorkerPrivate* aWorkerPrivate, ErrorResult& aRv) {
|
WorkerPrivate* aWorkerPrivate, ErrorResult& aRv) {
|
||||||
bool shouldResistFingerprinting =
|
RefPtr<ConnectionWorker> c = new ConnectionWorker();
|
||||||
aWorkerPrivate->ShouldResistFingerprinting();
|
|
||||||
RefPtr<ConnectionWorker> c = new ConnectionWorker(shouldResistFingerprinting);
|
|
||||||
c->mProxy = ConnectionProxy::Create(aWorkerPrivate, c);
|
c->mProxy = ConnectionProxy::Create(aWorkerPrivate, c);
|
||||||
if (!c->mProxy) {
|
if (!c->mProxy) {
|
||||||
aRv.ThrowTypeError("The Worker thread is shutting down.");
|
aRv.ThrowTypeError("The Worker thread is shutting down.");
|
||||||
|
@ -163,8 +161,7 @@ already_AddRefed<ConnectionWorker> ConnectionWorker::Create(
|
||||||
return c.forget();
|
return c.forget();
|
||||||
}
|
}
|
||||||
|
|
||||||
ConnectionWorker::ConnectionWorker(bool aShouldResistFingerprinting)
|
ConnectionWorker::ConnectionWorker() : Connection(nullptr) {
|
||||||
: Connection(nullptr, aShouldResistFingerprinting) {
|
|
||||||
MOZ_ASSERT(IsCurrentThreadRunningWorker());
|
MOZ_ASSERT(IsCurrentThreadRunningWorker());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ class ConnectionWorker final : public Connection {
|
||||||
WorkerPrivate* aWorkerPrivate, ErrorResult& aRv);
|
WorkerPrivate* aWorkerPrivate, ErrorResult& aRv);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
explicit ConnectionWorker(bool aShouldResistFingerprinting);
|
ConnectionWorker();
|
||||||
~ConnectionWorker();
|
~ConnectionWorker();
|
||||||
|
|
||||||
virtual void ShutdownInternal() override;
|
virtual void ShutdownInternal() override;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче