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

Source/bindings/dart/DartDOMWrapper.h

 // Copyright 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:
 //
 //    * 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 47 matching lines @@
 class DartDOMWrapper {
 public:
     template <class BindingsClass>
     static Dart_WeakPersistentHandle lookupWrapper(DartDOMData* domData, typename BindingsClass::NativeType* domObject)
     {
         typedef DartDOMWrapperTraits<BindingsClass> Traits;
         ASSERT(domObject);
         ASSERT(domData);
         if (ScriptWrappable::wrapperCanBeStoredInObject(domObject)) {
             Dart_WeakPersistentHandle wrapper = (Dart_WeakPersistentHandle)(ScriptWrappable::fromObject(domObject)->getDartWrapper(domData));
-            if (wrapper)
-                return wrapper;
-            // FIXMEDART: Assert absence from map when multi-isolate wrapper info is implemeted.
+
+#ifdef DEBUG

[vsm, 2014/06/06 13:39:45]

Isn't this redundant with the ASSERT?

[rmacnak, 2014/06/06 21:26:31]

Leftover from copy-paste from asserts that needed an api scope. Removed.

+            ASSERT(wrapper == Traits::MapTraits::domMap(domData)->get(domObject));
+#endif
+            return wrapper;
         }
         return Traits::MapTraits::domMap(domData)->get(domObject);
     }
 
     template <class BindingsClass>
     static Dart_Handle createWrapper(DartDOMData* domData, typename BindingsClass::NativeType* domObject)
     {
         ASSERT(domObject);
         ASSERT(domData);
         return createWrapper<BindingsClass>(
@@ skipping 213 matching lines @@
     template <class BindingsClass>
     static void wrapperWeakCallback(void* isolateCallbackData, Dart_WeakPersistentHandle wrapper, void* blinkHandle)
     {
         typedef DartDOMWrapperTraits<BindingsClass> Traits;
         DartDOMData* domData = reinterpret_cast<DartDOMData*>(isolateCallbackData);
         typename BindingsClass::NativeType* domObject = Traits::GCTraits::read(blinkHandle);
 
         Dart_WeakPersistentHandle currentWrapper = 0;
         if (ScriptWrappable::wrapperCanBeStoredInObject(domObject)) {
             currentWrapper = (Dart_WeakPersistentHandle)(ScriptWrappable::fromObject(domObject)->getDartWrapper(domData));
-        }
-        if (!currentWrapper) {
+#ifdef DEBUG

[vsm, 2014/06/06 13:39:46]

ditto

+            ASSERT(currentWrapper == Traits::MapTraits::domMap(domData)->get(domObject));
+#endif
+        } else {
             currentWrapper = Traits::MapTraits::domMap(domData)->get(domObject);
         }
+
         // This could be an old wrapper which has been replaced with a custom element.
         if (currentWrapper != wrapper) {
 #ifdef DEBUG
             DartApiScope scope;
             ASSERT(!Dart_IdentityEquals(Dart_HandleFromWeakPersistent(currentWrapper), Dart_HandleFromWeakPersistent(wrapper)));
 #endif
             return;
         }
 
         if (currentWrapper) {
@@ skipping 167 matching lines @@
     };
     typedef MessagePortMapTraits MapTraits;
     typedef DartDOMWrapperActiveTraits<DartMessagePort, false> ActiveTraits;
     typedef DartDOMWrapperEventTargetTraits<DartMessagePort, true> EventTargetTraits;
     typedef DartDOMWrapperGarbageCollectedTraits<DartMessagePort, false> GCTraits;
 };
 
 }
 
 #endif // DartDOMWrapper_h