Revert 205184 "Revert 204057 "Recurse to a maximum depth of 10 i..."

trunk/src/content/renderer/v8_value_converter_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_V8_VALUE_CONVERTER_IMPL_H_
 #define CONTENT_RENDERER_V8_VALUE_CONVERTER_IMPL_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
   virtual void SetStripNullFromObjects(bool val) OVERRIDE;
   virtual v8::Handle<v8::Value> ToV8Value(
       const base::Value* value,
       v8::Handle<v8::Context> context) const OVERRIDE;
   virtual base::Value* FromV8Value(
       v8::Handle<v8::Value> value,
       v8::Handle<v8::Context> context) const OVERRIDE;
 
  private:
   friend class ScopedAvoidIdentityHashForTesting;
-  typedef std::multimap<int, v8::Handle<v8::Object> > HashToHandleMap;
+
+  class FromV8ValueState;
 
   v8::Handle<v8::Value> ToV8ValueImpl(const base::Value* value) const;
   v8::Handle<v8::Value> ToV8Array(const base::ListValue* list) const;
   v8::Handle<v8::Value> ToV8Object(
       const base::DictionaryValue* dictionary) const;
   v8::Handle<v8::Value> ToArrayBuffer(const base::BinaryValue* value) const;
 
   base::Value* FromV8ValueImpl(v8::Handle<v8::Value> value,
-                               HashToHandleMap* unique_map) const;
+                               FromV8ValueState* state) const;
   base::Value* FromV8Array(v8::Handle<v8::Array> array,
-                           HashToHandleMap* unique_map) const;
+                           FromV8ValueState* state) const;
 
   // This will convert objects of type ArrayBuffer or any of the
   // ArrayBufferView subclasses. The return value will be NULL if |value| is
   // not one of these types.
   base::BinaryValue* FromV8Buffer(v8::Handle<v8::Value> value) const;
 
   base::Value* FromV8Object(v8::Handle<v8::Object> object,
-                            HashToHandleMap* unique_map) const;
-
-  // If |handle| is not in |map|, then add it to |map| and return true.
-  // Otherwise do nothing and return false. Here "A is unique" means that no
-  // other handle B in the map points to the same object as A. Note that A can
-  // be unique even if there already is another handle with the same identity
-  // hash (key) in the map, because two objects can have the same hash.
-  bool UpdateAndCheckUniqueness(HashToHandleMap* map,
-                                v8::Handle<v8::Object> handle) const;
+                            FromV8ValueState* state) const;
 
   // If true, we will convert Date JavaScript objects to doubles.
   bool date_allowed_;
 
   // If true, we will convert RegExp JavaScript objects to string.
   bool reg_exp_allowed_;
 
   // If true, we will convert Function JavaScript objects to dictionaries.
   bool function_allowed_;
 
   // If true, undefined and null values are ignored when converting v8 objects
   // into Values.
   bool strip_null_from_objects_;
 
   bool avoid_identity_hash_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(V8ValueConverterImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_V8_VALUE_CONVERTER_IMPL_H_