Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_widget.cc

Index: webkit/glue/plugins/pepper_widget.cc
===================================================================
--- webkit/glue/plugins/pepper_widget.cc	(revision 57791)
+++ webkit/glue/plugins/pepper_widget.cc	(working copy)
@@ -5,10 +5,10 @@
 #include "webkit/glue/plugins/pepper_widget.h"
 
 #include "base/logging.h"
+#include "third_party/ppapi/c/dev/ppb_widget_dev.h"
+#include "third_party/ppapi/c/dev/ppp_widget_dev.h"
 #include "third_party/ppapi/c/pp_completion_callback.h"
 #include "third_party/ppapi/c/pp_errors.h"
-#include "third_party/ppapi/c/ppb_widget.h"
-#include "third_party/ppapi/c/ppp_widget.h"
 #include "webkit/glue/plugins/pepper_image_data.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
@@ -49,7 +49,7 @@
     widget->SetLocation(location);
 }
 
-const PPB_Widget ppb_widget = {
+const PPB_Widget_Dev ppb_widget = {
   &IsWidget,
   &Paint,
   &HandleEvent,
@@ -68,7 +68,7 @@
 }
 
 // static
-const PPB_Widget* Widget::GetInterface() {
+const PPB_Widget_Dev* Widget::GetInterface() {
   return &ppb_widget;
 }
 
@@ -83,8 +83,8 @@
 }
 
 void Widget::Invalidate(const PP_Rect* dirty) {
-  const PPP_Widget* widget = static_cast<const PPP_Widget*>(
-      module()->GetPluginInterface(PPP_WIDGET_INTERFACE));
+  const PPP_Widget_Dev* widget = static_cast<const PPP_Widget_Dev*>(
+      module()->GetPluginInterface(PPP_WIDGET_DEV_INTERFACE));
   if (!widget)
     return;
   ScopedResourceId resource(this);