Follow up to bug 568691 - Fix some of the static windows build bustage that is due to various dependencies in layour widget and chrome. r=roc.
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Thu, 08 Jul 2010 09:01:28 -0700
changeset 47283 fd6df9c6073eab1a7e5d23bcdcd621a763ef8770
parent 47282 7c7f74ecf1c6933dcb5416dc7448622a8f4b839c
child 47284 2653733f8c82ef85bbc1a58afd0f7233b4e41102
push id14311
push userbugzilla@standard8.plus.com
push dateThu, 08 Jul 2010 16:02:45 +0000
treeherdermozilla-central@fd6df9c6073e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs568691
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Follow up to bug 568691 - Fix some of the static windows build bustage that is due to various dependencies in layour widget and chrome. r=roc.
content/base/public/nsContentUtils.h
dom/base/nsPIDOMWindow.h
layout/base/nsIPresShell.h
widget/public/nsEvent.h
widget/public/nsGUIEvent.h
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -125,16 +125,17 @@ class nsIXTFService;
 #endif
 #ifdef IBMBIDI
 class nsIBidiKeyboard;
 #endif
 class nsIMIMEHeaderParam;
 class nsIObserver;
 class nsPresContext;
 class nsIChannel;
+struct nsIntMargin;
 
 #ifndef have_PrefChangedFunc_typedef
 typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
 #define have_PrefChangedFunc_typedef
 #endif
 
 namespace mozilla {
   class IHistory;
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -44,17 +44,16 @@
 #include "nsIDOMLocation.h"
 #include "nsIDOMXULCommandDispatcher.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsPIDOMEventTarget.h"
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
 #include "nsEvent.h"
-#include "nsGUIEvent.h"
 
 #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
 
 class nsIPrincipal;
 
 // Popup control state enum. The values in this enum must go from most
 // permissive to least permissive so that it's safe to push state in
 // all situations. Pushing popup state onto the stack never makes the
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -54,17 +54,16 @@
 #ifndef nsIPresShell_h___
 #define nsIPresShell_h___
 
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 #include "nsISupports.h"
 #include "nsQueryFrame.h"
 #include "nsCoord.h"
-#include "nsRect.h"
 #include "nsColor.h"
 #include "nsEvent.h"
 #include "nsCompatibility.h"
 #include "nsFrameManagerBase.h"
 #include "mozFlushType.h"
 #include "nsWeakReference.h"
 #include <stdio.h> // for FILE definition
 #include "nsRefreshDriver.h"
@@ -93,16 +92,20 @@ template<class E> class nsCOMArray;
 class nsWeakFrame;
 class nsIScrollableFrame;
 class gfxASurface;
 class gfxContext;
 class nsIDOMEvent;
 class nsDisplayList;
 class nsDisplayListBuilder;
 class nsPIDOMWindow;
+struct nsPoint;
+struct nsIntPoint;
+struct nsRect;
+struct nsIntRect;
 
 typedef short SelectionType;
 typedef PRUint64 nsFrameState;
 
 namespace mozilla {
 namespace dom {
 class Element;
 } // namespace dom
--- a/widget/public/nsEvent.h
+++ b/widget/public/nsEvent.h
@@ -39,16 +39,22 @@
 #define nsEvent_h__
 
 /*
  * This is in a separate header file because it needs to be included
  * in many places where including nsGUIEvent.h would bring in many
  * header files that are totally unnecessary.
  */
 
+enum UIStateChangeType {
+  UIStateChangeType_NoChange,
+  UIStateChangeType_Set,
+  UIStateChangeType_Clear
+};
+
 /**
  * Return status for event processors.
  */
 
 enum nsEventStatus {  
     /// The event is ignored, do default processing
   nsEventStatus_eIgnore,            
     /// The event is consumed, don't do default processing
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -452,22 +452,16 @@ class nsHashKey;
 #define NS_ORIENTATION_EVENT         4000
 
 #define NS_SCROLLAREA_EVENT_START    4100
 #define NS_SCROLLEDAREACHANGED       (NS_SCROLLAREA_EVENT_START)
 
 #define NS_TRANSITION_EVENT_START    4200
 #define NS_TRANSITION_END            (NS_TRANSITION_EVENT_START)
 
-enum UIStateChangeType {
-  UIStateChangeType_NoChange,
-  UIStateChangeType_Set,
-  UIStateChangeType_Clear
-};
-
 /**
  * Return status for event processors, nsEventStatus, is defined in
  * nsEvent.h.
  */
 
 /**
  * different types of (top-level) window z-level positioning
  */