Bug 1416384 - Part 7: Move nsPIDOMWindow{Inner,Outer}::TabGroup into their respective cpps, r=smaug
authorNika Layzell <nika@thelayzells.com>
Wed, 15 Nov 2017 11:34:33 -0500
changeset 392035 149ba94317911ec3bafa545db59e59f7abe2fcf0
parent 392034 10eb6ec39ef1a34243c212c64047c7097499f8f8
child 392036 476642ee328b1363bd6505ed6ab04e57aeb75bdf
push id32909
push usercbrindusan@mozilla.com
push dateWed, 15 Nov 2017 22:25:14 +0000
treeherdermozilla-central@f41930a869a8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1416384
milestone59.0a1
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
Bug 1416384 - Part 7: Move nsPIDOMWindow{Inner,Outer}::TabGroup into their respective cpps, r=smaug MozReview-Commit-ID: AZMWwKFnvG9
dom/base/nsGlobalWindow.cpp
dom/base/nsGlobalWindowInner.cpp
dom/base/nsGlobalWindowOuter.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -789,28 +789,16 @@ IsInterval(const Optional<int32_t>& aTim
   }
 
   // If no interval was specified, treat this like a timeout, to avoid setting
   // an interval of 0 milliseconds.
   aResultTimeout = 0;
   return false;
 }
 
-mozilla::dom::TabGroup*
-nsPIDOMWindowInner::TabGroup()
-{
-  return nsGlobalWindowInner::Cast(this)->TabGroupInner();
-}
-
-mozilla::dom::TabGroup*
-nsPIDOMWindowOuter::TabGroup()
-{
-  return nsGlobalWindowOuter::Cast(this)->TabGroupOuter();
-}
-
 template<typename T>
 mozilla::dom::DocGroup*
 nsPIDOMWindow<T>::GetDocGroup() const
 {
   nsIDocument* doc = GetExtantDoc();
   if (doc) {
     return doc->GetDocGroup();
   }
--- a/dom/base/nsGlobalWindowInner.cpp
+++ b/dom/base/nsGlobalWindowInner.cpp
@@ -7927,16 +7927,22 @@ nsGlobalWindowInner::GetIntlUtils(ErrorR
 
   if (!mIntlUtils) {
     mIntlUtils = new IntlUtils(this);
   }
 
   return mIntlUtils;
 }
 
+mozilla::dom::TabGroup*
+nsPIDOMWindowInner::TabGroup()
+{
+  return nsGlobalWindowInner::Cast(this)->TabGroupInner();
+}
+
 /* static */ already_AddRefed<nsGlobalWindowInner>
 nsGlobalWindowInner::Create(nsGlobalWindowOuter *aOuterWindow, bool aIsChrome)
 {
   RefPtr<nsGlobalWindowInner> window = new nsGlobalWindowInner(aOuterWindow);
   if (aIsChrome) {
     window->mIsChrome = true;
     window->mCleanMessageManager = true;
   }
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -8082,16 +8082,22 @@ nsGlobalWindowOuter::TemporarilyDisableD
 
 nsGlobalWindowOuter::TemporarilyDisableDialogs::~TemporarilyDisableDialogs()
 {
   if (mTopWindow) {
     mTopWindow->mAreDialogsEnabled = mSavedDialogsEnabled;
   }
 }
 
+mozilla::dom::TabGroup*
+nsPIDOMWindowOuter::TabGroup()
+{
+  return nsGlobalWindowOuter::Cast(this)->TabGroupOuter();
+}
+
 /* static */ already_AddRefed<nsGlobalWindowOuter>
 nsGlobalWindowOuter::Create(bool aIsChrome)
 {
   RefPtr<nsGlobalWindowOuter> window = new nsGlobalWindowOuter();
   if (aIsChrome) {
     window->mIsChrome = true;
     window->mCleanMessageManager = true;
   }