Bug 1031092 followup - Give up on moving jsproxy.h and jswrapper.h; fix bustage on a CLOSED TREE. (r=BurningManWasLastWeekRight?)
authorEric Faust <efaustbmo@gmail.com>
Tue, 09 Sep 2014 14:31:20 -0700
changeset 204332 e86946fb9889d1632406b6233819a58d61b30454
parent 204331 ec8a228486a846f508284df3ef64c99aec09e225
child 204333 f243b7ed0becdf3a2f28354cda481c890b16a2b4
push id48892
push userefaustbmo@gmail.com
push dateTue, 09 Sep 2014 21:31:29 +0000
treeherdermozilla-inbound@e86946fb9889 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBurningManWasLastWeekRight
bugs1031092
milestone35.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 1031092 followup - Give up on moving jsproxy.h and jswrapper.h; fix bustage on a CLOSED TREE. (r=BurningManWasLastWeekRight?)
js/src/jsproxy.h
js/src/jswrapper.h
js/src/moz.build
js/src/proxy/CrossCompartmentWrapper.cpp
js/src/proxy/DeadObjectProxy.cpp
js/src/proxy/Proxy.cpp
js/src/proxy/SecurityWrapper.cpp
js/src/proxy/Wrapper.cpp
js/src/proxy/jsproxy.h
js/src/proxy/jswrapper.h
rename from js/src/proxy/jsproxy.h
rename to js/src/jsproxy.h
--- a/js/src/proxy/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 proxy_jsproxy_h
-#define proxy_jsproxy_h
+#ifndef jsproxy_h
+#define jsproxy_h
 
 #include "mozilla/Maybe.h"
 
 #include "jsfriendapi.h"
 
 #include "js/CallNonGenericMethod.h"
 #include "js/Class.h"
 
rename from js/src/proxy/jswrapper.h
rename to js/src/jswrapper.h
--- a/js/src/proxy/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 proxy_jswrapper_h
-#define proxy_jswrapper_h
+#ifndef jswrapper_h
+#define jswrapper_h
 
 #include "mozilla/Attributes.h"
 
 #include "jsproxy.h"
 
 namespace js {
 
 class DummyFrameGuard;
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -48,22 +48,22 @@ EXPORTS += [
     'jsalloc.h',
     'jsapi.h',
     'jsbytecode.h',
     'jsclist.h',
     'jscpucfg.h',
     'jsfriendapi.h',
     'jsprf.h',
     'jsprototypes.h',
+    'jsproxy.h',
     'jspubtd.h',
     'jstypes.h',
     'jsversion.h',
+    'jswrapper.h',
     'perf/jsperf.h',
-    'proxy/jsproxy.h',
-    'proxy/jswrapper.h',
 ]
 
 # If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so
 # that we ensure we don't over-expose our internal integer typedefs.  Note that
 # LegacyIntTypes.h below is deliberately exempted from this requirement.
 EXPORTS.js += [
     '../public/Anchor.h',
     '../public/CallArgs.h',
--- a/js/src/proxy/CrossCompartmentWrapper.cpp
+++ b/js/src/proxy/CrossCompartmentWrapper.cpp
@@ -1,18 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 "jsiter.h"
 #include "jswrapper.h"
 
-#include "jsiter.h"
-
 #include "proxy/DeadObjectProxy.h"
 #include "vm/WrapperObject.h"
 
 #include "jscompartmentinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
 
--- a/js/src/proxy/DeadObjectProxy.cpp
+++ b/js/src/proxy/DeadObjectProxy.cpp
@@ -9,18 +9,16 @@
 #include "jsapi.h"
 #include "jsfun.h" // XXXefaust Bug 1064662
 
 #include "vm/ProxyObject.h"
 
 using namespace js;
 using namespace js::gc;
 
-typedef JSPropertyDescriptor PropertyDescriptor;
-
 bool
 DeadObjectProxy::isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const
 {
     // This is kind of meaningless, but dead-object semantics aside,
     // [[Extensible]] always being true is consistent with other proxy types.
     *extensible = true;
     return true;
 }
--- a/js/src/proxy/Proxy.cpp
+++ b/js/src/proxy/Proxy.cpp
@@ -1,22 +1,21 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 "jsproxy.h"
-
 #include <string.h>
 
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsgc.h"
+#include "jsproxy.h"
 #include "jswrapper.h"
 
 #include "gc/Marking.h"
 #include "proxy/DeadObjectProxy.h"
 #include "proxy/ScriptedDirectProxyHandler.h"
 #include "proxy/ScriptedIndirectProxyHandler.h"
 #include "vm/WrapperObject.h"
 
--- a/js/src/proxy/SecurityWrapper.cpp
+++ b/js/src/proxy/SecurityWrapper.cpp
@@ -1,18 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 "jsapi.h"
 #include "jswrapper.h"
 
-#include "jsapi.h"
-
 #include "jsatominlines.h"
 
 using namespace js;
 
 template <class Base>
 bool
 SecurityWrapper<Base>::isExtensible(JSContext *cx, HandleObject wrapper, bool *extensible) const
 {
--- a/js/src/proxy/Wrapper.cpp
+++ b/js/src/proxy/Wrapper.cpp
@@ -1,19 +1,18 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 "jswrapper.h"
-
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsexn.h"
+#include "jswrapper.h"
 
 #include "vm/ErrorObject.h"
 #include "vm/WrapperObject.h"
 
 #include "jsobjinlines.h"
 
 using namespace js;