Bug 1189490 - Follow ups: Move [Traceable]Fifo to js/src/ds. r=terrence

This commit is contained in:
Nick Fitzgerald 2015-08-10 13:15:00 -04:00
parent 86daef10e5
commit e8a2dde4aa
6 changed files with 4 additions and 7 deletions

View File

@ -7,8 +7,8 @@
#ifndef js_TraceableFifo_h
#define js_TraceableFifo_h
#include "ds/Fifo.h"
#include "js/RootingAPI.h"
#include "js/Fifo.h"
namespace js {

View File

@ -5,8 +5,8 @@
* 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 "ds/TraceableFifo.h"
#include "js/RootingAPI.h"
#include "js/TraceableFifo.h"
#include "js/TraceableHashTable.h"
#include "js/TraceableVector.h"

View File

@ -108,7 +108,6 @@ EXPORTS.js += [
'../public/Conversions.h',
'../public/Date.h',
'../public/Debug.h',
'../public/Fifo.h',
'../public/GCAPI.h',
'../public/HashTable.h',
'../public/HeapAPI.h',
@ -123,7 +122,6 @@ EXPORTS.js += [
'../public/RootingAPI.h',
'../public/SliceBudget.h',
'../public/StructuredClone.h',
'../public/TraceableFifo.h',
'../public/TraceableHashTable.h',
'../public/TraceableVector.h',
'../public/TraceKind.h',

View File

@ -1744,8 +1744,7 @@ Debugger::appendAllocationSite(JSContext* cx, HandleObject obj, HandleSavedFrame
auto className = obj->getClass()->name;
auto size = JS::ubi::Node(obj.get()).size(cx->runtime()->debuggerMallocSizeOf);
if (!allocationsLog.emplaceBack(wrappedFrame, when, className, ctorName, size))
{
if (!allocationsLog.emplaceBack(wrappedFrame, when, className, ctorName, size)) {
ReportOutOfMemory(cx);
return false;
}

View File

@ -19,12 +19,12 @@
#include "jsweakmap.h"
#include "jswrapper.h"
#include "ds/TraceableFifo.h"
#include "gc/Barrier.h"
#include "js/Debug.h"
#include "js/HashTable.h"
#include "vm/GlobalObject.h"
#include "vm/SavedStacks.h"
#include "js/TraceableFifo.h"
enum JSTrapStatus {
JSTRAP_ERROR,