wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout 6249e4edb023 (Bug 1191099) for build bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Terrence Cole 2015-08-05 12:09:19 -07:00
parent 65ec7788d4
commit 2e1631c94e
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/NamespaceImports.h
View File

@ -13,7 +13,6 @@
// These includes are needed these for some typedefs (e.g. HandleValue) and
// functions (e.g. NullValue())...
#include "js/CallNonGenericMethod.h"
#include "js/TraceableVector.h"
#include "js/TypeDecls.h"
#include "js/Value.h"
@ -34,6 +33,7 @@ class AutoVectorRooter;
typedef AutoVectorRooter<Value> AutoValueVector;
typedef AutoVectorRooter<jsid> AutoIdVector;
typedef AutoVectorRooter<JSObject*> AutoObjectVector;
typedef AutoVectorRooter<JSFunction*> AutoFunctionVector;
typedef AutoVectorRooter<JSScript*> AutoVector;
class AutoIdArray;
@ -81,13 +81,9 @@ using JS::AutoVectorRooter;
typedef AutoVectorRooter<Value> AutoValueVector;
typedef AutoVectorRooter<jsid> AutoIdVector;
typedef AutoVectorRooter<JSObject*> AutoObjectVector;
typedef AutoVectorRooter<JSFunction*> AutoFunctionVector;
typedef AutoVectorRooter<JSScript*> AutoScriptVector;
using ValueVector = TraceableVector<JS::Value>;
using IdVector = TraceableVector<jsid>;
using ObjectVector = TraceableVector<JSObject*>;
using ScriptVector = TraceableVector<JSScript*>;
using JS::AutoIdArray;
using JS::AutoHashMapRooter;

4
js/src/frontend/Parser.h
View File

@ -232,7 +232,7 @@ struct ParseContext : public GenericParseContext
the same name. */
// All inner functions in this context. Only filled in when parsing syntax.
Rooted<TraceableVector<JSFunction*>> innerFunctions;
AutoFunctionVector innerFunctions;
// In a function context, points to a Directive struct that can be updated
// to reflect new directives encountered in the Directive Prologue that
@ -273,7 +273,7 @@ struct ParseContext : public GenericParseContext
oldpc(prs->pc),
lexdeps(prs->context),
funcStmts(nullptr),
innerFunctions(prs->context, TraceableVector<JSFunction*>(prs->context)),
innerFunctions(prs->context),
newDirectives(newDirectives),
inDeclDestructuring(false)
{

7
js/src/jsapi.h
View File

@ -28,7 +28,6 @@
#include "js/Id.h"
#include "js/Principals.h"
#include "js/RootingAPI.h"
#include "js/TraceableVector.h"
#include "js/TracingAPI.h"
#include "js/Utility.h"
#include "js/Value.h"
@ -215,13 +214,9 @@ class MOZ_STACK_CLASS AutoVectorRooter : public AutoVectorRooterBase<T>
typedef AutoVectorRooter<Value> AutoValueVector;
typedef AutoVectorRooter<jsid> AutoIdVector;
typedef AutoVectorRooter<JSObject*> AutoObjectVector;
typedef AutoVectorRooter<JSFunction*> AutoFunctionVector;
typedef AutoVectorRooter<JSScript*> AutoScriptVector;
using ValueVector = js::TraceableVector<JS::Value>;
using IdVector = js::TraceableVector<jsid>;
using ObjectVector = js::TraceableVector<JSObject*>;
using ScriptVector = js::TraceableVector<JSScript*>;
template<class Key, class Value>
class AutoHashMapRooter : protected AutoGCRooter
{