Moved Pepper delegate definition to chrome\renderer to allow it to use...

webkit/glue/plugins/plugin_host.cc

 // Copyright (c) 2006-2008 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.
 
 // Pepper API support should be turned on for this module.
 #define PEPPER_APIS_ENABLED
 
 #include "webkit/glue/plugins/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "net/base/net_util.h"
 #include "webkit/api/public/WebBindings.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugininfo.h"
+#include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
 #include "third_party/npapi/bindings/npruntime.h"
 
 using WebKit::WebBindings;
 
 namespace NPAPI
@@ skipping 629 matching lines @@
 
   NOTIMPLEMENTED();
 }
 
 #if defined(PEPPER_APIS_ENABLED)
 static NPError InitializeRenderContext(NPP id,
                                        NPRenderType type,
                                        NPRenderContext* context) {
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin) {
-    return plugin->InitializeRenderContext(type, context);
+    webkit_glue::WebPluginDelegate* delegate = plugin->webplugin()->delegate();
+    // Set up the renderer for the specified type.
+    return delegate->InitializeRenderContext(type, context);
   }
   return NPERR_GENERIC_ERROR;
 }
 
 static NPError FlushRenderContext(NPP id,
                                   NPRenderContext* context,
                                   NPFlushRenderContextCallbackPtr callback,
-                                  void* userData) {
+                                  void* user_data) {
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin) {
-    return plugin->FlushRenderContext(context, callback, userData);
+    webkit_glue::WebPluginDelegate* delegate = plugin->webplugin()->delegate();
+    // Do the flush.
+    NPError err = delegate->FlushRenderContext(context);
+    // Invoke the callback to inform the caller the work was done.
+    if (callback != NULL) {
+      (*callback)(context, err, user_data);
+    }
+    // Return any errors.
+    return err;
   }
   return NPERR_GENERIC_ERROR;
 }
 #endif  // defined(PEPPER_APIS_ENABLED)
 
 NPError NPN_GetValue(NPP id, NPNVariable variable, void *value) {
   // Allows the plugin to query the browser for information
   //
   // Variables:
   //    NPNVxDisplay (unix only)
@@ skipping 276 matching lines @@
 
 void NPN_PluginThreadAsyncCall(NPP id,
                                void (*func)(void *),
                                void *userData) {
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin) {
     plugin->PluginThreadAsyncCall(func, userData);
   }
 }
 
-#if defined(PEPPER_APIS_ENABLED)
-NPError NPN_InitializeRenderContext(NPP id,
-                                    NPRenderType type,
-                                    NPRenderContext* context) {
-  scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
-  if (plugin) {
-    return plugin->InitializeRenderContext(type, context);
-  }
-  return NPERR_GENERIC_ERROR;
-}
-
-NPError NPN_FlushRenderContext(NPP id,
-                               NPRenderContext* context,
-                               NPFlushRenderContextCallbackPtr callback,
-                               void* userData) {
-  scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
-  if (plugin) {
-    return plugin->FlushRenderContext(context, callback, userData);
-  }
-  return NPERR_GENERIC_ERROR;
-}
-#endif  // defined(PEPPER_APIS_ENABLED)
-
 NPError NPN_GetValueForURL(NPP id,
                            NPNURLVariable variable,
                            const char *url,
                            char **value,
                            uint32_t *len) {
   if (!id)
     return NPERR_INVALID_PARAM;
 
   if (!url || !*url || !len)
     return NPERR_INVALID_URL;
@@ skipping 85 matching lines @@
                                   uint32_t *plen) {
   if (!id || !protocol || !host || !scheme || !realm || !username ||
       !ulen || !password || !plen)
     return NPERR_INVALID_PARAM;
 
   // TODO: implement me (bug 23928)
   return NPERR_GENERIC_ERROR;
 }
 
 } // extern "C"