зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1563313) for failures in test_protocolproxyservice.js CLOSED TREE
Backed out changeset 0585bc6ff55b (bug 1563313) Backed out changeset 3b9ef89d8c5c (bug 1563313)
This commit is contained in:
Родитель
71a457f2bf
Коммит
7441986e1b
|
@ -533,6 +533,7 @@ nsAsyncResolveRequest::AsyncApplyFilters::OnProxyFilterResult(
|
||||||
}
|
}
|
||||||
|
|
||||||
mFilterCalledBack = true;
|
mFilterCalledBack = true;
|
||||||
|
mProxyInfo = aProxyInfo;
|
||||||
|
|
||||||
if (mProcessingInLoop) {
|
if (mProcessingInLoop) {
|
||||||
// No need to call/dispatch ProcessNextFilter(), we are in a control
|
// No need to call/dispatch ProcessNextFilter(), we are in a control
|
||||||
|
@ -547,8 +548,6 @@ nsAsyncResolveRequest::AsyncApplyFilters::OnProxyFilterResult(
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
mProxyInfo = aProxyInfo;
|
|
||||||
|
|
||||||
if (mNextFilterIndex == mFiltersCopy.Length()) {
|
if (mNextFilterIndex == mFiltersCopy.Length()) {
|
||||||
// We are done, all filters have been called on!
|
// We are done, all filters have been called on!
|
||||||
Finish();
|
Finish();
|
||||||
|
|
|
@ -1500,6 +1500,8 @@ HttpBaseChannel::IsThirdPartyTrackingResource(bool* aIsTrackingResource) {
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
HttpBaseChannel::GetClassificationFlags(uint32_t* aFlags) {
|
HttpBaseChannel::GetClassificationFlags(uint32_t* aFlags) {
|
||||||
|
MOZ_ASSERT(!mFirstPartyClassificationFlags ||
|
||||||
|
!mThirdPartyClassificationFlags);
|
||||||
if (mThirdPartyClassificationFlags) {
|
if (mThirdPartyClassificationFlags) {
|
||||||
*aFlags = mThirdPartyClassificationFlags;
|
*aFlags = mThirdPartyClassificationFlags;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1510,12 +1512,16 @@ HttpBaseChannel::GetClassificationFlags(uint32_t* aFlags) {
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
HttpBaseChannel::GetFirstPartyClassificationFlags(uint32_t* aFlags) {
|
HttpBaseChannel::GetFirstPartyClassificationFlags(uint32_t* aFlags) {
|
||||||
|
MOZ_ASSERT(
|
||||||
|
!(mFirstPartyClassificationFlags && mFirstPartyClassificationFlags));
|
||||||
*aFlags = mFirstPartyClassificationFlags;
|
*aFlags = mFirstPartyClassificationFlags;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
HttpBaseChannel::GetThirdPartyClassificationFlags(uint32_t* aFlags) {
|
HttpBaseChannel::GetThirdPartyClassificationFlags(uint32_t* aFlags) {
|
||||||
|
MOZ_ASSERT(
|
||||||
|
!(mFirstPartyClassificationFlags && mThirdPartyClassificationFlags));
|
||||||
*aFlags = mThirdPartyClassificationFlags;
|
*aFlags = mThirdPartyClassificationFlags;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче