847110 - Fix up includes in layout/style

Status: RESOLVED FIXED

(Core :: CSS Parsing and Computation, defect)

Description

[David Zbarsky (:dzbarsky)]

Attachment: Patch

Comment 1

[David Zbarsky (:dzbarsky)]

Attachment: Patch

Comment 2

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

Could you explain what led you to make this set of changes?  (Was the goal to reduce a particular set of #includes?  What set?)

Comment 3

[David Zbarsky (:dzbarsky)]

I remembered having to rebuild seemingly random parts of the tree when changing code under layout/style so I figured if less headers include each other it would make rebuilding easier.  This patch is the output of running include-what-you-use, which I fixed up.

Comment 4

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

So the pattern of using:
  class Foo;
  friend class Foo;
  class Foo {
     ...
  };
for nested classes is needed in C++98 (where nested classes don't automatically have access to private/protected members of their outer class) but not in C++11.  I'd prefer to leave all of those rather than removing them; some ports might still be depending on those.

Comment 5

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

Comment on attachment 720338 [details] [diff] [review]
Patch

>diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h
>--- a/layout/style/nsCSSValue.h
>+++ b/layout/style/nsCSSValue.h
>@@ -23,18 +23,16 @@
> #include "nsStyleConsts.h"
> #include "mozilla/FloatingPoint.h"
> 
> class imgRequestProxy;
> class nsIDocument;
> class nsIPrincipal;
> class nsPresContext;
> class nsIURI;
>-template <class T>
>-class nsPtrHashKey;

Seems like you ought to leave this as well.

(also see previous comment)

Otherwise the patch looks fine.


So r=dbaron with those parts left.  (Note that there are quite a few nested classes where you removed the friend declarations and the declarations needed before the friend declarations.)

Comment 6

[David Zbarsky (:dzbarsky)]

Landed with all the friend declarations put back.
https://hg.mozilla.org/integration/mozilla-inbound/rev/d3c43fa2f2ae

Comment 7

[David Zbarsky (:dzbarsky)]

And https://hg.mozilla.org/integration/mozilla-inbound/rev/82d62fac2ac6 to fix windows builds.

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/d3c43fa2f2ae
https://hg.mozilla.org/mozilla-central/rev/82d62fac2ac6