Merge 197686 "Remove Pepper URLLoader from resource tracker early."

ppapi/shared_impl/resource.h

 // Copyright (c) 2012 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.
 
 #ifndef PPAPI_SHARED_IMPL_RESOURCE_H_
 #define PPAPI_SHARED_IMPL_RESOURCE_H_
 
 #include <stddef.h>  // For NULL.
 
 #include <string>
@@ skipping 188 matching lines @@
   // (This function would make more conceptual sense on PluginResource but we
   // need to call this function from general code that doesn't know how to
   // distinguish the classes.)
   virtual void OnReplyReceived(const proxy::ResourceMessageReplyParams& params,
                                const IPC::Message& msg);
 
  protected:
   // Logs a message to the console from this resource.
   void Log(PP_LogLevel level, const std::string& message);
 
+  // Removes the resource from the ResourceTracker's tables. This normally
+  // happens as part of Resource destruction, but if a subclass destructor
+  // has a risk of re-entering destruction via the ResourceTracker, it can
+  // call this explicitly to get rid of the table entry before continuing
+  // with the destruction. If the resource is not in the ResourceTracker's
+  // tables, silently does nothing. See http://crbug.com/159429.
+  void RemoveFromResourceTracker();
+
   // Notifications for subclasses.
   virtual void LastPluginRefWasDeleted() {}
   virtual void InstanceWasDeleted() {}
 
  private:
   // See the getters above.
   PP_Resource pp_resource_;
   HostResource host_resource_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Resource);
 };
 
 // Template-based dynamic casting. These specializations forward to the
 // AsXXX virtual functions to return whether the given type is supported.
 #define DEFINE_RESOURCE_CAST(RESOURCE) \
   template<> inline thunk::RESOURCE* Resource::GetAs() { \
     return As##RESOURCE(); \
   }
 FOR_ALL_PPAPI_RESOURCE_APIS(DEFINE_RESOURCE_CAST)
 #undef DEFINE_RESOURCE_CAST
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_RESOURCE_H_