Make the Pepper proxy support in-process font rendering.

ppapi/proxy/plugin_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 "ppapi/proxy/plugin_resource_tracker.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 72 matching lines @@
 PluginResource* PluginResourceTracker::GetResourceObject(
     PP_Resource pp_resource) {
   ResourceMap::iterator found = resource_map_.find(pp_resource);
   if (found == resource_map_.end())
     return NULL;
   return found->second.resource.get();
 }
 
 PP_Resource PluginResourceTracker::AddResource(
     linked_ptr<PluginResource> object) {
-  if (object->host_resource().is_null()) {
-    // Prevent adding null resources or GetResourceObject(0) will return a
-    // valid pointer!
-    NOTREACHED();
-    return 0;
-  }
-
   PP_Resource plugin_resource = ++last_resource_id_;
   DCHECK(resource_map_.find(plugin_resource) == resource_map_.end());
   resource_map_[plugin_resource] = ResourceInfo(1, object);
-  host_resource_map_[object->host_resource()] = plugin_resource;
+  if (!object->host_resource().is_null()) {
+    // The host resource ID will be 0 for resources that only exist in the
+    // plugin process. Don't add those to the list.
+    host_resource_map_[object->host_resource()] = plugin_resource;
+  }
   return plugin_resource;
 }
 
 void PluginResourceTracker::AddRefResource(PP_Resource resource) {
   ResourceMap::iterator found = resource_map_.find(resource);
   if (found == resource_map_.end()) {
     NOTREACHED();
     return;
   }
   found->second.ref_count++;
@@ skipping 36 matching lines @@
     return;
   found->second.ref_count--;
   if (found->second.ref_count == 0) {
     // Keep a reference while removing in case the destructor ends up
     // re-entering. That way, when the destructor is called, it's out of the
     // maps.
     linked_ptr<PluginResource> plugin_resource = found->second.resource;
     PluginDispatcher* dispatcher =
         PluginDispatcher::GetForInstance(plugin_resource->instance());
     HostResource host_resource = plugin_resource->host_resource();
-    host_resource_map_.erase(host_resource);
+    if (!host_resource.is_null())
+      host_resource_map_.erase(host_resource);
     resource_map_.erase(found);
     plugin_resource.reset();
 
     if (notify_browser_on_release) {
       if (dispatcher) {
         dispatcher->Send(new PpapiHostMsg_PPBCore_ReleaseResource(
             INTERFACE_ID_PPB_CORE, host_resource));
       } else {
         NOTREACHED();
       }
     }
   }
 }
 
 }  // namespace proxy
 }  // namespace pp