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

remoting/client/plugin/pepper_view.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 "remoting/client/plugin/pepper_view.h"
 
 #include "base/message_loop.h"
 #include "remoting/client/plugin/chromoting_instance.h"
 #include "remoting/client/plugin/pepper_util.h"
-#include "third_party/ppapi/cpp/device_context_2d.h"
+#include "third_party/ppapi/cpp/graphics_2d.h"
 #include "third_party/ppapi/cpp/image_data.h"
 #include "third_party/ppapi/cpp/point.h"
 #include "third_party/ppapi/cpp/size.h"
 
 namespace remoting {
 
 PepperView::PepperView(ChromotingInstance* instance)
-  : instance_(instance),
-    viewport_x_(0),
-    viewport_y_(0),
-    viewport_width_(0),
-    viewport_height_(0),
-    is_static_fill_(false),
-    static_fill_color_(0) {
+    : instance_(instance),
+      viewport_x_(0),
+      viewport_y_(0),
+      viewport_width_(0),
+      viewport_height_(0),
+      is_static_fill_(false),
+      static_fill_color_(0) {
 }
 
 PepperView::~PepperView() {
 }
 
 bool PepperView::Initialize() {
   return true;
 }
 
 void PepperView::TearDown() {
@@ skipping 75 matching lines @@
 
   // TODO(ajwong): Should we ignore x & y updates?  What do those even mean?
 
   // TODO(ajwong): What does viewport x, y mean to a plugin anyways?
   viewport_x_ = x;
   viewport_y_ = y;
   viewport_width_ = width;
   viewport_height_ = height;
 
   device_context_ =
-      pp::DeviceContext2D(pp::Size(viewport_width_, viewport_height_), false);
-  if (!instance_->BindGraphicsDeviceContext(device_context_)) {
+      pp::Graphics2D(pp::Size(viewport_width_, viewport_height_), false);
+  if (!instance_->BindGraphics(device_context_)) {
     LOG(ERROR) << "Couldn't bind the device context.";
     return;
   }
 }
 
 void PepperView::SetHostScreenSize(int width, int height) {
   if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(NewRunnableMethod(this,
                                             &PepperView::SetHostScreenSize,
                                             width, height));
@@ skipping 69 matching lines @@
                            update_rects_.begin(), update_rects_.end());
   Paint();
   // TODO(ajwong): Need to block here to be synchronous.
 }
 
 
 void PepperView::OnDecodeDone() {
 }
 
 }  // namespace remoting