Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 249136. Cannot scroll in pages loaded into foreground tabs. Builds on top of previous patch by attempting to fix perf regressions that caused. r=mats, sr=bryner

Browse Source
This commit is contained in:
aaronleventhal%moonset.net 2005-08-25 00:55:49 +00:00
parent 7ecccad15e
commit 154d3f15fa
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dom/src/base/nsFocusController.cpp
View File

@ -76,7 +76,8 @@ nsFocusController::nsFocusController(void)
: mSuppressFocus(0),
mSuppressFocusScroll(PR_FALSE),
mActive(PR_FALSE),
mUpdateWindowWatcher(PR_FALSE)
mUpdateWindowWatcher(PR_FALSE),
mNeedUpdateCommands(PR_FALSE)
{
}
@ -127,13 +128,14 @@ nsFocusController::SetFocusedElement(nsIDOMElement* aElement)
else if (aElement)
mPreviousElement = aElement;
mNeedUpdateCommands = mNeedUpdateCommands || mCurrentElement != aElement;
mCurrentElement = aElement;
if (!mSuppressFocus) {
// Need to update focus commands when focus switches from
// an element to no element, so don't test mCurrentElement
// before updating.
UpdateCommands(NS_LITERAL_STRING("focus"));
UpdateCommands();
}
return NS_OK;
}
@ -176,6 +178,7 @@ nsFocusController::SetFocusedWindow(nsIDOMWindowInternal* aWindow)
mPreviousWindow = win;
}
mNeedUpdateCommands = mNeedUpdateCommands || mCurrentWindow != win;
mCurrentWindow = win;
if (mUpdateWindowWatcher) {
@ -189,25 +192,36 @@ nsFocusController::SetFocusedWindow(nsIDOMWindowInternal* aWindow)
}
NS_IMETHODIMP
nsFocusController::UpdateCommands(const nsAString& aEventName)
void
nsFocusController::UpdateCommands()
{
if (!mNeedUpdateCommands) {
return;
}
nsCOMPtr<nsIDOMWindowInternal> window;
nsCOMPtr<nsIDocument> doc;
if (mCurrentWindow) {
mCurrentWindow->UpdateCommands(aEventName);
window = mCurrentWindow;
nsCOMPtr<nsIDOMWindow> domWin(do_QueryInterface(window));
nsCOMPtr<nsIDOMDocument> domDoc;
domWin->GetDocument(getter_AddRefs(domDoc));
doc = do_QueryInterface(domDoc);
}
else if (mCurrentElement) {
nsCOMPtr<nsIDOMDocument> domDoc;
mCurrentElement->GetOwnerDocument(getter_AddRefs(domDoc));
if (domDoc) {
nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
nsCOMPtr<nsIDOMWindowInternal> window =
do_QueryInterface(doc->GetScriptGlobalObject());
if (window)
window->UpdateCommands(aEventName);
doc = do_QueryInterface(domDoc);
window = do_QueryInterface(doc->GetScriptGlobalObject());
}
}
return NS_OK;
// If there is no presshell, it's a zombie document which can't handle the command updates
if (window && doc && doc->GetNumberOfShells()) {
// Not a zombie document, so we can handle the command update
window->UpdateCommands(NS_LITERAL_STRING("focus"));
mNeedUpdateCommands = PR_FALSE;
}
}
@ -346,8 +360,10 @@ nsFocusController::Focus(nsIDOMEvent* aEvent)
else
mPreviousElement = nsnull;
if (!mCurrentElement)
UpdateCommands(NS_LITERAL_STRING("focus"));
if (!mCurrentElement && mCurrentWindow != mPreviousWindow) {
mNeedUpdateCommands = PR_TRUE;
UpdateCommands();
}
}
}
}
@ -501,8 +517,9 @@ nsFocusController::SetSuppressFocus(PRBool aSuppressFocus, const char* aReason)
// we need this to update command, including the case where there is no element
// because nsPresShell::UnsuppressPainting may have just now unsuppressed
// focus on the currently focused window
if (!mSuppressFocus)
UpdateCommands(NS_LITERAL_STRING("focus"));
if (!mSuppressFocus) {
UpdateCommands();
}
return NS_OK;
}

3
dom/src/base/nsFocusController.h
View File

@ -102,7 +102,7 @@ public:
NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; };
protected:
NS_IMETHOD UpdateCommands(const nsAString& aEventName);
void UpdateCommands();
void UpdateWWActiveWindow();
public:
@ -120,6 +120,7 @@ protected:
PRPackedBool mSuppressFocusScroll;
PRPackedBool mActive;
PRPackedBool mUpdateWindowWatcher;
PRPackedBool mNeedUpdateCommands;
};
#endif // nsFocusController_h__