First pass at making the proxy handle multiple renderers. This associates the...

webkit/plugins/ppapi/ppb_flash_impl.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/ppb_flash_impl.h"
 
 #include <string.h>
 
 #include "base/file_path.h"
 #include "base/stringprintf.h"
@@ skipping 10 matching lines @@
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/var.h"
 
 namespace webkit {
 namespace ppapi {
 
 // PPB_Flash_Impl --------------------------------------------------------------
 
 namespace {
 
-void SetInstanceAlwaysOnTop(PP_Instance pp_instance, bool on_top) {
+void SetInstanceAlwaysOnTop(PP_Instance pp_instance, PP_Bool on_top) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
   if (!instance)
     return;
   instance->set_always_on_top(on_top);
 }
 
 PP_Var GetProxyForURL(PP_Instance pp_instance, const char* url) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
   if (!instance)
     return PP_MakeUndefined();
@@ skipping 65 matching lines @@
 
   base::PlatformFileError result = instance->delegate()->RenameModuleLocalFile(
       instance->module()->name(),
       GetFilePathFromUTF8(path_from),
       GetFilePathFromUTF8(path_to));
   return PlatformFileErrorToPepperError(result);
 }
 
 int32_t DeleteModuleLocalFileOrDir(PP_Instance pp_instance,
                                    const char* path,
-                                   bool recursive) {
+                                   PP_Bool recursive) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
   base::PlatformFileError result =
       instance->delegate()->DeleteModuleLocalFileOrDir(
           instance->module()->name(), GetFilePathFromUTF8(path), recursive);
   return PlatformFileErrorToPepperError(result);
 }
 
@@ skipping 57 matching lines @@
     PP_DirEntry_Dev& entry = (*contents)->entries[i];
 #if defined(OS_WIN)
     const std::string& name = UTF16ToUTF8(pepper_contents[i].name.value());
 #else
     const std::string& name = pepper_contents[i].name.value();
 #endif
     size_t size = name.size() + 1;
     char* name_copy = new char[size];
     memcpy(name_copy, name.c_str(), size);
     entry.name = name_copy;
-    entry.is_dir = pepper_contents[i].is_dir;
+    entry.is_dir = BoolToPPBool(pepper_contents[i].is_dir);
   }
   return PP_OK;
 }
 
 void FreeModuleLocalDirContents(PP_Instance instance,
                                 PP_DirContents_Dev* contents) {
   DCHECK(contents);
   for (int32_t i = 0; i < contents->count; ++i) {
     delete [] contents->entries[i].name;
   }
   delete [] contents->entries;
   delete contents;
 }
 
-bool NavigateToURL(PP_Instance pp_instance,
-                   const char* url,
-                   const char* target) {
+PP_Bool NavigateToURL(PP_Instance pp_instance,
+                      const char* url,
+                      const char* target) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
   if (!instance)
-    return false;
-  return instance->NavigateToURL(url, target);
+    return PP_FALSE;
+  return BoolToPPBool(instance->NavigateToURL(url, target));
 }
 
 const PPB_Flash ppb_flash = {
   &SetInstanceAlwaysOnTop,
   &PPB_Flash_Impl::DrawGlyphs,
   &GetProxyForURL,
   &OpenModuleLocalFile,
   &RenameModuleLocalFile,
   &DeleteModuleLocalFileOrDir,
   &CreateModuleLocalDir,
@@ skipping 193 matching lines @@
   // Wipe everything else out for safety.
   socket_out_ = NULL;
   local_addr_out_ = NULL;
   remote_addr_out_ = NULL;
 
   callback->Run(rv);  // Will complete abortively if necessary.
 }
 
 }  // namespace ppapi
 }  // namespace webkit