1588874 - Remove preprocessing from nsSessionStore.js in SeaMonkey

Status: RESOLVED FIXED

(SeaMonkey :: Session Restore, enhancement)

Description

[Frank-Rainer Grahl (:frg)]

Just in the way for easy testing.

See Bug 1228655 "Replace #ifdefs in browser code by AppConstants".

Comment 1

[Frank-Rainer Grahl (:frg)]

Attachment: 1588874-killpreprocessing.patch

Tested in 2.53. z-order under mac seems to work now. RecentWindow.jsm uses more or less the same enumerator code.

Comment 2

[Ian Neal]

Comment on attachment 9102849 [details] [diff] [review]
1588874-killpreprocessing.patch

>+++ b/suite/components/sessionstore/nsSessionStore.js

>-#ifndef XP_MACOSX
>-        if (!this._doResumeSession()) {
>-#endif
>+        if (AppConstants.platform == "macosx" || !this._doResumeSession()) {
Shouldn't this be != rather than == ?

r/a=me with that addressed.

Comment 3

[[e-mail]]

(In reply to Ian Neal from comment #2)

Comment on attachment 9102849 [details] [diff] [review]

-#ifndef XP_MACOSX
-        if (!this._doResumeSession()) {
-#endif
+        if (AppConstants.platform == "macosx" || !this._doResumeSession()) {

Shouldn't this be != rather than == ?
No, the old code always ran this block on the Mac rather than the else block which was #ifdef'd out. (Might it be clearer to switch the blocks around and use if (AppConstants.platform != "macosx" && this._doResumeSession())?

Comment 4

[Frank-Rainer Grahl (:frg)]

(Might it be clearer to switch the blocks

Our new code is the same as Fx does it now:
https://dxr.mozilla.org/comm-central/source/browser/components/sessionstore/SessionStore.jsm#1221

Our sessionstore code needs a makeover. Switched would probably be better but there seems to be no longer an else in Mozilla browser code. So better let it stay for now to ease backporting.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/128a2ee8274f
Do not use preprocessing in nsSessionStore.js. r=IanN

Comment 6

[Frank-Rainer Grahl (:frg)]

https://hg.mozilla.org/releases/comm-esr60/rev/1fb6016c237d81d4b828b86692de1c504e728a76

Comment 7

[Frank-Rainer Grahl (:frg)]

Target 2.53.1
https://gitlab.com/seamonkey-project/seamonkey-2.53-comm/-/commit/4412ebab69bba09ddcffb812f915b9de5767c48e