Bug 902111 - Forward-declare nsIFrame in nsISelectionPrivate.h; r=bzbarsky

content/base/public/nsISelectionPrivate.idl

@@ -14,11 +14,13 @@ interface nsIContent;
 interface nsINode;
 
 %{C++
+class nsIFrame;
 struct nsTextRangeStyle;
 struct nsPoint;
 struct ScrollAxis;
+#include "nsDirection.h"
 #include "nsTArray.h"
-#include "nsIFrame.h"
+#include "nsIPresShell.h" // TODO: Remove this include
 %}
 
 [ptr] native nsIFrame(nsIFrame);

editor/libeditor/base/IMETextTxn.cpp

@@ -12,6 +12,7 @@
 #include "nsGUIEvent.h"                 // for nsTextRangeStyle
 #include "nsIDOMCharacterData.h"        // for nsIDOMCharacterData
 #include "nsIDOMRange.h"                // for nsRange::SetEnd, etc
+#include "nsIContent.h"                 // for nsIContent
 #include "nsIEditor.h"                  // for nsIEditor
 #include "nsIPresShell.h"               // for SelectionType
 #include "nsIPrivateTextRange.h"        // for nsIPrivateTextRange, etc

layout/generic/Selection.h

@@ -13,11 +13,13 @@
 #include "nsISelectionController.h"
 #include "nsISelectionPrivate.h"
 #include "nsRange.h"
+#include "nsThreadUtils.h"
 
 struct CachedOffsetForFrame;
 class nsAutoScrollTimer;
 class nsIContentIterator;
 class nsIFrame;
+class nsFrameSelection;
 struct SelectionDetails;
 
 struct RangeData

layout/generic/moz.build

@@ -12,6 +12,7 @@ EXPORTS += [
     'ScrollbarActivity.h',
     'Selection.h',
     'nsCanvasFrame.h',
+    'nsDirection.h',
     'nsFrameIdList.h',
     'nsFrameList.h',
     'nsFrameSelection.h',

layout/generic/nsDirection.h

@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=78: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsDirection_h___
+#define nsDirection_h___
+
+// This file makes the nsDirection enum present both in nsIFrame.h and
+// nsISelectionPrivate.h.
+
+enum nsDirection {
+  eDirNext    = 0,
+  eDirPrevious= 1
+};
+
+#endif
+

layout/generic/nsIFrame.h

@@ -33,6 +33,7 @@
 #include "mozilla/css/ImageLoader.h"
 #include "FramePropertyTable.h"
 #include "mozilla/TypedEnum.h"
+#include "nsDirection.h"
 #include <algorithm>
 
 #ifdef ACCESSIBILITY
@@ -355,11 +356,6 @@ enum nsSelectionAmount {
                          // behavior is
 };
 
-enum nsDirection {
-  eDirNext    = 0,
-  eDirPrevious= 1
-};
-
 enum nsSpread {
   eSpreadNone   = 0,
   eSpreadAcross = 1,