summaryrefslogtreecommitdiffstats
path: root/content/renderer/v8_value_converter_impl_unittest.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-16 21:33:30 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-16 21:33:30 +0000
commit9a457556500d2eae7fd719f94304dad0ac5d4ebc (patch)
tree497ac3241245cd0d897b947656c0e223d3e0c611 /content/renderer/v8_value_converter_impl_unittest.cc
parent1fbb2cceb9a8205f4016f5cc51fa1a97fbca5b42 (diff)
downloadchromium_src-9a457556500d2eae7fd719f94304dad0ac5d4ebc.zip
chromium_src-9a457556500d2eae7fd719f94304dad0ac5d4ebc.tar.gz
chromium_src-9a457556500d2eae7fd719f94304dad0ac5d4ebc.tar.bz2
Revert 146852 - Forces V8ValueConverter to switch context when converting objects.
[This is a speculative revert. This is the largest patch in the blamelist and we have no idea how to proceed. http://build.chromium.org/p/chromium.memory/builders/Chromium%20OS%20ASAN%20Tests%20%281%29/builds/19 ] Objects passed into the V8ValueConverter may have fields that reference objects in a v8::Context different than the one that was passed in. This is very common for objects that were created in an isolated world and reference globals in that world (such as window). This fix will check to see if the current v8::Context is the same as the converting objects CreationContext(). If they are different, they will be swaped during the object's conversion. In addition, the V8ValueConverter has been expanded to have the ability to omit duplicate fileds in an object. This is very important when something with a graph structure (like a DOM node) is converted. Extra checks for integer/string fields have been added as in respone to Jakob's observation: https://code.google.com/p/chromium/issues/detail?id=134661#c5 BUG=134661, 135104 TEST=content_unittests::V8ValueConverterImplTest.RecursiveObject Review URL: https://chromiumcodereview.appspot.com/10704030 TBR=eaugusti@chromium.org Review URL: https://chromiumcodereview.appspot.com/10789024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/v8_value_converter_impl_unittest.cc')
-rw-r--r--content/renderer/v8_value_converter_impl_unittest.cc72
1 files changed, 0 insertions, 72 deletions
diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc
index a4e461f..a56941a 100644
--- a/content/renderer/v8_value_converter_impl_unittest.cc
+++ b/content/renderer/v8_value_converter_impl_unittest.cc
@@ -113,7 +113,6 @@ class V8ValueConverterImplTest : public testing::Test {
static_cast<DictionaryValue*>(
converter.FromV8Value(object, context_)));
ASSERT_TRUE(dictionary.get());
-
Value* temp = NULL;
ASSERT_TRUE(dictionary->Get("test", &temp));
EXPECT_EQ(expected_type, temp->GetType());
@@ -347,74 +346,3 @@ TEST_F(V8ValueConverterImplTest, StripNullFromObjects) {
ASSERT_TRUE(result.get());
EXPECT_EQ(0u, result->size());
}
-
-TEST_F(V8ValueConverterImplTest, RecursiveObjects) {
- v8::Context::Scope context_scope(context_);
- v8::HandleScope handle_scope;
-
- V8ValueConverterImpl converter;
-
- v8::Handle<v8::Object> object = v8::Object::New().As<v8::Object>();
- ASSERT_FALSE(object.IsEmpty());
- object->Set(v8::String::New("foo"), v8::String::New("bar"));
- object->Set(v8::String::New("obj"), object);
-
- scoped_ptr<DictionaryValue> object_result(
- static_cast<DictionaryValue*>(converter.FromV8Value(object, context_)));
- ASSERT_TRUE(object_result.get());
- EXPECT_EQ(2u, object_result->size());
- EXPECT_TRUE(IsNull(object_result.get(), "obj"));
-
- v8::Handle<v8::Array> array = v8::Array::New().As<v8::Array>();
- ASSERT_FALSE(array.IsEmpty());
- array->Set(0, v8::String::New("1"));
- array->Set(1, array);
-
- scoped_ptr<ListValue> list_result(
- static_cast<ListValue*>(converter.FromV8Value(array, context_)));
- ASSERT_TRUE(list_result.get());
- EXPECT_EQ(2u, list_result->GetSize());
- EXPECT_TRUE(IsNull(list_result.get(), 1));
-}
-
-TEST_F(V8ValueConverterImplTest, ObjectGetters) {
- v8::Context::Scope context_scope(context_);
- v8::HandleScope handle_scope;
-
- const char* source = "(function() {"
- "var a = {};"
- "a.__defineGetter__('foo', function() { return 'bar'; });"
- "return a;"
- "})();";
-
- v8::Handle<v8::Script> script(v8::Script::New(v8::String::New(source)));
- v8::Handle<v8::Object> object = script->Run().As<v8::Object>();
- ASSERT_FALSE(object.IsEmpty());
-
- V8ValueConverterImpl converter;
- scoped_ptr<DictionaryValue> result(
- static_cast<DictionaryValue*>(converter.FromV8Value(object, context_)));
- ASSERT_TRUE(result.get());
- EXPECT_EQ(1u, result->size());
-}
-
-TEST_F(V8ValueConverterImplTest, ArrayGetters) {
- v8::Context::Scope context_scope(context_);
- v8::HandleScope handle_scope;
-
- const char* source = "(function() {"
- "var a = [0];"
- "a.__defineGetter__(1, function() { return 'bar'; });"
- "return a;"
- "})();";
-
- v8::Handle<v8::Script> script(v8::Script::New(v8::String::New(source)));
- v8::Handle<v8::Array> array = script->Run().As<v8::Array>();
- ASSERT_FALSE(array.IsEmpty());
-
- V8ValueConverterImpl converter;
- scoped_ptr<ListValue> result(
- static_cast<ListValue*>(converter.FromV8Value(array, context_)));
- ASSERT_TRUE(result.get());
- EXPECT_EQ(2u, result->GetSize());
-}