Bug 1416384 - Part 2c: Get nsGlobalWindowInner.cpp building, r=smaug

MozReview-Commit-ID: CmKx5jtvtrT

--HG--
extra : rebase_source : b1c5fe7c140a743d55c462b6d2bcbf8a97950d9c

dom/base/Element.h

@@ -55,7 +55,8 @@ class nsContentList;
 class nsDOMTokenList;
 struct nsRect;
 class nsFocusManager;
-class nsGlobalWindow;
+class nsGlobalWindowInner;
+class nsGlobalWindowOuter;
 class nsICSSDeclaration;
 class nsISMILAttr;
 class nsDocument;
@@ -613,7 +614,8 @@ private:
   // Need to allow the ESM, nsGlobalWindow, and the focus manager to
   // set our state
   friend class mozilla::EventStateManager;
-  friend class ::nsGlobalWindow;
+  friend class ::nsGlobalWindowInner;
+  friend class ::nsGlobalWindowOuter;
   friend class ::nsFocusManager;
 
   // Allow CusomtElementRegistry to call AddStates.

dom/base/moz.build

@@ -390,6 +390,7 @@ SOURCES += [
     'nsFrameMessageManager.cpp',
     # This file has a #error "Never include windows.h in this file!"
     # 'nsGlobalWindow.cpp',
+    'nsGlobalWindowInner.cpp',
     # Conflicts with windows.h's definition of LoadImage.
     'nsImageLoadingContent.cpp',
     # Because of OS X headers.

dom/base/nsDOMClassInfo.h

@@ -20,8 +20,8 @@
 #endif
 
 struct nsGlobalNameStruct;
-class nsGlobalWindow;
 class nsGlobalWindowInner;
+class nsGlobalWindowOuter;
 
 struct nsDOMClassInfoData;
 
@@ -145,7 +145,8 @@ protected:
                                 JS::Handle<JSObject*> obj, JS::Handle<jsid> id,
                                 JS::MutableHandle<JS::PropertyDescriptor> desc);
 
-  friend class nsGlobalWindow;
+  friend class nsGlobalWindowInner;
+  friend class nsGlobalWindowOuter;
 public:
   static bool NameStructEnabled(JSContext* aCx, nsGlobalWindowInner *aWin,
                                 const nsAString& aName,

dom/base/nsGlobalWindow.h

@@ -7,6 +7,24 @@
 #ifndef nsGlobalWindow_h___
 #define nsGlobalWindow_h___
 
+// XXX(nika): Figure out where to put this?
+#define DEFAULT_HOME_PAGE "www.mozilla.org"
+#define PREF_BROWSER_STARTUP_HOMEPAGE "browser.startup.homepage"
+
+// Amount of time allowed between alert/prompt/confirm before enabling
+// the stop dialog checkbox.
+#define DEFAULT_SUCCESSIVE_DIALOG_TIME_LIMIT 3 // 3 sec
+
+// Maximum number of successive dialogs before we prompt users to disable
+// dialogs for this window.
+#define MAX_SUCCESSIVE_DIALOG_COUNT 5
+
+// Idle fuzz time upper limit
+#define MAX_IDLE_FUZZ_TIME_MS 90000
+
+// Min idle notification time in seconds.
+#define MIN_IDLE_NOTIFICATION_TIME_S 1
+
 // NOTE: This is so that I can rewrite the includes in a separate patch.
 // Specificially I don't think I want to change this until I've moved everything
 // to mozilla/dom/Window.h and mozilla/dom/WindowProxy.h.

dom/base/nsPIDOMWindow.h

@@ -22,7 +22,8 @@
 #define DOM_WINDOW_FROZEN_TOPIC "dom-window-frozen"
 #define DOM_WINDOW_THAWED_TOPIC "dom-window-thawed"
 
-class nsGlobalWindow;
+class nsGlobalWindowInner;
+class nsGlobalWindowOuter;
 class nsIArray;
 class nsIContent;
 class nsICSSDeclaration;
@@ -765,7 +766,8 @@ protected:
 // and memory layout!
 class nsPIDOMWindowInner : public nsPIDOMWindow<mozIDOMWindow>
 {
-  friend nsGlobalWindow;
+  friend nsGlobalWindowInner;
+  friend nsGlobalWindowOuter;
 
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_PIDOMWINDOWINNER_IID)

dom/bindings/BindingUtils.h

@@ -1025,7 +1025,9 @@ struct TypeNeedsOuterization
   // We only need to outerize Window objects, so anything inheriting from
   // nsGlobalWindow (which inherits from EventTarget itself).
   static const bool value =
-    IsBaseOf<nsGlobalWindow, T>::value || IsSame<EventTarget, T>::value;
+    IsBaseOf<nsGlobalWindowInner, T>::value ||
+    IsBaseOf<nsGlobalWindowOuter, T>::value ||
+    IsSame<EventTarget, T>::value;
 };
 
 #ifdef DEBUG