Pepper and WebKit API change to support a plugin knowing if a scrollbar is an overlay one.

webkit/plugins/ppapi/ppb_scrollbar_impl.cc

 // Copyright (c) 2011 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/plugins/ppapi/ppb_scrollbar_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/thunk/thunk.h"
@@ skipping 30 matching lines @@
 // the GetThickness call which has no parameters.
 
 PP_Resource Create(PP_Instance instance, PP_Bool vertical) {
   return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->Create(instance, vertical);
 }
 
 PP_Bool IsScrollbar(PP_Resource resource) {
   return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->IsScrollbar(resource);
 }
 
-uint32_t GetThickness() {
+uint32_t GetThickness3() {
   return WebScrollbar::defaultThickness();
 }
 
+uint32_t GetThickness4(PP_Resource resource) {
+  return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->GetThickness(resource);
+}
+
 uint32_t GetValue(PP_Resource resource) {
   return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->GetValue(resource);
 }
 
 void SetValue(PP_Resource resource, uint32_t value) {
   return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->SetValue(resource, value);
 }
 
 void SetDocumentSize(PP_Resource resource, uint32_t size) {
   return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->SetDocumentSize(resource,
@@ skipping 10 matching lines @@
 
 void ScrollBy(PP_Resource resource, PP_ScrollBy_Dev unit, int32_t multiplier) {
   return ::ppapi::thunk::GetPPB_Scrollbar_Thunk()->ScrollBy(resource,
                                                             unit,
                                                             multiplier);
 }
 
 const PPB_Scrollbar_0_3_Dev ppb_scrollbar_0_3 = {
   &Create,
   &IsScrollbar,
-  &GetThickness,
+  &GetThickness3,
   &GetValue,
   &SetValue,
   &SetDocumentSize,
   &SetTickMarks,
   &ScrollBy
 };
 
+const PPB_Scrollbar_0_4_Dev ppb_scrollbar_0_4 = {
+  &Create,
+  &IsScrollbar,
+  &GetThickness4,
+  &GetValue,
+  &SetValue,
+  &SetDocumentSize,
+  &SetTickMarks,
+  &ScrollBy
+};
+
 }  // namespace
 
-PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PluginInstance* instance, bool vertical)
+// static
+PP_Resource PPB_Scrollbar_Impl::Create(PluginInstance* instance,
+                                       bool vertical) {
+  scoped_refptr<PPB_Scrollbar_Impl> scrollbar(
+      new PPB_Scrollbar_Impl(instance));
+  scrollbar->Init(vertical);
+  return scrollbar->GetReference();
+}
+
+PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PluginInstance* instance)
     : PPB_Widget_Impl(instance) {
-  scrollbar_.reset(WebScrollbar::create(
-      static_cast<WebKit::WebScrollbarClient*>(this),
-      vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal));
 }
 
 PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() {
 }
 
+void PPB_Scrollbar_Impl::Init(bool vertical) {
+#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY)
+  scrollbar_.reset(WebScrollbar::createForPlugin(
+      vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal,
+      instance()->container(),
+      static_cast<WebKit::WebScrollbarClient*>(this)));
+#else
+  scrollbar_.reset(WebScrollbar::create(
+      static_cast<WebKit::WebScrollbarClient*>(this),
+      vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal));
+#endif
+}
+
 PPB_Scrollbar_API* PPB_Scrollbar_Impl::AsPPB_Scrollbar_API() {
   return this;
 }
 
 // static
 const PPB_Scrollbar_0_3_Dev* PPB_Scrollbar_Impl::Get0_3Interface() {
   return &ppb_scrollbar_0_3;
 }
 
+// static
+const PPB_Scrollbar_0_4_Dev* PPB_Scrollbar_Impl::Get0_4Interface() {
+  return &ppb_scrollbar_0_4;
+}
+
 uint32_t PPB_Scrollbar_Impl::GetThickness() {
   return WebScrollbar::defaultThickness();
 }
 
+bool PPB_Scrollbar_Impl::IsOverlay() {
+// TODO(jam): take this out once WebKit is rolled.
+#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY)
+  return scrollbar_->isOverlay();
+#else
+  return false;
+#endif
+}
+
 uint32_t PPB_Scrollbar_Impl::GetValue() {
   return scrollbar_->value();
 }
 
 void PPB_Scrollbar_Impl::SetValue(uint32_t value) {
   scrollbar_->setValue(value);
 }
 
 void PPB_Scrollbar_Impl::SetDocumentSize(uint32_t size) {
   scrollbar_->setDocumentSize(size);
@@ skipping 62 matching lines @@
   scrollbar_->setLocation(WebRect(location->point.x,
                                   location->point.y,
                                   location->size.width,
                                   location->size.height));
 }
 
 void PPB_Scrollbar_Impl::valueChanged(WebKit::WebScrollbar* scrollbar) {
   const PPP_Scrollbar_Dev* ppp_scrollbar =
       static_cast<const PPP_Scrollbar_Dev*>(instance()->module()->
           GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE));
+  if (!ppp_scrollbar) {
+    // Try the old version. This is ok because the old interface is a subset of
+    // the new one, and ValueChanged didn't change.
+    ppp_scrollbar =
+      static_cast<const PPP_Scrollbar_Dev*>(instance()->module()->
+          GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE_0_2));
+    if (!ppp_scrollbar)
+      return;
+  }
+  ScopedResourceId resource(this);
+  ppp_scrollbar->ValueChanged(
+      instance()->pp_instance(), resource.id, scrollbar_->value());
+}
+
+void PPB_Scrollbar_Impl::overlayChanged(WebScrollbar* scrollbar) {
+  const PPP_Scrollbar_Dev* ppp_scrollbar =
+      static_cast<const PPP_Scrollbar_Dev*>(instance()->module()->
+          GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE));
   if (!ppp_scrollbar)
     return;
   ScopedResourceId resource(this);
-  ppp_scrollbar->ValueChanged(
-      instance()->pp_instance(), resource.id, scrollbar_->value());
+  ppp_scrollbar->OverlayChanged(
+      instance()->pp_instance(), resource.id,
+      PP_FromBool(IsOverlay()));
 }
 
 void PPB_Scrollbar_Impl::invalidateScrollbarRect(
     WebKit::WebScrollbar* scrollbar,
     const WebKit::WebRect& rect) {
   gfx::Rect gfx_rect(rect.x,
                      rect.y,
                      rect.width,
                      rect.height);
   dirty_ = dirty_.Union(gfx_rect);
@@ skipping 24 matching lines @@
   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 ppapi
 }  // namespace webkit