зеркало из https://github.com/mozilla/gecko-dev.git
Fix for 136985, add api for finding out if a global window is running a timeout or still loading, r=jst, sr=blake
This commit is contained in:
Родитель
e0734fa45e
Коммит
6aebadf6da
|
@ -84,6 +84,8 @@ public:
|
|||
NS_IMETHOD GetExtantDocument(nsIDOMDocument** aDocument) = 0;
|
||||
|
||||
NS_IMETHOD ReallyCloseWindow() = 0;
|
||||
|
||||
NS_IMETHOD IsLoadingOrRunningTimeout(PRBool* aResult) = 0;
|
||||
};
|
||||
|
||||
#endif // nsPIDOMWindow_h__
|
||||
|
|
|
@ -2813,6 +2813,13 @@ GlobalWindowImpl::ReallyCloseWindow()
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::IsLoadingOrRunningTimeout(PRBool* aResult)
|
||||
{
|
||||
*aResult = !mIsDocumentLoaded || mRunningTimeout;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::UpdateCommands(const nsAString& anAction)
|
||||
{
|
||||
|
|
|
@ -187,6 +187,7 @@ public:
|
|||
NS_IMETHOD GetExtantDocument(nsIDOMDocument** aDocument);
|
||||
|
||||
NS_IMETHOD ReallyCloseWindow();
|
||||
NS_IMETHOD IsLoadingOrRunningTimeout(PRBool* aResult);
|
||||
|
||||
// nsIDOMViewCSS
|
||||
NS_DECL_NSIDOMVIEWCSS
|
||||
|
|
|
@ -690,3 +690,6 @@ pref("update_notifications.provider.0.datasource", "chrome://communicator-region
|
|||
// if true, allow plug-ins to override internal imglib decoder mime types in full-page mode
|
||||
pref("plugin.override_internal_types", false);
|
||||
|
||||
// See bug 136985. Gives embedders a pref to hook into to show
|
||||
// a popup blocker if they choose.
|
||||
pref("browser.popups.showPopupBlocker", true);
|
||||
|
|
Загрузка…
Ссылка в новой задаче