[dartium] Use ScriptWrappable when there are multiple Dart wrappers.

Source/bindings/dart/DartScriptWrappable.h

 /*
  * Copyright (C) 2014 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 58 matching lines @@
     if (LIKELY(m_wrapperOrTypeInfo.isWrapperTypeInfo() || m_wrapperOrTypeInfo.isV8Wrapper())) {
         DartWrapperInfo* wrapperInfo = new DartWrapperInfo;
         wrapperInfo->v8WrapperOrTypeInfo = m_wrapperOrTypeInfo;
         wrapperInfo->domData = domData;
         wrapperInfo->wrapper = wrapper;
         m_wrapperOrTypeInfo = TaggedPointer(wrapperInfo);
     } else if (m_wrapperOrTypeInfo.isDartWrapperInfo()) {
         DartWrapperInfo* wrapperInfo = m_wrapperOrTypeInfo.dartWrapperInfo();
         if (wrapperInfo->domData == domData) {
             // Replace the current wrapper (e.g., upgrading a custom element).
             wrapperInfo->wrapper = wrapper;

[rmacnak, 2014/06/05 01:26:21]

This seems to actually come from a path related to cross-frame wrappers rather
than custom elements. Maybe reaching here should be considered a bug?

         } else {
             // Inflate to a multiwrapper, unimplemented.
+            DartMultiWrapperInfo* multiWrapperInfo = new DartMultiWrapperInfo;
+            multiWrapperInfo->v8WrapperOrTypeInfo = wrapperInfo->v8WrapperOrTypeInfo;
+            multiWrapperInfo->domDatas.append(wrapperInfo->domData);
+            multiWrapperInfo->wrappers.append(wrapperInfo->wrapper);
+            multiWrapperInfo->domDatas.append(domData);
+            multiWrapperInfo->wrappers.append(wrapper);
+            m_wrapperOrTypeInfo = TaggedPointer(multiWrapperInfo);
+            delete wrapperInfo;
         }
     } else {
         ASSERT(m_wrapperOrTypeInfo.isDartMultiWrapperInfo());
-        // Replace or append wrapper, unimplemented.
-        ASSERT_NOT_REACHED();
+        DartMultiWrapperInfo* wrapperInfo = m_wrapperOrTypeInfo.dartMultiWrapperInfo();
+        size_t len = wrapperInfo->domDatas.size();
+        for (size_t i = 0; i < len; i++) {
+            if (wrapperInfo->domDatas.at(i) == domData) {
+                // Replace the current wrapper (e.g., upgrading a custom element).
+                ASSERT_NOT_REACHED();

[rmacnak, 2014/06/05 01:26:21]

Don't seem to hit this path, even with the new test.

[siva, 2014/06/05 18:05:49]

Pete might be able to help with a test case that would exercise this path.

On 2014/06/05 01:26:21, rmacnak wrote:

+                wrapperInfo->wrappers[i] = wrapper;
+                return;
+            }
+        }
+        // Append wrapper for new isolate.
+        wrapperInfo->domDatas.append(domData);
+        wrapperInfo->wrappers.append(wrapper);
     }
 }
 
 void* ScriptWrappable::getDartWrapper(void* domData) const
 {
     ASSERT(domData);
     if (m_wrapperOrTypeInfo.isDartWrapperInfo()) {
         DartWrapperInfo* wrapperInfo = m_wrapperOrTypeInfo.dartWrapperInfo();
         if (wrapperInfo->domData == domData) {
             return wrapperInfo->wrapper;
         }
         return 0;
     }
     if (m_wrapperOrTypeInfo.isDartMultiWrapperInfo()) {
         DartMultiWrapperInfo* wrapperInfo = m_wrapperOrTypeInfo.dartMultiWrapperInfo();
-        for (unsigned i = 0; i < wrapperInfo->domDatas.size(); ++i) {
-            if (wrapperInfo->domDatas.at(i) == domData) {
-                return wrapperInfo->wrappers.at(i);
+        size_t len = wrapperInfo->domDatas.size();
+        for (size_t i = 0; i < len; ++i) {
+            if (wrapperInfo->domDatas[i] == domData) {
+                return wrapperInfo->wrappers[i];
             }
         }
         return 0;
     }
     ASSERT(m_wrapperOrTypeInfo.isWrapperTypeInfo() || m_wrapperOrTypeInfo.isV8Wrapper());
     return 0;
 }
 
 void ScriptWrappable::clearDartWrapper(void* domData, void* wrapper)
 {
     if (LIKELY(m_wrapperOrTypeInfo.isDartWrapperInfo())) {
         DartWrapperInfo* wrapperInfo = m_wrapperOrTypeInfo.dartWrapperInfo();
-        // FIXMEDART: Replace conditional with assert when wrappers for multiple isolates are implemented.
-        if (domData == wrapperInfo->domData) {
+        ASSERT(domData == wrapperInfo->domData);
 #ifdef DEBUG
-            DartApiScope scope;
-            ASSERT(Dart_IdentityEquals((Dart_Handle)wrapper, (Dart_Handle)wrapperInfo->wrapper));
+        DartApiScope scope;
+        ASSERT(Dart_IdentityEquals((Dart_Handle)wrapper, (Dart_Handle)wrapperInfo->wrapper));
 #endif
-            m_wrapperOrTypeInfo = wrapperInfo->v8WrapperOrTypeInfo;
-            delete wrapperInfo;
+        m_wrapperOrTypeInfo = wrapperInfo->v8WrapperOrTypeInfo;
+        delete wrapperInfo;
+    } else if (m_wrapperOrTypeInfo.isDartMultiWrapperInfo()) {
+        // Remove.
+        DartMultiWrapperInfo* wrapperInfo = m_wrapperOrTypeInfo.dartMultiWrapperInfo();
+        size_t len = wrapperInfo->domDatas.size();
+        for (size_t i = 0; i < len; i++) {
+            if (wrapperInfo->domDatas[i] == domData) {
+#ifdef DEBUG
+                DartApiScope scope;
+                ASSERT(Dart_IdentityEquals((Dart_Handle)wrapper, (Dart_Handle)wrapperInfo->wrapper));
+#endif
+                wrapperInfo->domDatas.remove(i);
+                wrapperInfo->wrappers.remove(i);

[siva, 2014/06/05 18:05:49]

Add a comment here and above too that when the last Dart Wrapper is removed we
transition back to a v8WrapperOrTypeInfo.

+                if (len == 1) {
+                    m_wrapperOrTypeInfo = wrapperInfo->v8WrapperOrTypeInfo;
+                    delete wrapperInfo;
+                }
+                return;
+            }
         }
-    } else if (m_wrapperOrTypeInfo.isDartMultiWrapperInfo()) {
-        // Remove or deflate, unimplemented.
+        // Could not find wrapper.
         ASSERT_NOT_REACHED();
     } else {
-        // Already clear.
-        // FIXMEDART: Uncomment assert when wrappers for multiple isolates are implemented.
-        // ASSERT_NOT_REACHED();
+        // No Dart wrappers.
+        ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace WebCore
 
 #endif // DartScriptWrappable_h