Bug 1292289, part 1 - Stop unnecessarily using xpcprivate in XPCWrapper.h. r=mrbkap
authorAndrew McCreight <continuation@gmail.com>
Thu, 04 Aug 2016 11:14:35 -0700
changeset 308172 3df8701bddbe29de6a3f62db19aa0692b564bc28
parent 308171 ef9686b6cf25780789381aebbd562c5194feb149
child 308173 998eab06f1217e7c0479d7f6bf37efbecd30ec4d
push id31077
push useramccreight@mozilla.com
push dateThu, 04 Aug 2016 20:26:36 +0000
treeherderautoland@e02666d4e3e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1292289
milestone51.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 1292289, part 1 - Stop unnecessarily using xpcprivate in XPCWrapper.h. r=mrbkap This file is included in caps/, but it only uses generic JS things, aside from a macro. AccessCheck.cpp was bootlegging xpcprivate.h. MozReview-Commit-ID: C6fGOFxsTvg
js/xpconnect/src/XPCWrapper.h
js/xpconnect/wrappers/AccessCheck.cpp
--- a/js/xpconnect/src/XPCWrapper.h
+++ b/js/xpconnect/src/XPCWrapper.h
@@ -2,18 +2,17 @@
 /* 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/. */
 
 #ifndef XPC_WRAPPER_H
 #define XPC_WRAPPER_H 1
 
-#include "xpcprivate.h"
-#include "jswrapper.h"
+#include "js/TypeDecls.h"
 
 namespace XPCNativeWrapper {
 
 // Given an XPCWrappedNative pointer and the name of the function on
 // XPCNativeScriptableFlags corresponding with a flag, returns 'true'
 // if the flag is set.
 // XXX Convert to using GetFlags() and not a macro.
 #define NATIVE_HAS_FLAG(_wn, _flag)                                           \
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@@ -14,16 +14,17 @@
 
 #include "jsfriendapi.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/LocationBinding.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
 #include "nsIDOMWindowCollection.h"
 #include "nsJSUtils.h"
+#include "xpcprivate.h"
 
 using namespace mozilla;
 using namespace JS;
 using namespace js;
 
 namespace xpc {
 
 nsIPrincipal*