1226796 - Remove redundant preprocessor flags in nsContainerFrame.cpp

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Jared Wein [:jaws] (please needinfo? me)]

At the top of nsContainerFrame.cpp,

#ifdef DEBUG
#undef NOISY
#else
#undef NOISY
#endif

Looking at CVS history, this was added as:
https://github.com/ehsan/mozilla-cvs-history/commit/7f1e47459da795d415131632910b99e25f381747
#ifdef NS_DEBUG
#undef NOISY
#else
#undef NOISY
#endif

We can simplify this to just:
#undef NOISY

Comment 1

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch

Comment 2

[Jonathan Kew [:jfkthame]]

AFAICS there's nothing left that depends on NOISY in that file, so how about simply removing it altogether here?

Comment 3

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch v1.1

OK, I removed the #undef NOISY since I don't see any reference to NOISY within nsContainerFrame.cpp either.

I ran through `hg log` of nsContainerFrame.cpp since hg@1 and didn't see any removals or additions to usages of NOISY. I didn't do a check of CVS history.

Comment 4

[Jonathan Kew [:jfkthame]]

Comment on attachment 8690969 [details] [diff] [review]
Patch v1.1

Review of attachment 8690969 [details] [diff] [review]:
-----------------------------------------------------------------

::: layout/generic/nsContainerFrame.cpp
@@ +591,5 @@
>  static bool
>  IsTopLevelWidget(nsIWidget* aWidget)
>  {
>    nsWindowType windowType = aWidget->WindowType();
> +#ifdef XP_WIN

What's up here? Was this change intended to be part of this patch?

Comment 5

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch v1.2

Sorry, that crept through from a different patch I was working on.

Comment 6

[Jonathan Kew [:jfkthame]]

Comment on attachment 8691406 [details] [diff] [review]
Patch v1.2

Review of attachment 8691406 [details] [diff] [review]:
-----------------------------------------------------------------

I suspected as much. :) Thanks for cleaning up.

Comment 7

[Jared Wein [:jaws] (please needinfo? me)]

https://hg.mozilla.org/integration/fx-team/rev/72d69c46d14ce1742ab72425607291c7256de83f
Bug 1226796 - Remove redundant preprocessor flags in nsContainerFrame.cpp. r=jfkthame

Comment 8

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/72d69c46d14c