Bug 1419597 - Part 15: Build nsGlobalWindow{Inner,Outer}.cpp separately, r=smaug
authorNika Layzell <nika@thelayzells.com>
Tue, 21 Nov 2017 16:43:14 -0500
changeset 393469 a96b4dda871e4770820abaa2550c784b0bddbd2c
parent 393468 21361dc9f44b407cd178f2a5bcaae8c24794f29f
child 393470 a9ec03aaf6507bb2376ef84003453e5ad4a4da83
push id32960
push usertoros@mozilla.com
push dateThu, 23 Nov 2017 22:29:10 +0000
treeherdermozilla-central@3f5d48c08903 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1419597
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 1419597 - Part 15: Build nsGlobalWindow{Inner,Outer}.cpp separately, r=smaug MozReview-Commit-ID: 7a1jiE7FKcs
dom/base/moz.build
dom/base/nsGlobalWindow.cpp
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -384,21 +384,19 @@ SOURCES += [
     # Several conflicts with other bindings.
     'DOMIntersectionObserver.cpp',
     # Because of OS X headers.
     'nsContentUtils.cpp',
     # this file doesn't like windows.h
     'nsDOMWindowUtils.cpp',
     # Conflicts with windows.h's definition of SendMessage.
     'nsFrameMessageManager.cpp',
-    # This file has a #error "Never include windows.h in this file!"
-    'nsGlobalWindow.cpp',
-    # These files are included by nsGlobalWindow.cpp
-    # 'nsGlobalWindowInner.cpp',
-    # 'nsGlobalWindowOuter.cpp',
+    # These files have a #error "Never include windows.h in this file!"
+    'nsGlobalWindowInner.cpp',
+    'nsGlobalWindowOuter.cpp',
     # Conflicts with windows.h's definition of LoadImage.
     'nsImageLoadingContent.cpp',
     # Because of OS X headers.
     'nsObjectLoadingContent.cpp',
     # nsPluginArray.cpp includes npapi.h indirectly, and that includes a lot of system headers
     'nsPluginArray.cpp',
 ]
 
deleted file mode 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* 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/. */
-
-#include <stdint.h>
-
-// Include the implementations for the inner and outer windows respectively.
-#include "nsGlobalWindowOuter.cpp"
-#include "nsGlobalWindowInner.cpp"