Ensure that PP_Instance values are unique within a plugin process in addition...

webkit/plugins/ppapi/resource_tracker.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/resource_tracker.h"
 
 #include <limits>
 #include <set>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
+#include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource.h"
 #include "webkit/plugins/ppapi/var.h"
 
 enum PPIdType {
   PP_ID_TYPE_MODULE,
   PP_ID_TYPE_INSTANCE,
   PP_ID_TYPE_RESOURCE,
   PP_ID_TYPE_VAR,
   PP_ID_TYPE_COUNT
@@ skipping 247 matching lines @@
 
   // Use a random number for the instance ID. This helps prevent some
   // accidents. See also AddModule below.
   //
   // Need to make sure the random number isn't a duplicate or 0.
   PP_Instance new_instance;
   do {
     new_instance = MakeTypedId(static_cast<PP_Instance>(base::RandUint64()),
                                PP_ID_TYPE_INSTANCE);
   } while (!new_instance ||
-           instance_map_.find(new_instance) != instance_map_.end());
+           instance_map_.find(new_instance) != instance_map_.end() ||
+           !instance->module()->ReserveInstanceID(new_instance));
 
   instance_map_[new_instance].instance = instance;
   return new_instance;
 }
 
 void ResourceTracker::InstanceDeleted(PP_Instance instance) {
   CleanupInstanceData(instance, true);
 }
 
 void ResourceTracker::InstanceCrashed(PP_Instance instance) {
@@ skipping 56 matching lines @@
 
 // static
 void ResourceTracker::ClearSingletonOverride() {
   DCHECK(singleton_override_);
   singleton_override_ = NULL;
 }
 
 }  // namespace ppapi
 }  // namespace webkit