Merge 132922 - Remove ensureAuxiliaryContext

Source/WebKit/chromium/tests/IDBBindingUtilitiesTest.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  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 with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
+#include "Document.h"
+#include "Frame.h"
+#include "FrameTestHelpers.h"
 #include "IDBBindingUtilities.h"
 #include "IDBKey.h"
 #include "IDBKeyPath.h"
+#include "V8Binding.h"
 #include "V8PerIsolateData.h"
 #include "V8Utilities.h"
+#include "WebFrame.h"
+#include "WebFrameImpl.h"
+#include "WebView.h"
+#include "WorldContextHandle.h"
 
 #include <gtest/gtest.h>
 #include <wtf/Vector.h>
 
 #if ENABLE(INDEXED_DATABASE)
 
 using namespace WebCore;
+using namespace WebKit;
 
 namespace {
 
 PassRefPtr<IDBKey> checkKeyFromValueAndKeyPathInternal(const ScriptValue& value, const String& keyPath)
 {
     IDBKeyPath idbKeyPath(keyPath);
     EXPECT_TRUE(idbKeyPath.isValid());
     
     return createIDBKeyFromScriptValueAndKeyPath(value, idbKeyPath);
 }
@@ skipping 34 matching lines @@
 }
 
 void checkKeyPathNumberValue(const ScriptValue& value, const String& keyPath, int expected)
 {
     RefPtr<IDBKey> idbKey = checkKeyFromValueAndKeyPathInternal(value, keyPath);
     ASSERT_TRUE(idbKey.get());
     ASSERT_EQ(IDBKey::NumberType, idbKey->type());
     ASSERT_TRUE(expected == idbKey->number());
 }
 
+static v8::Handle<v8::Context> context()
+{
+    static WebView* webView;
+    if (!webView) {
+        webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
+        webView->setFocus(true);
+    }
+    ScriptExecutionContext* context = static_cast<WebFrameImpl*>(webView->mainFrame())->frame()->document();
+    return toV8Context(context, WorldContextHandle(UseCurrentWorld));
+}
+
 TEST(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyStringValue)
 {
     v8::HandleScope handleScope;
-    v8::Context::Scope scope(V8PerIsolateData::current()->ensureAuxiliaryContext());
+    v8::Context::Scope scope(context());
 
     v8::Local<v8::Object> object = v8::Object::New();
     object->Set(v8::String::New("foo"), v8::String::New("zoo"));
 
     ScriptValue scriptValue(object);
 
     checkKeyPathStringValue(scriptValue, "foo", "zoo");
     checkKeyPathNullValue(scriptValue, "bar");
 }
 
 TEST(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyNumberValue)
 {
     v8::HandleScope handleScope;
-    v8::Context::Scope scope(V8PerIsolateData::current()->ensureAuxiliaryContext());
+    v8::Context::Scope scope(context());
 
     v8::Local<v8::Object> object = v8::Object::New();
     object->Set(v8::String::New("foo"), v8::Number::New(456));
 
     ScriptValue scriptValue(object);
 
     checkKeyPathNumberValue(scriptValue, "foo", 456);
     checkKeyPathNullValue(scriptValue, "bar");
 }
 
 TEST(IDBKeyFromValueAndKeyPathTest, SubProperty)
 {
     v8::HandleScope handleScope;
-    v8::Context::Scope scope(V8PerIsolateData::current()->ensureAuxiliaryContext());
+    v8::Context::Scope scope(context());
 
     v8::Local<v8::Object> object = v8::Object::New();
     v8::Local<v8::Object> subProperty = v8::Object::New();
     subProperty->Set(v8::String::New("bar"), v8::String::New("zee"));
     object->Set(v8::String::New("foo"), subProperty);
 
     ScriptValue scriptValue(object);
 
     checkKeyPathStringValue(scriptValue, "foo.bar", "zee");
     checkKeyPathNullValue(scriptValue, "bar");
 }
 
 TEST(InjectIDBKeyTest, TopLevelPropertyStringValue)
 {
     v8::HandleScope handleScope;
-    v8::Context::Scope scope(V8PerIsolateData::current()->ensureAuxiliaryContext());
+    v8::Context::Scope scope(context());
 
     v8::Local<v8::Object> object = v8::Object::New();
     object->Set(v8::String::New("foo"), v8::String::New("zoo"));
 
     ScriptValue foozoo(object);
     checkInjection(IDBKey::createString("myNewKey"), foozoo, "bar");
     checkInjection(IDBKey::createNumber(1234), foozoo, "bar");
 
     checkInjectionFails(IDBKey::createString("key"), foozoo, "foo.bar");
 }
 
 TEST(InjectIDBKeyTest, SubProperty)
 {
     v8::HandleScope handleScope;
-    v8::Context::Scope scope(V8PerIsolateData::current()->ensureAuxiliaryContext());
+    v8::Context::Scope scope(context());
 
     v8::Local<v8::Object> object = v8::Object::New();
     v8::Local<v8::Object> subProperty = v8::Object::New();
     subProperty->Set(v8::String::New("bar"), v8::String::New("zee"));
     object->Set(v8::String::New("foo"), subProperty);
 
     ScriptValue scriptObject(object);
     checkInjection(IDBKey::createString("myNewKey"), scriptObject, "foo.baz");
     checkInjection(IDBKey::createNumber(789), scriptObject, "foo.baz");
     checkInjection(IDBKey::createDate(4567), scriptObject, "foo.baz");
     checkInjection(IDBKey::createDate(4567), scriptObject, "bar");
     checkInjection(IDBKey::createArray(IDBKey::KeyArray()), scriptObject, "foo.baz");
     checkInjection(IDBKey::createArray(IDBKey::KeyArray()), scriptObject, "bar");
 
     checkInjectionFails(IDBKey::createString("zoo"), scriptObject, "foo.bar.baz");
     checkInjection(IDBKey::createString("zoo"), scriptObject, "foo.xyz.foo");
 }
 
 } // namespace
 
 #endif // ENABLE(INDEXED_DATABASE)