зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1444143 part 4. Remove nsIFrameLoader::GetDepthTooGreat. r=mystor
MozReview-Commit-ID: GIdz853oVd3
This commit is contained in:
Родитель
f3d0adf134
Коммит
909a57edd7
|
@ -1900,13 +1900,6 @@ nsFrameLoader::DestroyComplete()
|
|||
mChildMessageManager = nullptr;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFrameLoader::GetDepthTooGreat(bool* aDepthTooGreat)
|
||||
{
|
||||
*aDepthTooGreat = mDepthTooGreat;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
nsFrameLoader::SetOwnerContent(Element* aContent)
|
||||
{
|
||||
|
|
|
@ -38,13 +38,6 @@ interface nsIFrameLoader : nsISupports
|
|||
*/
|
||||
void destroy();
|
||||
|
||||
/**
|
||||
* Find out whether the loader's frame is at too great a depth in
|
||||
* the frame tree. This can be used to decide what operations may
|
||||
* or may not be allowed on the loader's docshell.
|
||||
*/
|
||||
readonly attribute boolean depthTooGreat;
|
||||
|
||||
/**
|
||||
* The default event mode automatically forwards the events
|
||||
* handled in EventStateManager::HandleCrossProcessEvent to
|
||||
|
|
|
@ -120,9 +120,7 @@ nsGenericHTMLFrameElement::GetContentWindow()
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
bool depthTooGreat = false;
|
||||
mFrameLoader->GetDepthTooGreat(&depthTooGreat);
|
||||
if (depthTooGreat) {
|
||||
if (mFrameLoader->DepthTooGreat()) {
|
||||
// Claim to have no contentWindow
|
||||
return nullptr;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче