Merge 137964

Source/WebCore/bindings/v8/NPV8Object.cpp

 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 137 matching lines @@
     V8NPObjectVector* objectVector = 0;
     if (V8PerContextData* perContextData = V8PerContextData::from(object->CreationContext())) {
         int v8ObjectHash = object->GetIdentityHash();
         ASSERT(v8ObjectHash);
         V8NPObjectMap* v8NPObjectMap = perContextData->v8NPObjectMap();
         V8NPObjectMap::iterator iter = v8NPObjectMap->find(v8ObjectHash);
         if (iter != v8NPObjectMap->end()) {
             V8NPObjectVector& objects = iter->value;
             for (size_t index = 0; index < objects.size(); ++index) {
                 V8NPObject* v8npObject = objects.at(index);
-                if (v8npObject->rootObject == root) {
-                    ASSERT(v8npObject->v8Object == object);
+                if (v8npObject->v8Object == object && v8npObject->rootObject == root) {
                     _NPN_RetainObject(&v8npObject->object);
                     return reinterpret_cast<NPObject*>(v8npObject);
                 }
             }
         } else {
             iter = v8NPObjectMap->set(v8ObjectHash, V8NPObjectVector()).iterator;
-            objectVector = &iter->value;
         }
+        objectVector = &iter->value;
     }
     V8NPObject* v8npObject = reinterpret_cast<V8NPObject*>(_NPN_CreateObject(npp, &V8NPObjectClass));
     v8npObject->v8Object = v8::Persistent<v8::Object>::New(object);
     v8npObject->rootObject = root;
 
     if (objectVector)
         objectVector->append(v8npObject);
 
     return reinterpret_cast<NPObject*>(v8npObject);
 }
@@ skipping 406 matching lines @@
 
         convertV8ObjectToNPVariant(resultObject, npObject, result);
         return true;
     }
 
     if (NP_CLASS_STRUCT_VERSION_HAS_CTOR(npObject->_class) && npObject->_class->construct)
         return npObject->_class->construct(npObject, arguments, argumentCount, result);
 
     return false;
 }