Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing a crash resulting from my checkin for bug 138237. Instead of causing an initial reflow so that we can dispatch the focus event, just update the focus controller's state. r=alexsavulov, sr=blake.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@123915 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com
2002-06-24 04:16:49 +00:00
parent ee13affff3
commit 403f29b5fd
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/layout/base/nsPresShell.cpp
View File

@@ -5969,14 +5969,24 @@ PresShell::HandleEvent(nsIView *aView,
// We really don't want to just drop a focus event on the floor here,
// because the widget-level focus change will have already happened
// by the time we get the event. Rather than dropping it, force an
// initial reflow if we haven't done one yet, so that we can process
// the event.
// by the time we get the event. Rather than dropping it, manually
// update the focus controller here.
if (aEvent->message == NS_GOTFOCUS && !mDidInitialReflow && mViewManager) {
nscoord width, height;
mViewManager->GetWindowDimensions(&width, &height);
InitialReflow(width, height);
if (aEvent->message == NS_GOTFOCUS && !mDidInitialReflow && mDocument) {
nsCOMPtr<nsIScriptGlobalObject> sgo;
mDocument->GetScriptGlobalObject(getter_AddRefs(sgo));
if (sgo) {
nsCOMPtr<nsPIDOMWindow> pWindow = do_QueryInterface(sgo);
if (pWindow) {
nsCOMPtr<nsIFocusController> controller;
pWindow->GetRootFocusController(getter_AddRefs(controller));
if (controller) {
nsCOMPtr<nsIDOMWindowInternal> domWin = do_QueryInterface(sgo);
controller->SetFocusedWindow(domWin);
controller->SetFocusedElement(nsnull);
}
}
}
}
aView->GetClientData(clientData);

24
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@@ -5969,14 +5969,24 @@ PresShell::HandleEvent(nsIView *aView,
// We really don't want to just drop a focus event on the floor here,
// because the widget-level focus change will have already happened
// by the time we get the event. Rather than dropping it, force an
// initial reflow if we haven't done one yet, so that we can process
// the event.
// by the time we get the event. Rather than dropping it, manually
// update the focus controller here.
if (aEvent->message == NS_GOTFOCUS && !mDidInitialReflow && mViewManager) {
nscoord width, height;
mViewManager->GetWindowDimensions(&width, &height);
InitialReflow(width, height);
if (aEvent->message == NS_GOTFOCUS && !mDidInitialReflow && mDocument) {
nsCOMPtr<nsIScriptGlobalObject> sgo;
mDocument->GetScriptGlobalObject(getter_AddRefs(sgo));
if (sgo) {
nsCOMPtr<nsPIDOMWindow> pWindow = do_QueryInterface(sgo);
if (pWindow) {
nsCOMPtr<nsIFocusController> controller;
pWindow->GetRootFocusController(getter_AddRefs(controller));
if (controller) {
nsCOMPtr<nsIDOMWindowInternal> domWin = do_QueryInterface(sgo);
controller->SetFocusedWindow(domWin);
controller->SetFocusedElement(nsnull);
}
}
}
}
aView->GetClientData(clientData);