Bug 141295 and 153681 - fix some timing problems with initial focus. Make sure that window watcher's activeWindow accurately reflects the last window to receive an NS_ACTIVATE. Remove the GetFocusController API from nsIDocument, since the focus controller can now be obtained for the entire lifetime of the document by using GetContainer(). Cleaned up some methods on nsEventStateManager/nsIEventStateManager that were virtual for no reason. r=danm, sr=jst.
This commit is contained in:
@@ -308,6 +308,13 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink)
|
||||
aSink), NS_ERROR_FAILURE);
|
||||
return NS_OK;
|
||||
}
|
||||
else if (aIID.Equals(NS_GET_IID(nsPIDOMWindow)) &&
|
||||
NS_SUCCEEDED(EnsureScriptEnvironment())) {
|
||||
NS_ENSURE_SUCCESS(mScriptGlobal->
|
||||
QueryInterface(NS_GET_IID(nsPIDOMWindow), aSink),
|
||||
NS_ERROR_FAILURE);
|
||||
return NS_OK;
|
||||
}
|
||||
else if (aIID.Equals(NS_GET_IID(nsIDOMWindow)) &&
|
||||
NS_SUCCEEDED(EnsureScriptEnvironment())) {
|
||||
NS_ENSURE_SUCCESS(mScriptGlobal->
|
||||
|
||||
Reference in New Issue
Block a user