mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Back out bug 622315 (ffead16f25eb) due to numerous regressions. r=bz
--HG-- extra : rebase_source : c4047ba2db97ebd31ae8dbbbd4d6e7057abf67fe
This commit is contained in:
parent
e707b2f190
commit
49b4c57c62
@ -798,13 +798,7 @@ nsSHistory::GetCanGoBack(bool * aCanGoBack)
|
|||||||
NS_ENSURE_ARG_POINTER(aCanGoBack);
|
NS_ENSURE_ARG_POINTER(aCanGoBack);
|
||||||
*aCanGoBack = PR_FALSE;
|
*aCanGoBack = PR_FALSE;
|
||||||
|
|
||||||
// If there is already a pending navigation, we cannot go back.
|
|
||||||
PRInt32 index = -1;
|
PRInt32 index = -1;
|
||||||
NS_ENSURE_SUCCESS(GetRequestedIndex(&index), NS_ERROR_FAILURE);
|
|
||||||
|
|
||||||
if(index != -1)
|
|
||||||
return NS_OK;
|
|
||||||
|
|
||||||
NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
|
NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
|
||||||
if(index > 0)
|
if(index > 0)
|
||||||
*aCanGoBack = PR_TRUE;
|
*aCanGoBack = PR_TRUE;
|
||||||
@ -818,15 +812,9 @@ nsSHistory::GetCanGoForward(bool * aCanGoForward)
|
|||||||
NS_ENSURE_ARG_POINTER(aCanGoForward);
|
NS_ENSURE_ARG_POINTER(aCanGoForward);
|
||||||
*aCanGoForward = PR_FALSE;
|
*aCanGoForward = PR_FALSE;
|
||||||
|
|
||||||
// If there is already a pending navigation, we cannot go forward.
|
|
||||||
PRInt32 index = -1;
|
PRInt32 index = -1;
|
||||||
PRInt32 count = -1;
|
PRInt32 count = -1;
|
||||||
|
|
||||||
NS_ENSURE_SUCCESS(GetRequestedIndex(&index), NS_ERROR_FAILURE);
|
|
||||||
|
|
||||||
if(index != -1)
|
|
||||||
return NS_OK;
|
|
||||||
|
|
||||||
NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
|
NS_ENSURE_SUCCESS(GetIndex(&index), NS_ERROR_FAILURE);
|
||||||
NS_ENSURE_SUCCESS(GetCount(&count), NS_ERROR_FAILURE);
|
NS_ENSURE_SUCCESS(GetCount(&count), NS_ERROR_FAILURE);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user