Progress towards making Zones independent of Isolates and Threads.

src/splay-tree-inl.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 24 matching lines @@
 
 
 template<typename Config, class Allocator>
 SplayTree<Config, Allocator>::~SplayTree() {
   NodeDeleter deleter;
   ForEachNode(&deleter);
 }
 
 
 template<typename Config, class Allocator>
-bool SplayTree<Config, Allocator>::Insert(const Key& key, Locator* locator) {
+bool SplayTree<Config, Allocator>::Insert(const Key& key,
+                                          Locator* locator,
+                                          Allocator allocator) {
   if (is_empty()) {
     // If the tree is empty, insert the new node.
-    root_ = new Node(key, Config::NoValue());
+    root_ = new(allocator) Node(key, Config::NoValue());
   } else {
     // Splay on the key to move the last node on the search path
     // for the key to the root of the tree.
     Splay(key);
     // Ignore repeated insertions with the same key.
     int cmp = Config::Compare(key, root_->key_);
     if (cmp == 0) {
       locator->bind(root_);
       return false;
     }
     // Insert the new node.
-    Node* node = new Node(key, Config::NoValue());
+    Node* node = new(allocator) Node(key, Config::NoValue());
     InsertInternal(cmp, node);
   }
   locator->bind(root_);
   return true;
 }
 
 
 template<typename Config, class Allocator>
 void SplayTree<Config, Allocator>::InsertInternal(int cmp, Node* node) {
   if (cmp > 0) {
@@ skipping 213 matching lines @@
 
 
 template <typename Config, class Allocator> template <class Callback>
 void SplayTree<Config, Allocator>::ForEach(Callback* callback) {
   NodeToPairAdaptor<Callback> callback_adaptor(callback);
   ForEachNode(&callback_adaptor);
 }
 
 
 template <typename Config, class Allocator> template <class Callback>
-void SplayTree<Config, Allocator>::ForEachNode(Callback* callback) {
+void SplayTree<Config, Allocator>::ForEachNode(Callback* callback,
+                                               Allocator allocator) {
   // Pre-allocate some space for tiny trees.
   List<Node*, Allocator> nodes_to_visit(10);
-  if (root_ != NULL) nodes_to_visit.Add(root_);
+  if (root_ != NULL) nodes_to_visit.Add(root_, allocator);
   int pos = 0;
   while (pos < nodes_to_visit.length()) {
     Node* node = nodes_to_visit[pos++];
-    if (node->left() != NULL) nodes_to_visit.Add(node->left());
-    if (node->right() != NULL) nodes_to_visit.Add(node->right());
+    if (node->left() != NULL) nodes_to_visit.Add(node->left(), allocator);
+    if (node->right() != NULL) nodes_to_visit.Add(node->right(), allocator);
     callback->Call(node);
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SPLAY_TREE_INL_H_