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

webkit/tools/pepper_test_plugin/plugin_object.cc

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 219 matching lines @@
 }
 
 }  // namespace
 
 
 // PluginObject ----------------------------------------------------------------
 
 PluginObject::PluginObject(NPP npp)
     : npp_(npp),
       test_object_(browser->createobject(npp, GetTestClass())) {
-  if (!initialize_render_context) {
-    browser->getvalue(npp_, NPNVInitializeRenderContextFunc,
-                      reinterpret_cast<void*>(&initialize_render_context));
+  if (!initialize_render_context || !flush_render_context) {
+    NPPepperExtensions* extensions;
+    browser->getvalue(npp_, NPNVPepperExtensions,
+                      reinterpret_cast<void*>(&extensions));
+    CHECK(extensions);
+    initialize_render_context = extensions->initializeRender;
     CHECK(initialize_render_context);
-  }
-  if (!flush_render_context) {
-    browser->getvalue(npp_, NPNVFlushRenderContextFunc,
-                      reinterpret_cast<void*>(&flush_render_context));
+    flush_render_context = extensions->flushRender;
     CHECK(flush_render_context);
   }
 }
 
 PluginObject::~PluginObject() {
   browser->releaseobject(test_object_);
 }
 
 // static
 NPClass* PluginObject::GetPluginClass() {
@@ skipping 13 matching lines @@
 
   SkCanvas canvas(bitmap);
   DrawSampleBitmap(canvas, window.width, window.height);
 
   // TODO(brettw) figure out why this cast is necessary, the functions seem to
   // match. Could be a calling convention mismatch?
   NPFlushRenderContextCallbackPtr callback =
       reinterpret_cast<NPFlushRenderContextCallbackPtr>(&FlushCallback);
   flush_render_context(npp_, &context, callback, NULL);
 }