Bug 1141931 part 5 - Eliminate unnecessary includes in header files of ruby frames. r=dholbert

layout/generic/RubyUtils.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "RubyUtils.h"
+#include "nsRubyBaseContainerFrame.h"
 
 using namespace mozilla;
 

layout/generic/RubyUtils.h

@@ -8,9 +8,10 @@
 #define mozilla_RubyUtils_h_
 
 #include "nsGkAtoms.h"
-#include "nsRubyBaseContainerFrame.h"
 #include "nsRubyTextContainerFrame.h"
 
+class nsRubyBaseContainerFrame;
+
 namespace mozilla {
 
 /**

layout/generic/nsLineLayout.cpp

@@ -25,6 +25,7 @@
 #include "nsStyleStructInlines.h"
 #include "nsBidiPresUtils.h"
 #include "nsRubyFrame.h"
+#include "nsRubyTextFrame.h"
 #include "RubyUtils.h"
 #include <algorithm>
 

layout/generic/nsRubyBaseContainerFrame.cpp

@@ -7,7 +7,9 @@
 /* rendering object for CSS "display: ruby-base-container" */
 
 #include "nsRubyBaseContainerFrame.h"
-
+#include "nsRubyTextContainerFrame.h"
+#include "nsRubyBaseFrame.h"
+#include "nsRubyTextFrame.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/WritingModes.h"

layout/generic/nsRubyBaseContainerFrame.h

@@ -10,9 +10,6 @@
 #define nsRubyBaseContainerFrame_h___
 
 #include "nsContainerFrame.h"
-#include "nsRubyTextContainerFrame.h"
-#include "nsRubyBaseFrame.h"
-#include "nsRubyTextFrame.h"
 
 #define RTC_ARRAY_SIZE 1
 
@@ -27,6 +24,8 @@ namespace mozilla {
 struct RubyColumn;
 }
 
+class nsRubyTextContainerFrame;
+
 class nsRubyBaseContainerFrame final : public nsContainerFrame
 {
 public:

layout/generic/nsRubyTextContainerFrame.h

@@ -10,9 +10,6 @@
 #define nsRubyTextContainerFrame_h___
 
 #include "nsBlockFrame.h"
-#include "nsRubyBaseFrame.h"
-#include "nsRubyTextFrame.h"
-#include "nsLineLayout.h"
 
 typedef nsContainerFrame nsRubyTextContainerFrameSuper;