Make Pepper NPN variable return a pointer to an allocated...

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"
@@ skipping 677 matching lines @@
     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;
 }
+
+static NPError DestroyRenderContext(NPP id,
+                                    NPRenderContext* context) {
+  // TODO(sehr) implement render context destruction.
+  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)
   //    NPNVxtAppContext (unix only)
   //    NPNVnetscapeWindow (win only) - Gets the native window on which the
   //              plug-in drawing occurs, returns HWND
@@ skipping 135 matching lines @@
   case NPNVsupportsCocoaBool:
   {
     // we do not support these drawing and event models.
     NPBool* supports_model = reinterpret_cast<NPBool*>(value);
     *supports_model = FALSE;
     rv = NPERR_NO_ERROR;
     break;
   }
 #endif
 #if defined(PEPPER_APIS_ENABLED)
-  case NPNVInitializeRenderContextFunc:
+  case NPNVPepperExtensions:
   {
-    NPInitializeRenderContextPtr* func =
-        reinterpret_cast<NPInitializeRenderContextPtr*>(value);
-    *func = InitializeRenderContext;
-    rv = NPERR_NO_ERROR;
-    break;
-  }
-  case NPNVFlushRenderContextFunc:
-  {
-    NPFlushRenderContextPtr* func =
-        reinterpret_cast<NPFlushRenderContextPtr*>(value);
-    *func = FlushRenderContext;
+    static const NPPepperExtensions kExtensions = {
+      InitializeRenderContext,
+      FlushRenderContext,
+      DestroyRenderContext
+    };
+    // Make a copy of the canonical function table.

[brettw, 2009/10/26 23:13:38]

Nit: fix comment (you don't copy anymore).

+    NPPepperExtensions* extensions =
+        const_cast<NPPepperExtensions*>(&kExtensions);
+    NPPepperExtensions** exts = reinterpret_cast<NPPepperExtensions**>(value);
+    *exts = extensions;
     rv = NPERR_NO_ERROR;
     break;
   }
 #endif  // defined(PEPPER_APIS_ENABLED)
   default:
   {
     // TODO: implement me
     DLOG(INFO) << "NPN_GetValue(" << variable << ") is not implemented yet.";
     break;
   }
@@ skipping 226 matching lines @@
 
   return plugin->ScheduleTimer(interval, repeat, func);
 }
 
 void NPN_UnscheduleTimer(NPP id, uint32 timer_id) {
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin)
     plugin->UnscheduleTimer(timer_id);
 }
 } // extern "C"