230339 - incorrect code in nsPresShell::HandleEvent

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

In revision 3.627 of nsPresShell.cpp, there was a change in
nsPresShell::HandleEvent that looks incorrect to me.  I just made some comments
in nsPresShell in my patch for bug 230270 about the InZombieDocument check
perhaps being bogus -- but in fact the error I pointed out was introduced later
(revision 3.627).

The change I don't like was (from "cvs diff -b -r3.626 -r3.627 nsPresShell.cpp"):


+#endif /* defined(MOZ_X11) */
           if (!mCurrentEventContent) {
-            // fallback, call existing codes
             mDocument->GetRootContent(&mCurrentEventContent);
           }
-#else /* defined(MOZ_X11) */
-          mDocument->GetRootContent(&mCurrentEventContent);
-#endif /* defined(MOZ_X11) */

I think this code was already incorrect for the MOZ_X11 case, but this meant
that mCurrentEventContent was not assigned to at all in most cases.  This seems
wrong to me.

Comment 1

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Actually, my comment wasn't entirely incorrect, since the old assignment was
still within an |if (!mCurrentEventFrame)| test.

Comment 2

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

OK, I take that back again.  The |PushCurrentEventInfo| makes things OK.  So I
should really just back out part of the changes I just made.

Comment 3

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Attachment: back out the incorrect changes I just made

Comment 4

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

ok, changes backed out.