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

webkit/glue/plugins/pepper_scrollbar.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_scrollbar.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/ppapi/c/ppp_scrollbar.h"
+#include "third_party/ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScrollbar.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/plugins/pepper_event_conversion.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"
 #include "webkit/glue/webkit_glue.h"
 
@@ skipping 46 matching lines @@
 }
 
 void SetTickMarks(PP_Resource resource,
                   const PP_Rect* tick_marks,
                   uint32_t count) {
   scoped_refptr<Scrollbar> scrollbar(Resource::GetAs<Scrollbar>(resource));
   if (scrollbar)
     scrollbar->SetTickMarks(tick_marks, count);
 }
 
-void ScrollBy(PP_Resource resource, PP_ScrollBy unit, int32_t multiplier) {
+void ScrollBy(PP_Resource resource, PP_ScrollBy_Dev unit, int32_t multiplier) {
   scoped_refptr<Scrollbar> scrollbar(Resource::GetAs<Scrollbar>(resource));
   if (scrollbar)
     scrollbar->ScrollBy(unit, multiplier);
 }
 
-const PPB_Scrollbar ppb_scrollbar = {
+const PPB_Scrollbar_Dev ppb_scrollbar = {
   &Create,
   &IsScrollbar,
   &GetThickness,
   &GetValue,
   &SetValue,
   &SetDocumentSize,
   &SetTickMarks,
   &ScrollBy
 };
 
 }  // namespace
 
 Scrollbar::Scrollbar(PluginInstance* instance, bool vertical)
     : Widget(instance) {
   scrollbar_.reset(WebScrollbar::create(
       static_cast<WebKit::WebScrollbarClient*>(this),
       vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal));
 }
 
 Scrollbar::~Scrollbar() {
 }
 
 // static
-const PPB_Scrollbar* Scrollbar::GetInterface() {
+const PPB_Scrollbar_Dev* Scrollbar::GetInterface() {
   return &ppb_scrollbar;
 }
 
 uint32_t Scrollbar::GetValue() {
   return scrollbar_->value();
 }
 
 void Scrollbar::SetValue(uint32_t value) {
   scrollbar_->setValue(value);
 }
 
 void Scrollbar::SetDocumentSize(uint32_t size) {
   scrollbar_->setDocumentSize(size);
 }
 
 void Scrollbar::SetTickMarks(const PP_Rect* tick_marks, uint32_t count) {
   tickmarks_.resize(count);
   for (uint32 i = 0; i < count; ++i) {
     tickmarks_[i] = WebRect(tick_marks[i].point.x,
                             tick_marks[i].point.y,
                             tick_marks[i].size.width,
                             tick_marks[i].size.height);;
   }
   PP_Rect rect = location();
   Invalidate(&rect);
 }
 
-void Scrollbar::ScrollBy(PP_ScrollBy unit, int32_t multiplier) {
+void Scrollbar::ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier) {
   WebScrollbar::ScrollDirection direction = multiplier >= 0 ?
       WebScrollbar::ScrollForward : WebScrollbar::ScrollBackward;
   float fmultiplier = 1.0;
 
   WebScrollbar::ScrollGranularity granularity;
   if (unit == PP_SCROLLBY_LINE) {
     granularity = WebScrollbar::ScrollByLine;
   } else if (unit == PP_SCROLLBY_PAGE) {
     granularity = WebScrollbar::ScrollByPage;
   } else if (unit == PP_SCROLLBY_DOCUMENT) {
@@ skipping 36 matching lines @@
 }
 
 void Scrollbar::SetLocationInternal(const PP_Rect* location) {
   scrollbar_->setLocation(WebRect(location->point.x,
                                   location->point.y,
                                   location->size.width,
                                   location->size.height));
 }
 
 void Scrollbar::valueChanged(WebKit::WebScrollbar* scrollbar) {
-  const PPP_Scrollbar* ppp_scrollbar = static_cast<const PPP_Scrollbar*>(
-      module()->GetPluginInterface(PPP_SCROLLBAR_INTERFACE));
+  const PPP_Scrollbar_Dev* ppp_scrollbar =
+      static_cast<const PPP_Scrollbar_Dev*>(
+          module()->GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE));
   if (!ppp_scrollbar)
     return;
   ScopedResourceId resource(this);
   ppp_scrollbar->ValueChanged(
       instance()->GetPPInstance(), resource.id, scrollbar_->value());
 }
 
 void Scrollbar::invalidateScrollbarRect(WebKit::WebScrollbar* scrollbar,
                                         const WebKit::WebRect& rect) {
   gfx::Rect gfx_rect(rect.x,
@@ skipping 26 matching lines @@
   PP_Rect pp_rect;
   pp_rect.point.x = dirty_.x();
   pp_rect.point.y = dirty_.y();
   pp_rect.size.width = dirty_.width();
   pp_rect.size.height = dirty_.height();
   dirty_ = gfx::Rect();
   Invalidate(&pp_rect);
 }
 
 }  // namespace pepper