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

webkit/glue/plugins/pepper_widget.cc

 // Copyright (c) 2010 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.
 
 #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"
 
 namespace pepper {
 
 namespace {
 
 bool IsWidget(PP_Resource resource) {
   return !!Resource::GetAs<Widget>(resource);
@@ skipping 20 matching lines @@
   scoped_refptr<Widget> widget(Resource::GetAs<Widget>(resource));
   return widget && widget->GetLocation(location);
 }
 
 void SetLocation(PP_Resource resource, const PP_Rect* location) {
   scoped_refptr<Widget> widget(Resource::GetAs<Widget>(resource));
   if (widget)
     widget->SetLocation(location);
 }
 
-const PPB_Widget ppb_widget = {
+const PPB_Widget_Dev ppb_widget = {
   &IsWidget,
   &Paint,
   &HandleEvent,
   &GetLocation,
   &SetLocation,
 };
 
 }  // namespace
 
 Widget::Widget(PluginInstance* instance)
     : Resource(instance->module()),
       instance_(instance) {
 }
 
 Widget::~Widget() {
 }
 
 // static
-const PPB_Widget* Widget::GetInterface() {
+const PPB_Widget_Dev* Widget::GetInterface() {
   return &ppb_widget;
 }
 
 bool Widget::GetLocation(PP_Rect* location) {
   *location = location_;
   return true;
 }
 
 void Widget::SetLocation(const PP_Rect* location) {
   location_ = *location;
   SetLocationInternal(location);
 }
 
 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);
   widget->Invalidate(instance_->GetPPInstance(), resource.id, dirty);
 }
 
 }  // namespace pepper