Revert of Ensure DOMWrapperWorld always exists in all webkit_unit_tests...

Revert of Ensure DOMWrapperWorld always exists in all webkit_unit_tests (https://codereview.chromium.org/180743013/)

Reason for revert:
A few inspector tests are crashing:
WebCore::DOMWrapperWorld::ensureIsolatedWorld(int, int) [DOMWrapperWorld.cpp : 124 + 0x33]

Original issue's description:
> Ensure DOMWrapperWorld always exists in all webkit_unit_tests
> 
> Currently DOMWrapperWorld can be 0 in some tests. This is problematic since I want to make DOMWrapperWorld::current() callable from anywhere. Thus this CL adds DOMWrapperWorld to all webkit_unit_tests.
> 
> - It's verbose to initialize v8::HandleScope, v8::Context, v8::Context::Scope, V8PerContextData and DOMWrapperWorld in each test. So this CL adds a helper class (V8BindingTestScope) that does all the initialization work.
> 
> - This CL also fixes indentation of V8Binding.h.
> 
> BUG=341032
> NOTRY=true
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=168355

TBR=jochen@chromium.org,dcarney@chromium.org,haraken@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=341032

Review URL: https://codereview.chromium.org/183803017

git-svn-id: svn://svn.chromium.org/blink/trunk@168369 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/bindings/v8/DOMWrapperWorld.cpp

@@ -115,7 +115,7 @@ DOMWrapperWorld::~DOMWrapperWorld()
 #ifndef NDEBUG
 static bool isIsolatedWorldId(int worldId)
 {
-    return MainWorldId < worldId  && worldId <= EmbedderWorldIdLimit;
+    return worldId != MainWorldId && worldId != WorkerWorldId;
 }
 #endif
 

third_party/WebKit/Source/bindings/v8/DOMWrapperWorld.h

@@ -51,13 +51,12 @@ enum WorldIdConstants {
     EmbedderWorldIdLimit = (1 << 29),
     ScriptPreprocessorIsolatedWorldId,
     WorkerWorldId,
-    TestingWorldId,
 };
 
 // This class represent a collection of DOM wrappers for a specific world.
 class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
 public:
-    static PassRefPtr<DOMWrapperWorld> create(int worldId = -1, int extensionGroup = -1);
+    static PassRefPtr<DOMWrapperWorld> create(int worldId, int extensionGroup);
 
     static const int mainWorldExtensionGroup = 0;
     static PassRefPtr<DOMWrapperWorld> ensureIsolatedWorld(int worldId, int extensionGroup);
@@ -97,7 +96,7 @@ public:
 
     bool isMainWorld() const { return m_worldId == MainWorldId; }
     bool isWorkerWorld() const { return m_worldId == WorkerWorldId; }
-    bool isIsolatedWorld() const { return MainWorldId < m_worldId  && m_worldId <= EmbedderWorldIdLimit; }
+    bool isIsolatedWorld() const { return !isMainWorld() && !isWorkerWorld(); }
 
     int worldId() const { return m_worldId; }
     int extensionGroup() const { return m_extensionGroup; }

third_party/WebKit/Source/bindings/v8/IDBBindingUtilitiesTest.cpp

@@ -93,11 +93,14 @@ void checkKeyPathNumberValue(const ScriptValue& value, const String& keyPath, in
 class IDBKeyFromValueAndKeyPathTest : public testing::Test {
 public:
     IDBKeyFromValueAndKeyPathTest()
-        : m_scope(V8BindingTestScope::create(v8::Isolate::GetCurrent()))
+        : m_handleScope(v8::Isolate::GetCurrent())
+        , m_scope(v8::Context::New(v8::Isolate::GetCurrent()))
     {
     }
+
 private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    v8::HandleScope m_handleScope;
+    v8::Context::Scope m_scope;
 };
 
 TEST_F(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyStringValue)

third_party/WebKit/Source/bindings/v8/ScriptPromiseResolverTest.cpp

@@ -47,12 +47,16 @@ class ScriptPromiseResolverTest : public testing::Test {
 public:
     ScriptPromiseResolverTest()
         : m_isolate(v8::Isolate::GetCurrent())
+        , m_handleScope(m_isolate)
+        , m_context(m_isolate, v8::Context::New(m_isolate))
+        , m_contextScope(m_context.newLocal(m_isolate))
     {
     }
 
     void SetUp()
     {
-        m_scope = V8BindingTestScope::create(m_isolate);
+        // FIXME: Create a new world and pass it to V8PerContextData.
+        m_perContextData = V8PerContextData::create(m_context.newLocal(m_isolate), 0);
         m_promise = ScriptPromise::createPending();
         m_resolver = ScriptPromiseResolver::create(m_promise);
     }
@@ -61,7 +65,7 @@ public:
     {
         m_resolver = nullptr;
         m_promise.clear();
-        m_scope.clear();
+        m_perContextData.clear();
     }
 
     V8PromiseCustom::PromiseState state()
@@ -82,10 +86,12 @@ public:
 
 protected:
     v8::Isolate* m_isolate;
+    v8::HandleScope m_handleScope;
+    ScopedPersistent<v8::Context> m_context;
+    v8::Context::Scope m_contextScope;
     RefPtr<ScriptPromiseResolver> m_resolver;
     ScriptPromise m_promise;
-private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    OwnPtr<V8PerContextData> m_perContextData;
 };
 
 TEST_F(ScriptPromiseResolverTest, initialState)

third_party/WebKit/Source/bindings/v8/ScriptPromiseTest.cpp

@@ -47,17 +47,21 @@ class ScriptPromiseTest : public testing::Test {
 public:
     ScriptPromiseTest()
         : m_isolate(v8::Isolate::GetCurrent())
+        , m_handleScope(m_isolate)
+        , m_context(m_isolate, v8::Context::New(m_isolate))
+        , m_contextScope(m_context.newLocal(m_isolate))
     {
     }
 
     void SetUp()
     {
-        m_scope = V8BindingTestScope::create(m_isolate);
+        // FIXME: Create a new world and pass it to V8PerContextData.
+        m_perContextData = V8PerContextData::create(m_context.newLocal(m_isolate), 0);
     }
 
     void TearDown()
     {
-        m_scope.clear();
+        m_perContextData.clear();
     }
 
     V8PromiseCustom::PromiseState state(ScriptPromise promise)
@@ -67,9 +71,10 @@ public:
 
 protected:
     v8::Isolate* m_isolate;
-
-private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    v8::HandleScope m_handleScope;
+    ScopedPersistent<v8::Context> m_context;
+    v8::Context::Scope m_contextScope;
+    OwnPtr<V8PerContextData> m_perContextData;
 };
 
 TEST_F(ScriptPromiseTest, castPromise)

third_party/WebKit/Source/bindings/v8/V8Binding.cpp

@@ -734,18 +734,4 @@ v8::Isolate* toIsolate(LocalFrame* frame)
     return frame->script().isolate();
 }
 
-PassOwnPtr<V8BindingTestScope> V8BindingTestScope::create(v8::Isolate* isolate)
-{
-    return adoptPtr(new V8BindingTestScope(isolate));
-}
-
-V8BindingTestScope::V8BindingTestScope(v8::Isolate* isolate)
-    : m_handleScope(isolate)
-    , m_context(v8::Context::New(isolate))
-    , m_contextScope(m_context)
-    , m_world(DOMWrapperWorld::create())
-    , m_perContextData(V8PerContextData::create(m_context, m_world.get()))
-{
-}
-
 } // namespace WebCore

