зеркало из https://github.com/mozilla/gecko-dev.git
backing out my patch for bug 95981 to fix blocker bug 96480
This commit is contained in:
Родитель
d5deeb87b0
Коммит
b95283c439
|
@ -44,10 +44,6 @@ interface nsILoadGroup : nsIRequest
|
||||||
* Accesses the default load request for the group. Each time a number
|
* Accesses the default load request for the group. Each time a number
|
||||||
* of requests are added to a group, the defaultLoadRequest may be set
|
* of requests are added to a group, the defaultLoadRequest may be set
|
||||||
* to indicate that all of the requests are related to a base request.
|
* to indicate that all of the requests are related to a base request.
|
||||||
*
|
|
||||||
* The load group inherits its load flags from the default load request.
|
|
||||||
* If the default load request is NULL, then the group's load flags are
|
|
||||||
* not changed.
|
|
||||||
*/
|
*/
|
||||||
attribute nsIRequest defaultLoadRequest;
|
attribute nsIRequest defaultLoadRequest;
|
||||||
|
|
||||||
|
|
|
@ -388,7 +388,8 @@ nsLoadGroup::SetDefaultLoadRequest(nsIRequest *aRequest)
|
||||||
// Inherit the group load flags from the default load request
|
// Inherit the group load flags from the default load request
|
||||||
if (mDefaultLoadRequest)
|
if (mDefaultLoadRequest)
|
||||||
mDefaultLoadRequest->GetLoadFlags(&mLoadFlags);
|
mDefaultLoadRequest->GetLoadFlags(&mLoadFlags);
|
||||||
// Else, do not change the group's load flags (see bug 95981)
|
else
|
||||||
|
mLoadFlags = LOAD_NORMAL;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче