Remove PPB_Scrollbar_Dev and PPB_Widget_Dev from native client

ppapi/native_client/src/trusted/plugin/plugin.cc

 // Copyright (c) 2012 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.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "native_client/src/trusted/plugin/plugin.h"
@@ skipping 28 matching lines @@
 #include "native_client/src/trusted/plugin/nexe_arch.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/scriptable_plugin.h"
 #include "native_client/src/trusted/plugin/service_runtime.h"
 #include "native_client/src/trusted/plugin/utility.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
-#include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
-#include "ppapi/c/dev/ppp_widget_dev.h"
 #include "ppapi/c/dev/ppp_zoom_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/c/private/ppb_uma_private.h"
 #include "ppapi/cpp/dev/find_dev.h"
 #include "ppapi/cpp/dev/printing_dev.h"
-#include "ppapi/cpp/dev/scrollbar_dev.h"
 #include "ppapi/cpp/dev/selection_dev.h"
 #include "ppapi/cpp/dev/text_input_dev.h"
 #include "ppapi/cpp/dev/url_util_dev.h"
-#include "ppapi/cpp/dev/widget_client_dev.h"
 #include "ppapi/cpp/dev/zoom_dev.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/mouse_lock.h"
 #include "ppapi/cpp/rect.h"
 
 using ppapi_proxy::BrowserPpp;
 
 namespace plugin {
@@ skipping 319 matching lines @@
   }
 
  private:
   Plugin* plugin_;
   const PPP_Selection_Dev* ppp_selection_;
 
   NACL_DISALLOW_COPY_AND_ASSIGN(SelectionAdapter);
 };
 
 
-// Derive a class from pp::WidgetClient_Dev to forward PPP_Widget_Dev
-// and PPP_Scrollbar_Dev calls to the plugin.
-class WidgetClientAdapter : public pp::WidgetClient_Dev {
- public:
-  explicit WidgetClientAdapter(Plugin* plugin)
-    : pp::WidgetClient_Dev(plugin),
-      plugin_(plugin) {
-    BrowserPpp* proxy = plugin_->ppapi_proxy();
-    CHECK(proxy != NULL);
-    ppp_widget_ = static_cast<const PPP_Widget_Dev*>(
-        proxy->GetPluginInterface(PPP_WIDGET_DEV_INTERFACE));
-    ppp_scrollbar_ = static_cast<const PPP_Scrollbar_Dev*>(
-        proxy->GetPluginInterface(PPP_SCROLLBAR_DEV_INTERFACE));
-  }
-
-  void InvalidateWidget(pp::Widget_Dev widget, const pp::Rect& dirty_rect) {
-    if (ppp_widget_ != NULL) {
-      ppp_widget_->Invalidate(plugin_->pp_instance(),
-                              widget.pp_resource(),
-                              &dirty_rect.pp_rect());
-    }
-  }
-
-  void ScrollbarValueChanged(pp::Scrollbar_Dev scrollbar, uint32_t value) {
-    if (ppp_scrollbar_ != NULL) {
-      ppp_scrollbar_->ValueChanged(plugin_->pp_instance(),
-                                   scrollbar.pp_resource(),
-                                   value);
-    }
-  }
-
-  void ScrollbarOverlayChanged(pp::Scrollbar_Dev scrollbar, bool overlay) {
-    if (ppp_scrollbar_ != NULL) {
-      ppp_scrollbar_->OverlayChanged(plugin_->pp_instance(),
-                                     scrollbar.pp_resource(),
-                                     PP_FromBool(overlay));
-    }
-  }
-
- private:
-  Plugin* plugin_;
-  const PPP_Widget_Dev* ppp_widget_;
-  const PPP_Scrollbar_Dev* ppp_scrollbar_;
-
-  NACL_DISALLOW_COPY_AND_ASSIGN(WidgetClientAdapter);
-};
-
-
 // Derive a class from pp::Zoom_Dev to forward PPP_Zoom_Dev calls to
 // the plugin.
 class ZoomAdapter : public pp::Zoom_Dev {
  public:
   explicit ZoomAdapter(Plugin* plugin)
     : pp::Zoom_Dev(plugin),
       plugin_(plugin) {
     BrowserPpp* proxy = plugin_->ppapi_proxy();
     CHECK(proxy != NULL);
     ppp_zoom_ = static_cast<const PPP_Zoom_Dev*>(
@@ skipping 855 matching lines @@
     return false;
   }
 
   ppapi_proxy_ = ppapi_proxy.release();
 
   // Create PPP* interface adapters to forward calls to .nexe.
   find_adapter_.reset(new FindAdapter(this));
   mouse_lock_adapter_.reset(new MouseLockAdapter(this));
   printing_adapter_.reset(new PrintingAdapter(this));
   selection_adapter_.reset(new SelectionAdapter(this));
-  widget_client_adapter_.reset(new WidgetClientAdapter(this));
   zoom_adapter_.reset(new ZoomAdapter(this));
 
   // Replay missed events.
   if (!view_to_replay_.is_null()) {
     DidChangeView(view_to_replay_);
     view_to_replay_ = pp::View();
   }
   if (!document_load_to_replay_.is_null()) {
     HandleDocumentLoad(document_load_to_replay_);
     document_load_to_replay_ = pp::URLLoader();
@@ skipping 611 matching lines @@
                                           static_cast<uint32_t>(text.size()));
   const PPB_Console_Dev* console_interface =
       static_cast<const PPB_Console_Dev*>(
           module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE));
   console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str);
   var_interface->Release(prefix);
   var_interface->Release(str);
 }
 
 }  // namespace plugin