third_party/WebKit/Source/bindings/v8/V8Binding.h

@@ -46,231 +46,231 @@
 
 namespace WebCore {
 
-class DOMWindow;
-class Document;
-class EventListener;
-class ExecutionContext;
-class ExceptionState;
-class LocalFrame;
-class NodeFilter;
-class ScriptWrappable;
-class V8PerContextData;
-class XPathNSResolver;
+    class DOMWindow;
+    class Document;
+    class EventListener;
+    class ExceptionState;
+    class LocalFrame;
+    class NodeFilter;
+    class ExecutionContext;
+    class ScriptWrappable;
+    class XPathNSResolver;
 
-const int kMaxRecursionDepth = 22;
+    const int kMaxRecursionDepth = 22;
 
-// Schedule a JavaScript error to be thrown.
-v8::Handle<v8::Value> throwError(V8ErrorType, const String&, v8::Isolate*);
+    // Schedule a JavaScript error to be thrown.
+    v8::Handle<v8::Value> throwError(V8ErrorType, const String&, v8::Isolate*);
 
-// Schedule a JavaScript error to be thrown.
-v8::Handle<v8::Value> throwError(v8::Handle<v8::Value>, v8::Isolate*);
+    // Schedule a JavaScript error to be thrown.
+    v8::Handle<v8::Value> throwError(v8::Handle<v8::Value>, v8::Isolate*);
 
-// A helper for throwing JavaScript TypeError.
-v8::Handle<v8::Value> throwTypeError(const String&, v8::Isolate*);
+    // A helper for throwing JavaScript TypeError.
+    v8::Handle<v8::Value> throwTypeError(const String&, v8::Isolate*);
 
-v8::ArrayBuffer::Allocator* v8ArrayBufferAllocator();
+    v8::ArrayBuffer::Allocator* v8ArrayBufferAllocator();
 
-inline v8::Handle<v8::Value> argumentOrNull(const v8::FunctionCallbackInfo<v8::Value>& info, int index)
-{
+    inline v8::Handle<v8::Value> argumentOrNull(const v8::FunctionCallbackInfo<v8::Value>& info, int index)
+    {
         return index >= info.Length() ? v8::Local<v8::Value>() : info[index];
-}
+    }
 
-template<typename CallbackInfo, typename V>
-inline void v8SetReturnValue(const CallbackInfo& info, V v)
-{
+    template<typename CallbackInfo, typename V>
+    inline void v8SetReturnValue(const CallbackInfo& info, V v)
+    {
         info.GetReturnValue().Set(v);
-}
+    }
 
-template<typename CallbackInfo>
-inline void v8SetReturnValueBool(const CallbackInfo& info, bool v)
-{
+    template<typename CallbackInfo>
+    inline void v8SetReturnValueBool(const CallbackInfo& info, bool v)
+    {
         info.GetReturnValue().Set(v);
-}
+    }
 
-template<typename CallbackInfo>
-inline void v8SetReturnValueInt(const CallbackInfo& info, int v)
-{
+    template<typename CallbackInfo>
+    inline void v8SetReturnValueInt(const CallbackInfo& info, int v)
+    {
         info.GetReturnValue().Set(v);
-}
+    }
 
-template<typename CallbackInfo>
-inline void v8SetReturnValueUnsigned(const CallbackInfo& info, unsigned v)
-{
+    template<typename CallbackInfo>
+    inline void v8SetReturnValueUnsigned(const CallbackInfo& info, unsigned v)
+    {
         info.GetReturnValue().Set(v);
-}
+    }
 
-template<typename CallbackInfo>
-inline void v8SetReturnValueNull(const CallbackInfo& info)
-{
+    template<typename CallbackInfo>
+    inline void v8SetReturnValueNull(const CallbackInfo& info)
+    {
         info.GetReturnValue().SetNull();
-}
+    }
 
-template<typename CallbackInfo>
-inline void v8SetReturnValueUndefined(const CallbackInfo& info)
-{
+    template<typename CallbackInfo>
+    inline void v8SetReturnValueUndefined(const CallbackInfo& info)
+    {
         info.GetReturnValue().SetUndefined();
-}
+    }
 
-template<typename CallbackInfo>
-inline void v8SetReturnValueEmptyString(const CallbackInfo& info)
-{
+    template<typename CallbackInfo>
+    inline void v8SetReturnValueEmptyString(const CallbackInfo& info)
+    {
         info.GetReturnValue().SetEmptyString();
-}
+    }
 
-template <class CallbackInfo>
-inline void v8SetReturnValueString(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
-{
+    template <class CallbackInfo>
+    inline void v8SetReturnValueString(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
+    {
         if (string.isNull()) {
             v8SetReturnValueEmptyString(info);
             return;
         }
         V8PerIsolateData::from(isolate)->stringCache()->setReturnValueFromString(info.GetReturnValue(), string.impl());
-}
+    }
 
-template <class CallbackInfo>
-inline void v8SetReturnValueStringOrNull(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
-{
+    template <class CallbackInfo>
+    inline void v8SetReturnValueStringOrNull(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
+    {
         if (string.isNull()) {
             v8SetReturnValueNull(info);
             return;
         }
         V8PerIsolateData::from(isolate)->stringCache()->setReturnValueFromString(info.GetReturnValue(), string.impl());
-}
+    }
 
-template <class CallbackInfo>
-inline void v8SetReturnValueStringOrUndefined(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
-{
+    template <class CallbackInfo>
+    inline void v8SetReturnValueStringOrUndefined(const CallbackInfo& info, const String& string, v8::Isolate* isolate)
+    {
         if (string.isNull()) {
             v8SetReturnValueUndefined(info);
             return;
         }
         V8PerIsolateData::from(isolate)->stringCache()->setReturnValueFromString(info.GetReturnValue(), string.impl());
-}
+    }
 
-// Convert v8::String to a WTF::String. If the V8 string is not already
-// an external string then it is transformed into an external string at this
-// point to avoid repeated conversions.
-inline String toCoreString(v8::Handle<v8::String> value)
-{
+    // Convert v8::String to a WTF::String. If the V8 string is not already
+    // an external string then it is transformed into an external string at this
+    // point to avoid repeated conversions.
+    inline String toCoreString(v8::Handle<v8::String> value)
+    {
         return v8StringToWebCoreString<String>(value, Externalize);
-}
+    }
 
-inline String toCoreStringWithNullCheck(v8::Handle<v8::String> value)
-{
+    inline String toCoreStringWithNullCheck(v8::Handle<v8::String> value)
+    {
         if (value.IsEmpty() || value->IsNull())
             return String();
         return toCoreString(value);
-}
+    }
 
-inline String toCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::String> value)
-{
+    inline String toCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::String> value)
+    {
         if (value.IsEmpty() || value->IsNull() || value->IsUndefined())
             return String();
         return toCoreString(value);
-}
+    }
 
-inline AtomicString toCoreAtomicString(v8::Handle<v8::String> value)
-{
+    inline AtomicString toCoreAtomicString(v8::Handle<v8::String> value)
+    {
         return v8StringToWebCoreString<AtomicString>(value, Externalize);
-}
+    }
 
-// This method will return a null String if the v8::Value does not contain a v8::String.
-// It will not call ToString() on the v8::Value. If you want ToString() to be called,
-// please use the V8TRYCATCH_FOR_V8STRINGRESOURCE_*() macros instead.
-inline String toCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::Value> value)
-{
+    // This method will return a null String if the v8::Value does not contain a v8::String.
+    // It will not call ToString() on the v8::Value. If you want ToString() to be called,
+    // please use the V8TRYCATCH_FOR_V8STRINGRESOURCE_*() macros instead.
+    inline String toCoreStringWithUndefinedOrNullCheck(v8::Handle<v8::Value> value)
+    {
         if (value.IsEmpty() || !value->IsString())
             return String();
+
         return toCoreString(value.As<v8::String>());
-}
-
-// Convert a string to a V8 string.
-// Return a V8 external string that shares the underlying buffer with the given
-// WebCore string. The reference counting mechanism is used to keep the
-// underlying buffer alive while the string is still live in the V8 engine.
-inline v8::Handle<v8::String> v8String(v8::Isolate* isolate, const String& string)
-{
+    }
+
+    // Convert a string to a V8 string.
+    // Return a V8 external string that shares the underlying buffer with the given
+    // WebCore string. The reference counting mechanism is used to keep the
+    // underlying buffer alive while the string is still live in the V8 engine.
+    inline v8::Handle<v8::String> v8String(v8::Isolate* isolate, const String& string)
+    {
         if (string.isNull())
             return v8::String::Empty(isolate);
         return V8PerIsolateData::from(isolate)->stringCache()->v8ExternalString(string.impl(), isolate);
-}
+    }
 
-inline v8::Handle<v8::String> v8AtomicString(v8::Isolate* isolate, const char* str)
-{
+    inline v8::Handle<v8::String> v8AtomicString(v8::Isolate* isolate, const char* str)
+    {
         ASSERT(isolate);
         return v8::String::NewFromUtf8(isolate, str, v8::String::kInternalizedString, strlen(str));
-}
+    }
 
-inline v8::Handle<v8::String> v8AtomicString(v8::Isolate* isolate, const char* str, size_t length)
-{
+    inline v8::Handle<v8::String> v8AtomicString(v8::Isolate* isolate, const char* str, size_t length)
+    {
         ASSERT(isolate);
         return v8::String::NewFromUtf8(isolate, str, v8::String::kInternalizedString, length);
-}
+    }
 
-inline v8::Handle<v8::Value> v8Undefined()
-{
+    inline v8::Handle<v8::Value> v8Undefined()
+    {
         return v8::Handle<v8::Value>();
-}
+    }
 
-template <class T>
-struct V8ValueTraits {
+    template <class T>
+    struct V8ValueTraits {
         static inline v8::Handle<v8::Value> arrayV8Value(const T& value, v8::Isolate* isolate)
         {
             return toV8(WTF::getPtr(value), v8::Handle<v8::Object>(), isolate);
         }
-};
+    };
 
-template<>
-struct V8ValueTraits<String> {
+    template<>
+    struct V8ValueTraits<String> {
         static inline v8::Handle<v8::Value> arrayV8Value(const String& value, v8::Isolate* isolate)
         {
             return v8String(isolate, value);
         }
-};
+    };
 
-template<>
-struct V8ValueTraits<AtomicString> {
+    template<>
+    struct V8ValueTraits<AtomicString> {
         static inline v8::Handle<v8::Value> arrayV8Value(const AtomicString& value, v8::Isolate* isolate)
         {
             return v8String(isolate, value);
         }
-};
+    };
 
-template<>
-struct V8ValueTraits<unsigned> {
+    template<>
+    struct V8ValueTraits<unsigned> {
         static inline v8::Handle<v8::Value> arrayV8Value(const unsigned& value, v8::Isolate* isolate)
         {
             return v8::Integer::NewFromUnsigned(isolate, value);
         }
-};
+    };
 
-template<>
-struct V8ValueTraits<unsigned long> {
+    template<>
+    struct V8ValueTraits<unsigned long> {
         static inline v8::Handle<v8::Value> arrayV8Value(const unsigned long& value, v8::Isolate* isolate)
         {
             return v8::Integer::NewFromUnsigned(isolate, value);
         }
-};
+    };
 
-template<>
-struct V8ValueTraits<float> {
+    template<>
+    struct V8ValueTraits<float> {
         static inline v8::Handle<v8::Value> arrayV8Value(const float& value, v8::Isolate* isolate)
         {
             return v8::Number::New(isolate, value);
         }
-};
+    };
 
-template<>
-struct V8ValueTraits<double> {
+    template<>
+    struct V8ValueTraits<double> {
         static inline v8::Handle<v8::Value> arrayV8Value(const double& value, v8::Isolate* isolate)
         {
             return v8::Number::New(isolate, value);
         }
-};
+    };
 
-template<typename T, size_t inlineCapacity>
-v8::Handle<v8::Value> v8Array(const Vector<T, inlineCapacity>& iterator, v8::Isolate* isolate)
-{
+    template<typename T, size_t inlineCapacity>
+    v8::Handle<v8::Value> v8Array(const Vector<T, inlineCapacity>& iterator, v8::Isolate* isolate)
+    {
         v8::Local<v8::Array> result = v8::Array::New(isolate, iterator.size());
         int index = 0;
         typename Vector<T, inlineCapacity>::const_iterator end = iterator.end();
@@ -278,11 +278,11 @@ v8::Handle<v8::Value> v8Array(const Vector<T, inlineCapacity>& iterator, v8::Iso
         for (typename Vector<T, inlineCapacity>::const_iterator iter = iterator.begin(); iter != end; ++iter)
             result->Set(v8::Integer::New(isolate, index++), TraitsType::arrayV8Value(*iter, isolate));
         return result;
-}
+    }
 
-template<typename T, size_t inlineCapacity>
-v8::Handle<v8::Value> v8Array(const HeapVector<T, inlineCapacity>& iterator, v8::Isolate* isolate)
-{
+    template<typename T, size_t inlineCapacity>
+    v8::Handle<v8::Value> v8Array(const HeapVector<T, inlineCapacity>& iterator, v8::Isolate* isolate)
+    {
         v8::Local<v8::Array> result = v8::Array::New(isolate, iterator.size());
         int index = 0;
         typename HeapVector<T, inlineCapacity>::const_iterator end = iterator.end();
@@ -290,197 +290,198 @@ v8::Handle<v8::Value> v8Array(const HeapVector<T, inlineCapacity>& iterator, v8:
         for (typename HeapVector<T, inlineCapacity>::const_iterator iter = iterator.begin(); iter != end; ++iter)
             result->Set(v8::Integer::New(isolate, index++), TraitsType::arrayV8Value(*iter, isolate));
         return result;
-}
+    }
 
-// Conversion flags, used in toIntXX/toUIntXX.
-enum IntegerConversionConfiguration {
+    // Conversion flags, used in toIntXX/toUIntXX.
+    enum IntegerConversionConfiguration {
         NormalConversion,
         EnforceRange,
         Clamp
-};
-
-// Convert a value to a 8-bit signed integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-byte
-int8_t toInt8(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline int8_t toInt8(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    };
+
+    // Convert a value to a 8-bit signed integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-byte
+    int8_t toInt8(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline int8_t toInt8(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toInt8(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 8-bit integer assuming the conversion cannot fail.
-int8_t toInt8(v8::Handle<v8::Value>);
+    // Convert a value to a 8-bit integer assuming the conversion cannot fail.
+    int8_t toInt8(v8::Handle<v8::Value>);
 
-// Convert a value to a 8-bit unsigned integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-octet
-uint8_t toUInt8(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline uint8_t toUInt8(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 8-bit unsigned integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-octet
+    uint8_t toUInt8(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline uint8_t toUInt8(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toUInt8(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 8-bit unsigned integer assuming the conversion cannot fail.
-uint8_t toUInt8(v8::Handle<v8::Value>);
+    // Convert a value to a 8-bit unsigned integer assuming the conversion cannot fail.
+    uint8_t toUInt8(v8::Handle<v8::Value>);
 
-// Convert a value to a 16-bit signed integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-short
-int16_t toInt16(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline int16_t toInt16(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 16-bit signed integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-short
+    int16_t toInt16(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline int16_t toInt16(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toInt16(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 16-bit integer assuming the conversion cannot fail.
-int16_t toInt16(v8::Handle<v8::Value>);
+    // Convert a value to a 16-bit integer assuming the conversion cannot fail.
+    int16_t toInt16(v8::Handle<v8::Value>);
 
-// Convert a value to a 16-bit unsigned integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-unsigned-short
-uint16_t toUInt16(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline uint16_t toUInt16(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 16-bit unsigned integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-unsigned-short
+    uint16_t toUInt16(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline uint16_t toUInt16(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toUInt16(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 16-bit unsigned integer assuming the conversion cannot fail.
-uint16_t toUInt16(v8::Handle<v8::Value>);
+    // Convert a value to a 16-bit unsigned integer assuming the conversion cannot fail.
+    uint16_t toUInt16(v8::Handle<v8::Value>);
 
-// Convert a value to a 32-bit signed integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-long
-int32_t toInt32(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline int32_t toInt32(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 32-bit signed integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-long
+    int32_t toInt32(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline int32_t toInt32(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toInt32(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 32-bit integer assuming the conversion cannot fail.
-int32_t toInt32(v8::Handle<v8::Value>);
+    // Convert a value to a 32-bit integer assuming the conversion cannot fail.
+    int32_t toInt32(v8::Handle<v8::Value>);
 
-// Convert a value to a 32-bit unsigned integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-unsigned-long
-uint32_t toUInt32(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline uint32_t toUInt32(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 32-bit unsigned integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-unsigned-long
+    uint32_t toUInt32(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline uint32_t toUInt32(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toUInt32(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 32-bit unsigned integer assuming the conversion cannot fail.
-uint32_t toUInt32(v8::Handle<v8::Value>);
+    // Convert a value to a 32-bit unsigned integer assuming the conversion cannot fail.
+    uint32_t toUInt32(v8::Handle<v8::Value>);
 
-// Convert a value to a 64-bit signed integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-long-long
-int64_t toInt64(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline int64_t toInt64(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 64-bit signed integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-long-long
+    int64_t toInt64(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline int64_t toInt64(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toInt64(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 64-bit integer assuming the conversion cannot fail.
-int64_t toInt64(v8::Handle<v8::Value>);
+    // Convert a value to a 64-bit integer assuming the conversion cannot fail.
+    int64_t toInt64(v8::Handle<v8::Value>);
 
-// Convert a value to a 64-bit unsigned integer. The conversion fails if the
-// value cannot be converted to a number or the range violated per WebIDL:
-// http://www.w3.org/TR/WebIDL/#es-unsigned-long-long
-uint64_t toUInt64(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
-inline uint64_t toUInt64(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
-{
+    // Convert a value to a 64-bit unsigned integer. The conversion fails if the
+    // value cannot be converted to a number or the range violated per WebIDL:
+    // http://www.w3.org/TR/WebIDL/#es-unsigned-long-long
+    uint64_t toUInt64(v8::Handle<v8::Value>, IntegerConversionConfiguration, ExceptionState&);
+    inline uint64_t toUInt64(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+    {
         return toUInt64(value, NormalConversion, exceptionState);
-}
+    }
 
-// Convert a value to a 64-bit unsigned integer assuming the conversion cannot fail.
-uint64_t toUInt64(v8::Handle<v8::Value>);
+    // Convert a value to a 64-bit unsigned integer assuming the conversion cannot fail.
+    uint64_t toUInt64(v8::Handle<v8::Value>);
 
-// Convert a value to a single precision float, which might fail.
-float toFloat(v8::Handle<v8::Value>, ExceptionState&);
+    // Convert a value to a single precision float, which might fail.
+    float toFloat(v8::Handle<v8::Value>, ExceptionState&);
 
-// Convert a value to a single precision float assuming the conversion cannot fail.
-inline float toFloat(v8::Local<v8::Value> value)
-{
+    // Convert a value to a single precision float assuming the conversion cannot fail.
+    inline float toFloat(v8::Local<v8::Value> value)
+    {
         return static_cast<float>(value->NumberValue());
-}
+    }
 
-inline v8::Handle<v8::Boolean> v8Boolean(bool value, v8::Isolate* isolate)
-{
+    inline v8::Handle<v8::Boolean> v8Boolean(bool value, v8::Isolate* isolate)
+    {
         return value ? v8::True(isolate) : v8::False(isolate);
-}
+    }
 
-inline double toCoreDate(v8::Handle<v8::Value> object)
-{
+    inline double toCoreDate(v8::Handle<v8::Value> object)
+    {
         if (object->IsDate())
             return v8::Handle<v8::Date>::Cast(object)->ValueOf();
         if (object->IsNumber())
             return object->NumberValue();
         return std::numeric_limits<double>::quiet_NaN();
-}
+    }
 
-inline v8::Handle<v8::Value> v8DateOrNull(double value, v8::Isolate* isolate)
-{
+    inline v8::Handle<v8::Value> v8DateOrNull(double value, v8::Isolate* isolate)
+    {
         ASSERT(isolate);
         return std::isfinite(value) ? v8::Date::New(isolate, value) : v8::Handle<v8::Value>::Cast(v8::Null(isolate));
-}
+    }
 
-// FIXME: Remove the special casing for NodeFilter and XPathNSResolver.
-PassRefPtr<NodeFilter> toNodeFilter(v8::Handle<v8::Value>, v8::Isolate*);
-PassRefPtrWillBeRawPtr<XPathNSResolver> toXPathNSResolver(v8::Handle<v8::Value>, v8::Isolate*);
+    // FIXME: Remove the special casing for NodeFilter and XPathNSResolver.
+    PassRefPtr<NodeFilter> toNodeFilter(v8::Handle<v8::Value>, v8::Isolate*);
+    PassRefPtrWillBeRawPtr<XPathNSResolver> toXPathNSResolver(v8::Handle<v8::Value>, v8::Isolate*);
 
-template<class T> struct NativeValueTraits;
+    template<class T> struct NativeValueTraits;
 
-template<>
-struct NativeValueTraits<String> {
+    template<>
+    struct NativeValueTraits<String> {
         static inline String nativeValue(const v8::Handle<v8::Value>& value, v8::Isolate* isolate)
         {
             V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringValue, value, String());
             return stringValue;
         }
-};
+    };
 
-template<>
-struct NativeValueTraits<unsigned> {
+    template<>
+    struct NativeValueTraits<unsigned> {
         static inline unsigned nativeValue(const v8::Handle<v8::Value>& value, v8::Isolate* isolate)
         {
             return toUInt32(value);
         }
-};
+    };
 
-template<>
-struct NativeValueTraits<float> {
+    template<>
+    struct NativeValueTraits<float> {
         static inline float nativeValue(const v8::Handle<v8::Value>& value, v8::Isolate* isolate)
         {
             return static_cast<float>(value->NumberValue());
         }
-};
+    };
 
-template<>
-struct NativeValueTraits<double> {
+    template<>
+    struct NativeValueTraits<double> {
         static inline double nativeValue(const v8::Handle<v8::Value>& value, v8::Isolate* isolate)
         {
             return static_cast<double>(value->NumberValue());
         }
-};
+    };
 
-template<>
-struct NativeValueTraits<v8::Handle<v8::Value> > {
+    template<>
+    struct NativeValueTraits<v8::Handle<v8::Value> > {
         static inline v8::Handle<v8::Value> nativeValue(const v8::Handle<v8::Value>& value, v8::Isolate* isolate)
         {
             return value;
         }
-};
+    };
 
-// Converts a JavaScript value to an array as per the Web IDL specification:
-// http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-array
-template <class T, class V8T>
-Vector<RefPtr<T> > toRefPtrNativeArrayUnchecked(v8::Local<v8::Value> v8Value, uint32_t length, v8::Isolate* isolate, bool* success = 0)
-{
+    // Converts a JavaScript value to an array as per the Web IDL specification:
+    // http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-array
+    template <class T, class V8T>
+    Vector<RefPtr<T> > toRefPtrNativeArrayUnchecked(v8::Local<v8::Value> v8Value, uint32_t length, v8::Isolate* isolate, bool* success = 0)
+    {
         Vector<RefPtr<T> > result;
         result.reserveInitialCapacity(length);
         v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(v8Value);
         for (uint32_t i = 0; i < length; ++i) {
             v8::Handle<v8::Value> element = object->Get(i);
+
             if (V8T::hasInstance(element, isolate)) {
                 v8::Handle<v8::Object> elementObject = v8::Handle<v8::Object>::Cast(element);
                 result.uncheckedAppend(V8T::toNative(elementObject));
@@ -492,13 +493,13 @@ Vector<RefPtr<T> > toRefPtrNativeArrayUnchecked(v8::Local<v8::Value> v8Value, ui
             }
         }
         return result;
-}
+    }
 
-v8::Handle<v8::Value> toV8Sequence(v8::Handle<v8::Value>, uint32_t& length, v8::Isolate*);
+    v8::Handle<v8::Value> toV8Sequence(v8::Handle<v8::Value>, uint32_t& length, v8::Isolate*);
 
-template <class T, class V8T>
-Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, bool* success = 0)
-{
+    template <class T, class V8T>
+    Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate, bool* success = 0)
+    {
         if (success)
             *success = true;
 
@@ -510,12 +511,13 @@ Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, int argument
             throwTypeError(ExceptionMessages::notAnArrayTypeArgumentOrValue(argumentIndex), isolate);
             return Vector<RefPtr<T> >();
         }
+
         return toRefPtrNativeArrayUnchecked<T, V8T>(v8Value, length, isolate, success);
-}
+    }
 
-template <class T, class V8T>
-Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, const String& propertyName, v8::Isolate* isolate, bool* success = 0)
-{
+    template <class T, class V8T>
+    Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, const String& propertyName, v8::Isolate* isolate, bool* success = 0)
+    {
         if (success)
             *success = true;
 
@@ -527,14 +529,15 @@ Vector<RefPtr<T> > toRefPtrNativeArray(v8::Handle<v8::Value> value, const String
             throwTypeError(ExceptionMessages::notASequenceTypeProperty(propertyName), isolate);
             return Vector<RefPtr<T> >();
         }
+
         return toRefPtrNativeArrayUnchecked<T, V8T>(v8Value, length, isolate, success);
-}
+    }
 
-// Converts a JavaScript value to an array as per the Web IDL specification:
-// http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-array
-template <class T>
-Vector<T> toNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate)
-{
+    // Converts a JavaScript value to an array as per the Web IDL specification:
+    // http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-array
+    template <class T>
+    Vector<T> toNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isolate* isolate)
+    {
         v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(isolate, value));
         uint32_t length = 0;
         if (value->IsArray()) {
@@ -551,11 +554,11 @@ Vector<T> toNativeArray(v8::Handle<v8::Value> value, int argumentIndex, v8::Isol
         for (uint32_t i = 0; i < length; ++i)
             result.uncheckedAppend(TraitsType::nativeValue(object->Get(i), isolate));
         return result;
-}
+    }
 
-template <class T>
-Vector<T> toNativeArguments(const v8::FunctionCallbackInfo<v8::Value>& info, int startIndex)
-{
+    template <class T>
+    Vector<T> toNativeArguments(const v8::FunctionCallbackInfo<v8::Value>& info, int startIndex)
+    {
         ASSERT(startIndex <= info.Length());
         Vector<T> result;
         typedef NativeValueTraits<T> TraitsType;
@@ -564,12 +567,12 @@ Vector<T> toNativeArguments(const v8::FunctionCallbackInfo<v8::Value>& info, int
         for (int i = startIndex; i < length; ++i)
             result.uncheckedAppend(TraitsType::nativeValue(info[i], info.GetIsolate()));
         return result;
-}
+    }
 
-// Validates that the passed object is a sequence type per WebIDL spec
-// http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-sequence
-inline v8::Handle<v8::Value> toV8Sequence(v8::Handle<v8::Value> value, uint32_t& length, v8::Isolate* isolate)
-{
+    // Validates that the passed object is a sequence type per WebIDL spec
+    // http://www.w3.org/TR/2012/CR-WebIDL-20120419/#es-sequence
+    inline v8::Handle<v8::Value> toV8Sequence(v8::Handle<v8::Value> value, uint32_t& length, v8::Isolate* isolate)
+    {
         // Attempt converting to a sequence if the value is not already an array but is
         // any kind of object except for a native Date object or a native RegExp object.
         ASSERT(!value->IsArray());
@@ -596,57 +599,58 @@ inline v8::Handle<v8::Value> toV8Sequence(v8::Handle<v8::Value> value, uint32_t&
 
         V8TRYCATCH(uint32_t, sequenceLength, lengthValue->Int32Value());
         length = sequenceLength;
+
         return v8Value;
-}
-
-v8::Isolate* toIsolate(ExecutionContext*);
-v8::Isolate* toIsolate(LocalFrame*);
-
-WrapperWorldType worldType(v8::Isolate*);
-WrapperWorldType worldTypeInMainThread(v8::Isolate*);
-
-DOMWindow* toDOMWindow(v8::Handle<v8::Value>, v8::Isolate*);
-DOMWindow* toDOMWindow(v8::Handle<v8::Context>);
-ExecutionContext* toExecutionContext(v8::Handle<v8::Context>);
-
-DOMWindow* callingDOMWindow(v8::Isolate*);
-ExecutionContext* callingExecutionContext(v8::Isolate*);
-DOMWindow* enteredDOMWindow(v8::Isolate*);
-Document* currentDocument(v8::Isolate*);
-ExecutionContext* currentExecutionContext(v8::Isolate*);
-
-// Returns a V8 context associated with a ExecutionContext and a DOMWrapperWorld.
-// This method returns an empty context if there is no frame or the frame is already detached.
-v8::Local<v8::Context> toV8Context(ExecutionContext*, DOMWrapperWorld*);
-// Returns a V8 context associated with a LocalFrame and a DOMWrapperWorld.
-// This method returns an empty context if the frame is already detached.
-v8::Local<v8::Context> toV8Context(v8::Isolate*, LocalFrame*, DOMWrapperWorld*);
-
-// Returns the frame object of the window object associated with
-// a context, if the window is currently being displayed in the LocalFrame.
-LocalFrame* toFrameIfNotDetached(v8::Handle<v8::Context>);
-
-// If the current context causes out of memory, JavaScript setting
-// is disabled and it returns true.
-bool handleOutOfMemory();
-v8::Local<v8::Value> handleMaxRecursionDepthExceeded(v8::Isolate*);
-void crashIfV8IsDead();
-
-inline bool isUndefinedOrNull(v8::Handle<v8::Value> value)
-{
+    }
+
+    v8::Isolate* toIsolate(ExecutionContext*);
+    v8::Isolate* toIsolate(LocalFrame*);
+
+    WrapperWorldType worldType(v8::Isolate*);
+    WrapperWorldType worldTypeInMainThread(v8::Isolate*);
+
+    DOMWindow* toDOMWindow(v8::Handle<v8::Value>, v8::Isolate*);
+    DOMWindow* toDOMWindow(v8::Handle<v8::Context>);
+    ExecutionContext* toExecutionContext(v8::Handle<v8::Context>);
+
+    DOMWindow* callingDOMWindow(v8::Isolate*);
+    ExecutionContext* callingExecutionContext(v8::Isolate*);
+    DOMWindow* enteredDOMWindow(v8::Isolate*);
+    Document* currentDocument(v8::Isolate*);
+    ExecutionContext* currentExecutionContext(v8::Isolate*);
+
+    // Returns a V8 context associated with a ExecutionContext and a DOMWrapperWorld.
+    // This method returns an empty context if there is no frame or the frame is already detached.
+    v8::Local<v8::Context> toV8Context(ExecutionContext*, DOMWrapperWorld*);
+    // Returns a V8 context associated with a LocalFrame and a DOMWrapperWorld.
+    // This method returns an empty context if the frame is already detached.
+    v8::Local<v8::Context> toV8Context(v8::Isolate*, LocalFrame*, DOMWrapperWorld*);
+
+    // Returns the frame object of the window object associated with
+    // a context, if the window is currently being displayed in the LocalFrame.
+    LocalFrame* toFrameIfNotDetached(v8::Handle<v8::Context>);
+
+    // If the current context causes out of memory, JavaScript setting
+    // is disabled and it returns true.
+    bool handleOutOfMemory();
+    v8::Local<v8::Value> handleMaxRecursionDepthExceeded(v8::Isolate*);
+    void crashIfV8IsDead();
+
+    inline bool isUndefinedOrNull(v8::Handle<v8::Value> value)
+    {
         return value->IsNull() || value->IsUndefined();
-}
-v8::Handle<v8::Function> getBoundFunction(v8::Handle<v8::Function>);
+    }
+    v8::Handle<v8::Function> getBoundFunction(v8::Handle<v8::Function>);
 
-// Attaches |environment| to |function| and returns it.
-inline v8::Local<v8::Function> createClosure(v8::FunctionCallback function, v8::Handle<v8::Value> environment, v8::Isolate* isolate)
-{
+    // Attaches |environment| to |function| and returns it.
+    inline v8::Local<v8::Function> createClosure(v8::FunctionCallback function, v8::Handle<v8::Value> environment, v8::Isolate* isolate)
+    {
         return v8::Function::New(isolate, function, environment);
-}
+    }
 
-// FIXME: This will be soon embedded in the generated code.
-template<class Collection> static void indexedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
-{
+    // FIXME: This will be soon embedded in the generated code.
+    template<class Collection> static void indexedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
+    {
         Collection* collection = reinterpret_cast<Collection*>(info.Holder()->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
         int length = collection->length();
         v8::Handle<v8::Array> properties = v8::Array::New(info.GetIsolate(), length);
@@ -656,39 +660,39 @@ template<class Collection> static void indexedPropertyEnumerator(const v8::Prope
             properties->Set(integer, integer);
         }
         v8SetReturnValue(info, properties);
-}
-
-v8::Local<v8::Value> getHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, const char*);
-v8::Local<v8::Value> getHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, v8::Handle<v8::String>);
-bool setHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, const char*, v8::Handle<v8::Value>);
-bool setHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, v8::Handle<v8::String>, v8::Handle<v8::Value>);
-bool deleteHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, const char*);
-bool deleteHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, v8::Handle<v8::String>);
-v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, ScriptWrappable*, const char*);
-v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, ScriptWrappable*, v8::Handle<v8::String>);
-
-// These methods store hidden values into an array that is stored in the internal field of a DOM wrapper.
-void addHiddenValueToArray(v8::Handle<v8::Object>, v8::Local<v8::Value>, int cacheIndex, v8::Isolate*);
-void removeHiddenValueFromArray(v8::Handle<v8::Object>, v8::Local<v8::Value>, int cacheIndex, v8::Isolate*);
-void moveEventListenerToNewWrapper(v8::Handle<v8::Object>, EventListener* oldValue, v8::Local<v8::Value> newValue, int cacheIndex, v8::Isolate*);
-
-// Converts a DOM object to a v8 value.
-// This is a no-inline version of toV8(). If you want to call toV8()
-// without creating #include cycles, you can use this function instead.
-// Each specialized implementation will be generated.
-template<typename T>
-v8::Handle<v8::Value> toV8NoInline(T* impl, v8::Handle<v8::Object> creationContext, v8::Isolate*);
-
-// Result values for platform object 'deleter' methods,
-// http://www.w3.org/TR/WebIDL/#delete
-enum DeleteResult {
+    }
+
+    v8::Local<v8::Value> getHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, const char*);
+    v8::Local<v8::Value> getHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, v8::Handle<v8::String>);
+    bool setHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, const char*, v8::Handle<v8::Value>);
+    bool setHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, v8::Handle<v8::String>, v8::Handle<v8::Value>);
+    bool deleteHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, const char*);
+    bool deleteHiddenValue(v8::Isolate*, v8::Handle<v8::Object>, v8::Handle<v8::String>);
+    v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, ScriptWrappable*, const char*);
+    v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, ScriptWrappable*, v8::Handle<v8::String>);
+
+    // These methods store hidden values into an array that is stored in the internal field of a DOM wrapper.
+    void addHiddenValueToArray(v8::Handle<v8::Object>, v8::Local<v8::Value>, int cacheIndex, v8::Isolate*);
+    void removeHiddenValueFromArray(v8::Handle<v8::Object>, v8::Local<v8::Value>, int cacheIndex, v8::Isolate*);
+    void moveEventListenerToNewWrapper(v8::Handle<v8::Object>, EventListener* oldValue, v8::Local<v8::Value> newValue, int cacheIndex, v8::Isolate*);
+
+    // Converts a DOM object to a v8 value.
+    // This is a no-inline version of toV8(). If you want to call toV8()
+    // without creating #include cycles, you can use this function instead.
+    // Each specialized implementation will be generated.
+    template<typename T>
+    v8::Handle<v8::Value> toV8NoInline(T* impl, v8::Handle<v8::Object> creationContext, v8::Isolate*);
+
+    // Result values for platform object 'deleter' methods,
+    // http://www.w3.org/TR/WebIDL/#delete
+    enum DeleteResult {
         DeleteSuccess,
         DeleteReject,
         DeleteUnknownProperty
-};
+    };
 
-class V8IsolateInterruptor : public ThreadState::Interruptor {
-public:
+    class V8IsolateInterruptor : public ThreadState::Interruptor {
+    public:
         explicit V8IsolateInterruptor(v8::Isolate* isolate) : m_isolate(isolate) { }
 
         static void onInterruptCallback(v8::Isolate* isolate, void* data)
@@ -706,23 +710,9 @@ public:
             m_isolate->ClearInterrupt();
         }
 
-private:
+    private:
         v8::Isolate* m_isolate;
-};
-
-class V8BindingTestScope {
-public:
-    static PassOwnPtr<V8BindingTestScope> create(v8::Isolate*);
-
-private:
-    explicit V8BindingTestScope(v8::Isolate*);
-
-    v8::HandleScope m_handleScope;
-    v8::Handle<v8::Context> m_context;
-    v8::Context::Scope m_contextScope;
-    RefPtr<DOMWrapperWorld> m_world;
-    OwnPtr<V8PerContextData> m_perContextData;
-};
+    };
 
 } // namespace WebCore
 

third_party/WebKit/Source/bindings/v8/WorkerScriptController.cpp

@@ -68,7 +68,7 @@ WorkerScriptController::WorkerScriptController(WorkerGlobalScope& workerGlobalSc
     V8Initializer::initializeWorker(m_isolate);
     v8::V8::Initialize();
     V8PerIsolateData::ensureInitialized(m_isolate);
-    m_world = DOMWrapperWorld::create(WorkerWorldId);
+    m_world = DOMWrapperWorld::create(WorkerWorldId, -1);
     m_interruptor = adoptPtr(new V8IsolateInterruptor(m_isolate));
     ThreadState::current()->addInterruptor(m_interruptor.get());
 }

third_party/WebKit/Source/core/animation/AnimationTest.cpp

@@ -36,11 +36,18 @@ protected:
 class AnimationAnimationV8Test : public AnimationAnimationTest {
 protected:
     AnimationAnimationV8Test()
-        : m_isolate(v8::Isolate::GetCurrent())
-        , m_scope(V8BindingTestScope::create(m_isolate))
+        : isolate(v8::Isolate::GetCurrent())
+        , scope(isolate)
+        , context(v8::Context::New(isolate))
+        , contextScope(context)
     {
     }
 
+    v8::Isolate* isolate;
+    v8::HandleScope scope;
+    v8::Local<v8::Context> context;
+    v8::Context::Scope contextScope;
+
     PassRefPtr<Animation> createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, Dictionary timingInput)
     {
         return Animation::createUnsafe(element, keyframeDictionaryVector, timingInput);
@@ -55,18 +62,13 @@ protected:
     {
         return Animation::createUnsafe(element, keyframeDictionaryVector);
     }
-
-    v8::Isolate* m_isolate;
-
-private:
-    OwnPtr<V8BindingTestScope> m_scope;
 };
 
 TEST_F(AnimationAnimationV8Test, CanCreateAnAnimation)
 {
     Vector<Dictionary> jsKeyframes;
-    v8::Handle<v8::Object> keyframe1 = v8::Object::New(m_isolate);
-    v8::Handle<v8::Object> keyframe2 = v8::Object::New(m_isolate);
+    v8::Handle<v8::Object> keyframe1 = v8::Object::New(isolate);
+    v8::Handle<v8::Object> keyframe2 = v8::Object::New(isolate);
 
     setV8ObjectPropertyAsString(keyframe1, "width", "100px");
     setV8ObjectPropertyAsString(keyframe1, "offset", "0");
@@ -75,8 +77,8 @@ TEST_F(AnimationAnimationV8Test, CanCreateAnAnimation)
     setV8ObjectPropertyAsString(keyframe2, "offset", "1");
     setV8ObjectPropertyAsString(keyframe2, "easing", "cubic-bezier(1, 1, 0.3, 0.3)");
 
-    jsKeyframes.append(Dictionary(keyframe1, m_isolate));
-    jsKeyframes.append(Dictionary(keyframe2, m_isolate));
+    jsKeyframes.append(Dictionary(keyframe1, isolate));
+    jsKeyframes.append(Dictionary(keyframe2, isolate));
 
     String value1;
     ASSERT_TRUE(jsKeyframes[0].get("width", value1));
@@ -140,7 +142,7 @@ TEST_F(AnimationAnimationV8Test, SpecifiedGetters)
 {
     Vector<Dictionary, 0> jsKeyframes;
 
-    v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
+    v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
     setV8ObjectPropertyAsNumber(timingInput, "delay", 2);
     setV8ObjectPropertyAsNumber(timingInput, "endDelay", 0.5);
     setV8ObjectPropertyAsString(timingInput, "fill", "backwards");
@@ -149,7 +151,7 @@ TEST_F(AnimationAnimationV8Test, SpecifiedGetters)
     setV8ObjectPropertyAsNumber(timingInput, "playbackRate", 2);
     setV8ObjectPropertyAsString(timingInput, "direction", "reverse");
     setV8ObjectPropertyAsString(timingInput, "easing", "step-start");
-    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate);
+    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
 
     RefPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary);
 
@@ -168,9 +170,9 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)
 {
     Vector<Dictionary, 0> jsKeyframes;
 
-    v8::Handle<v8::Object> timingInputWithDuration = v8::Object::New(m_isolate);
+    v8::Handle<v8::Object> timingInputWithDuration = v8::Object::New(isolate);
     setV8ObjectPropertyAsNumber(timingInputWithDuration, "duration", 2.5);
-    Dictionary timingInputDictionaryWithDuration = Dictionary(v8::Handle<v8::Value>::Cast(timingInputWithDuration), m_isolate);
+    Dictionary timingInputDictionaryWithDuration = Dictionary(v8::Handle<v8::Value>::Cast(timingInputWithDuration), isolate);
 
     RefPtr<Animation> animationWithDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryWithDuration);
 
@@ -186,8 +188,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)
     EXPECT_EQ("", stringDuration);
 
 
-    v8::Handle<v8::Object> timingInputNoDuration = v8::Object::New(m_isolate);
-    Dictionary timingInputDictionaryNoDuration = Dictionary(v8::Handle<v8::Value>::Cast(timingInputNoDuration), m_isolate);
+    v8::Handle<v8::Object> timingInputNoDuration = v8::Object::New(isolate);
+    Dictionary timingInputDictionaryNoDuration = Dictionary(v8::Handle<v8::Value>::Cast(timingInputNoDuration), isolate);
 
     RefPtr<Animation> animationNoDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryNoDuration);
 
@@ -206,8 +208,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)
 TEST_F(AnimationAnimationV8Test, SpecifiedSetters)
 {
     Vector<Dictionary, 0> jsKeyframes;
-    v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
-    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate);
+    v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
+    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
     RefPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary);
 
     RefPtr<TimedItemTiming> specified = animation->specified();
@@ -248,8 +250,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedSetters)
 TEST_F(AnimationAnimationV8Test, SetSpecifiedDuration)
 {
     Vector<Dictionary, 0> jsKeyframes;
-    v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
-    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate);
+    v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
+    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
     RefPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary);
 
     RefPtr<TimedItemTiming> specified = animation->specified();

third_party/WebKit/Source/core/animation/AnimationTimingInputTest.cpp

@@ -17,11 +17,18 @@ namespace WebCore {
 class AnimationAnimationTimingInputTest : public ::testing::Test {
 protected:
     AnimationAnimationTimingInputTest()
-        : m_isolate(v8::Isolate::GetCurrent())
-        , m_scope(V8BindingTestScope::create(m_isolate))
+        : isolate(v8::Isolate::GetCurrent())
+        , scope(isolate)
+        , context(v8::Context::New(isolate))
+        , contextScope(context)
     {
     }
 
+    v8::Isolate* isolate;
+    v8::HandleScope scope;
+    v8::Local<v8::Context> context;
+    v8::Context::Scope contextScope;
+
     void populateTiming(Timing& timing, Dictionary timingInputDictionary)
     {
         Animation::populateTiming(timing, timingInputDictionary);
@@ -29,9 +36,9 @@ protected:
 
     Timing applyTimingInputNumber(String timingProperty, double timingPropertyValue)
     {
-        v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
+        v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
         setV8ObjectPropertyAsNumber(timingInput, timingProperty, timingPropertyValue);
-        Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate);
+        Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
         Timing timing;
         populateTiming(timing, timingInputDictionary);
         return timing;
@@ -39,18 +46,13 @@ protected:
 
     Timing applyTimingInputString(String timingProperty, String timingPropertyValue)
     {
-        v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
+        v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
         setV8ObjectPropertyAsString(timingInput, timingProperty, timingPropertyValue);
-        Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate);
+        Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
         Timing timing;
         populateTiming(timing, timingInputDictionary);
         return timing;
     }
-
-    v8::Isolate* m_isolate;
-
-private:
-    OwnPtr<V8BindingTestScope> m_scope;
 };
 
 TEST_F(AnimationAnimationTimingInputTest, TimingInputStartDelay)
@@ -175,8 +177,8 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputEmpty)
     Timing updatedTiming;
     Timing controlTiming;
 
-    v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
-    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate);
+    v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
+    Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
     populateTiming(updatedTiming, timingInputDictionary);
 
     EXPECT_EQ(controlTiming.startDelay, updatedTiming.startDelay);

third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp

@@ -72,7 +72,8 @@ NullExecutionContext::NullExecutionContext()
 class IDBRequestTest : public testing::Test {
 public:
     IDBRequestTest()
-        : m_scope(V8BindingTestScope::create(v8::Isolate::GetCurrent()))
+        : m_handleScope(v8::Isolate::GetCurrent())
+        , m_scope(v8::Context::New(v8::Isolate::GetCurrent()))
         , m_context(adoptRef(new NullExecutionContext()))
     {
     }
@@ -83,7 +84,8 @@ public:
     }
 
 private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    v8::HandleScope m_handleScope;
+    v8::Context::Scope m_scope;
     RefPtr<ExecutionContext> m_context;
 };
 

third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp

@@ -50,7 +50,8 @@ namespace {
 class IDBTransactionTest : public testing::Test {
 public:
     IDBTransactionTest()
-        : m_scope(V8BindingTestScope::create(v8::Isolate::GetCurrent()))
+        : m_handleScope(v8::Isolate::GetCurrent())
+        , m_scope(v8::Context::New(v8::Isolate::GetCurrent()))
         , m_document(Document::create())
     {
     }
@@ -61,7 +62,8 @@ public:
     }
 
 private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    v8::HandleScope m_handleScope;
+    v8::Context::Scope m_scope;
     RefPtr<Document> m_document;
 };