[multivm] Re-split fields for V8 and Dart wrappers.

Source/bindings/core/v8/V8ScriptWrappable.h

 /*
  * Copyright (C) 2010 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:
  *
  *     * 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
@@ skipping 31 matching lines @@
     ASSERT(persistent);
     // Horrible and super unsafe: Cast the Persistent to an Object*, so
     // that we can inject the wrapped value. This only works because
     // we previously 'stole' the object pointer from a Persistent in
     // the setWrapper() method.
     *reinterpret_cast<v8::Object**>(persistent) = object;
 }
 
 bool ScriptWrappable::containsV8Wrapper() const
 {
-    if (LIKELY(m_wrapper.isV8WrapperOrEmpty())) {
-        return !m_wrapper.isEmpty();
-    }
-    TaggedPointer v8WrapperOrTypeInfo = getV8WrapperOrEmpty();
-    return !v8WrapperOrTypeInfo.isEmpty();
+    return m_v8Wrapper;
 }
 
 // Caller is responsible for putting the type info into the wrapper.
 void ScriptWrappable::setV8Wrapper(v8::Object* wrapper)
 {
-    if (LIKELY(m_wrapper.isEmpty())) {
-        m_wrapper = TaggedPointer(wrapper);
-    } else if (m_wrapper.isDartWrapperInfo()) {
-        ASSERT_NOT_REACHED();
-        DartWrapperInfo* wrapperInfo = m_wrapper.dartWrapperInfo();
-        if (wrapperInfo->v8WrapperOrEmpty.isEmpty()) {
-            wrapperInfo->v8WrapperOrEmpty = TaggedPointer(wrapper);
-        } else {
-            // Already contains V8 wrapper.
-            ASSERT_NOT_REACHED();
-        }
-    } else if (m_wrapper.isDartMultiWrapperInfo()) {
-        DartMultiWrapperInfo* wrapperInfo = m_wrapper.dartMultiWrapperInfo();
-        if (wrapperInfo->v8WrapperOrEmpty.isEmpty()) {
-            wrapperInfo->v8WrapperOrEmpty = TaggedPointer(wrapper);
-        } else {
-            // Already contains V8 wrapper.
-            ASSERT_NOT_REACHED();
-        }
-    } else {
-        // Already contains V8 wrapper.
-        ASSERT_NOT_REACHED();
-    }
+    m_v8Wrapper = wrapper;
 }
 
 v8::Object* ScriptWrappable::getV8Wrapper() const
 {
-    if (LIKELY(m_wrapper.isV8WrapperOrEmpty())) {
-        return m_wrapper.v8Wrapper();
-    }
-    TaggedPointer v8WrapperOrTypeInfo = getV8WrapperOrEmpty();
-    return v8WrapperOrTypeInfo.v8Wrapper();
+    return m_v8Wrapper;
 }
 
 void ScriptWrappable::clearV8Wrapper(v8::Local<v8::Object> wrapper, v8::Persistent<v8::Object>* persistent)
 {
-    if (LIKELY(m_wrapper.isV8Wrapper())) {
-        asV8Persistent(m_wrapper.v8Wrapper(), persistent);
-        ASSERT(wrapper == *persistent);
-        m_wrapper.clear();
-    } else if (m_wrapper.isDartWrapperInfo()) {
-        DartWrapperInfo* wrapperInfo = m_wrapper.dartWrapperInfo();
-        if (wrapperInfo->v8WrapperOrEmpty.isV8Wrapper()) {
-            asV8Persistent(wrapperInfo->v8WrapperOrEmpty.v8Wrapper(), persistent);
-            ASSERT(wrapper == *persistent);
-            wrapperInfo->v8WrapperOrEmpty.clear();
-        } else {
-            // Already clear.
-            ASSERT_NOT_REACHED();
-        }
-    } else if (m_wrapper.isDartMultiWrapperInfo()) {
-        DartMultiWrapperInfo* wrapperInfo = m_wrapper.dartMultiWrapperInfo();
-        if (wrapperInfo->v8WrapperOrEmpty.isV8Wrapper()) {
-            asV8Persistent(wrapperInfo->v8WrapperOrEmpty.v8Wrapper(), persistent);
-            ASSERT(wrapper == *persistent);
-            wrapperInfo->v8WrapperOrEmpty.clear();
-        } else {
-            // Already clear.
-            ASSERT_NOT_REACHED();
-        }
-    } else {
-        // Already clear.
-        ASSERT_NOT_REACHED();
-    }
+    asV8Persistent(m_v8Wrapper, persistent);
+    m_v8Wrapper = 0;
 }
 
 /**
  * ScriptWrappable wraps a V8 object and its WrapperTypeInfo.
  *
  * ScriptWrappable acts much like a v8::Persistent<> in that it keeps a
  * V8 object alive. Under the hood, however, it keeps either a TypeInfo
  * object or an actual v8 persistent (or is empty).
  *
  * The physical state space of ScriptWrappable is:
@@ skipping 149 matching lines @@
     virtual const WrapperTypeInfo* wrapperTypeInfo() const OVERRIDE \
     { \
         return &s_wrapperTypeInfo; \
     } \
 private: \
     static const WrapperTypeInfo& s_wrapperTypeInfo
 
 } // namespace blink
 
 #endif // V8ScriptWrappable_h