Convert DOMWrapperMap to use PersistentValueMap

Source/bindings/v8/V8NPObject.cpp

 /*
 * Copyright (C) 2006, 2007, 2008, 2009 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 18 matching lines @@
 */
 
 #include "config.h"
 
 #include "bindings/v8/V8NPObject.h"
 
 #include "V8HTMLAppletElement.h"
 #include "V8HTMLEmbedElement.h"
 #include "V8HTMLObjectElement.h"
 #include "bindings/v8/NPV8Object.h"
-#include "bindings/v8/UnsafePersistent.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8NPUtils.h"
 #include "bindings/v8/V8ObjectConstructor.h"
 #include "bindings/v8/npruntime_impl.h"
 #include "bindings/v8/npruntime_priv.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "wtf/OwnPtr.h"
 
 namespace WebCore {
 
@@ skipping 347 matching lines @@
 {
     npObjectPropertyEnumerator(info, false);
 }
 
 static DOMWrapperMap<NPObject>& staticNPObjectMap()
 {
     DEFINE_STATIC_LOCAL(DOMWrapperMap<NPObject>, npObjectMap, (v8::Isolate::GetCurrent()));
     return npObjectMap;
 }
 
-template<>
-inline void DOMWrapperMap<NPObject>::setWeakCallback(const v8::WeakCallbackData<v8::Object, DOMWrapperMap<NPObject> >& data)
+template <>
+inline void DOMWrapperMap<NPObject>::PersistentValueMapTraits::Dispose(
+    v8::UniquePersistent<v8::Object> value,
+    v8::Isolate* isolate,
+    DOMWrapperMap<NPObject>::PersistentValueMapTraits::Impl* impl,
+    NPObject* key)
 {
-    NPObject* npObject = static_cast<NPObject*>(toNative(data.GetValue()));
+    if (_NPN_IsAlive(key))
+        _NPN_ReleaseObject(key);
+}
 
-    ASSERT(npObject);
-    ASSERT(staticNPObjectMap().containsKeyAndValue(npObject, data.GetValue()));

[dcarney, 2014/03/11 15:16:28]

can we keep the assert?

[vogelheim, 2014/03/11 18:35:31]

Done.

[vogelheim, 2014/03/20 18:19:05]

And gone again. :)

This caused test crashes, since PersistentValueMap will remove the values
/before/ calling the callback, and hence these asserts always failed.

I considered whether to change the call order in PersistentValueMap, but I'd
think remove-before-Dispose seems much more logical.

-
-    // Must remove from our map before calling _NPN_ReleaseObject(). _NPN_ReleaseObject can
-    // call forgetV8ObjectForNPObject, which uses the table as well.
-    staticNPObjectMap().removeAndDispose(npObject);
-
-    if (_NPN_IsAlive(npObject))
-        _NPN_ReleaseObject(npObject);
-}
 
 v8::Local<v8::Object> createV8ObjectForNPObject(NPObject* object, NPObject* root, v8::Isolate* isolate)
 {
     static v8::Eternal<v8::FunctionTemplate> npObjectDesc;
 
     ASSERT(isolate->InContext());
 
     // If this is a v8 object, just return it.
     V8NPObject* v8NPObject = npObjectToV8NPObject(object);
     if (v8NPObject)
@@ skipping 43 matching lines @@
     v8::HandleScope scope(isolate);
     v8::Handle<v8::Object> wrapper = staticNPObjectMap().newLocal(object, isolate);
     if (!wrapper.IsEmpty()) {
         V8DOMWrapper::clearNativeInfo(wrapper, npObjectTypeInfo());
         staticNPObjectMap().removeAndDispose(object);
         _NPN_ReleaseObject(object);
     }
 }
 
 } // namespace WebCore