Refactor PPAPI proxy resource handling to maintain which host they came from,...

ppapi/proxy/ppb_flash_proxy.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/ppb_flash_proxy.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ppapi/c/dev/pp_file_info_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
@@ skipping 49 matching lines @@
 PP_Bool DrawGlyphs(PP_Instance instance,
                    PP_Resource pp_image_data,
                    const PP_FontDescription_Dev* font_desc,
                    uint32_t color,
                    PP_Point position,
                    PP_Rect clip,
                    const float transformation[3][3],
                    uint32_t glyph_count,
                    const uint16_t glyph_indices[],
                    const PP_Point glyph_advances[]) {
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
+  PluginResource* image_data = PluginResourceTracker::GetInstance()->
+      GetResourceObject(pp_image_data);
+  if (!image_data)
+    return PP_FALSE;
+  // The instance parameter isn't strictly necessary but we check that it
+  // matches anyway.
+  if (image_data->instance() != instance)
+    return PP_FALSE;
+
+  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
+      image_data->instance());
   if (!dispatcher)
     return PP_FALSE;
 
   PPBFlash_DrawGlyphs_Params params;
-  params.instance = instance,
-  params.pp_image_data = pp_image_data;
+  params.image_data = image_data->host_resource();
   params.font_desc.SetFromPPFontDescription(dispatcher, *font_desc, true);
   params.color = color;
   params.position = position;
   params.clip = clip;
   for (int i = 0; i < 3; i++) {
     for (int j = 0; j < 3; j++)
       params.transformation[i][j] = transformation[i][j];
   }
 
   params.glyph_indices.insert(params.glyph_indices.begin(),
@@ skipping 211 matching lines @@
   *result = PP_FALSE;
 
   PP_FontDescription_Dev font_desc;
   params.font_desc.SetToPPFontDescription(dispatcher(), &font_desc, false);
 
   if (params.glyph_indices.size() != params.glyph_advances.size() ||
       params.glyph_indices.empty())
     return;
 
   *result = ppb_flash_target()->DrawGlyphs(
-      params.instance, params.pp_image_data, &font_desc, params.color,
-      params.position, params.clip,
+      0,  // Unused instance param.
+      params.image_data.host_resource(), &font_desc,
+      params.color, params.position, params.clip,
       const_cast<float(*)[3]>(params.transformation),
       static_cast<uint32_t>(params.glyph_indices.size()),
       const_cast<uint16_t*>(&params.glyph_indices[0]),
       const_cast<PP_Point*>(&params.glyph_advances[0]));
 }
 
 void PPB_Flash_Proxy::OnMsgGetProxyForURL(PP_Instance instance,
                                           const std::string& url,
                                           SerializedVarReturnValue result) {
   result.Return(dispatcher(), ppb_flash_target()->GetProxyForURL(
@@ skipping 70 matching lines @@
 void PPB_Flash_Proxy::OnMsgNavigateToURL(PP_Instance instance,
                                          const std::string& url,
                                          const std::string& target,
                                          PP_Bool* result) {
   *result = ppb_flash_target()->NavigateToURL(instance, url.c_str(),
                                               target.c_str());
 }
 
 }  // namespace proxy
 }  // namespace pp