Update the Pepper APIs to the latest spec for the 2D demo plugin....

chrome/renderer/webplugin_delegate_pepper.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PEPPER_H_
 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PEPPER_H_
 
 #include "build/build_config.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
 #include "base/linked_ptr.h"
 #include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/common/transport_dib.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/npapi/bindings/npapi.h"
-#include "webkit/glue/pepper/pepper.h"
+#include "third_party/npapi/bindings/npapi_extensions.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webplugin_delegate.h"
 
 namespace NPAPI {
 class PluginInstance;
 }
 
 // An implementation of WebPluginDelegate for Pepper in-process plugins.
 class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate {
  public:
@@ skipping 38 matching lines @@
   virtual void DidReceiveManualData(const char* buffer, int length);
   virtual void DidFinishManualLoading();
   virtual void DidManualLoadFail();
   virtual void InstallMissingPlugin();
   virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
       int resource_id,
       const GURL& url,
       bool notify_needed,
       intptr_t notify_data,
       intptr_t stream);
+  virtual NPError Device2DQueryCapability(int32 capability, int32* value);
+  virtual NPError Device2DQueryConfig(const NPDeviceContext2DConfig* request,
+                                      NPDeviceContext2DConfig* obtain);
+  virtual NPError Device2DInitializeContext(
+      const NPDeviceContext2DConfig* config,
+      NPDeviceContext2D* context);
+  virtual NPError Device2DSetStateContext(NPDeviceContext2D* context,
+                                          int32 state,
+                                          int32 value);
+  virtual NPError Device2DGetStateContext(NPDeviceContext2D* context,
+                                          int32 state,
+                                          int32* value);
+  virtual NPError Device2DFlushContext(NPDeviceContext2D* context,
+                                       NPDeviceFlushContextCallbackPtr callback,
+                                       void* user_data);
+  virtual NPError Device2DDestroyContext(NPDeviceContext2D* context);
   // End of WebPluginDelegate implementation.
 
   bool IsWindowless() const { return true; }
   gfx::Rect GetRect() const { return window_rect_; }
   gfx::Rect GetClipRect() const { return clip_rect_; }
 
   // Returns the path for the library implementing this plugin.
   FilePath GetPluginPath();
 
  private:
   WebPluginDelegatePepper(gfx::PluginWindowHandle containing_view,
                           NPAPI::PluginInstance *instance);
   ~WebPluginDelegatePepper();
 
-  //----------------------------
-  // used for windowless plugins
-  virtual NPError InitializeRenderContext(NPRenderType type,
-                                          NPRenderContext* context);
-  virtual NPError DestroyRenderContext(NPRenderContext* context);
-  virtual NPError FlushRenderContext(NPRenderContext* context);
-
-  virtual NPError OpenFileInSandbox(const char* file_name, void** handle);
-
   // Tells the plugin about the current state of the window.
   // See NPAPI NPP_SetWindow for more information.
   void WindowlessSetWindow(bool force_set_window);
 
   //-----------------------------------------
   // used for windowed and windowless plugins
 
   NPAPI::PluginInstance* instance() { return instance_.get(); }
 
   // Closes down and destroys our plugin instance.
@@ skipping 28 matching lines @@
   typedef std::map< void*, linked_ptr<OpenPaintContext> > OpenPaintContextMap;
   OpenPaintContextMap open_paint_contexts_;
 
   // The url with which the plugin was instantiated.
   std::string plugin_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegatePepper);
 };
 
 #endif  // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PEPPER_H_