Bug 1478879 - Remove Range/Enum use in devtools/. r=sfink

--HG--
extra : rebase_source : 6ebdd04529e347cc47235355e952f6d59b796383
This commit is contained in:
Nicholas Nethercote 2018-07-31 10:31:00 +10:00
Родитель d0da0b5842
Коммит 93bbf0be8b
2 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -462,8 +462,8 @@ HeapSnapshot::init(JSContext* cx, const uint8_t* buffer, uint32_t size)
// Check the set of node ids referred to by edges we found and ensure that we
// have the node corresponding to each id. If we don't have all of them, it is
// unsafe to perform analyses of this heap snapshot.
for (auto range = edgeReferents.all(); !range.empty(); range.popFront()) {
if (NS_WARN_IF(!nodes.has(range.front())))
for (auto iter = edgeReferents.iter(); !iter.done(); iter.next()) {
if (NS_WARN_IF(!nodes.has(iter.get())))
return false;
}
@ -653,11 +653,11 @@ HeapSnapshot::ComputeShortestPaths(JSContext*cx, uint64_t start,
return;
}
for (auto range = shortestPaths.eachTarget(); !range.empty(); range.popFront()) {
JS::RootedValue key(cx, JS::NumberValue(range.front().identifier()));
for (auto iter = shortestPaths.targetIter(); !iter.done(); iter.next()) {
JS::RootedValue key(cx, JS::NumberValue(iter.get().identifier()));
JS::AutoValueVector paths(cx);
bool ok = shortestPaths.forEachPath(range.front(), [&](JS::ubi::Path& path) {
bool ok = shortestPaths.forEachPath(iter.get(), [&](JS::ubi::Path& path) {
JS::AutoValueVector pathValues(cx);
for (JS::ubi::BackEdge* edge : path) {

Просмотреть файл

@ -270,13 +270,13 @@ struct JS_PUBLIC_API(ShortestPaths)
}
/**
* Get a range that iterates over each target node we searched for retaining
* paths for. The returned range must not outlive the `ShortestPaths`
* Get an iterator over each target node we searched for retaining paths
* for. The returned iterator must not outlive the `ShortestPaths`
* instance.
*/
NodeSet::Range eachTarget() const {
NodeSet::Iterator targetIter() const {
MOZ_ASSERT(initialized());
return targets_.all();
return targets_.iter();
}
/**