summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 01:31:07 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 01:31:07 +0000
commit81870ae8c94f96486435a11a490fa53e4dafb096 (patch)
treee4ce9353aec4ae676710e139381169b6a4965014 /remoting
parentf58bddab858b88bddd77d7ef8d01a4a2eea55364 (diff)
downloadchromium_src-81870ae8c94f96486435a11a490fa53e4dafb096.zip
chromium_src-81870ae8c94f96486435a11a490fa53e4dafb096.tar.gz
chromium_src-81870ae8c94f96486435a11a490fa53e4dafb096.tar.bz2
Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Graphics2D.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3255003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/plugin/chromoting_instance.h1
-rw-r--r--remoting/client/plugin/pepper_view.cc20
-rw-r--r--remoting/client/plugin/pepper_view.h4
3 files changed, 12 insertions, 13 deletions
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index cea04b4..6d6d6f7 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -19,7 +19,6 @@
#include "third_party/ppapi/c/pp_rect.h"
#include "third_party/ppapi/c/pp_resource.h"
#include "third_party/ppapi/cpp/instance.h"
-#include "third_party/ppapi/cpp/device_context_2d.h"
#include "third_party/ppapi/cpp/var.h"
class MessageLoop;
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index ab631a8..cc72c43 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -7,7 +7,7 @@
#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"
@@ -15,13 +15,13 @@
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() {
@@ -117,8 +117,8 @@ void PepperView::SetViewport(int x, int y, int width, int height) {
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;
}
diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h
index 5e12dce..4ce932ec 100644
--- a/remoting/client/plugin/pepper_view.h
+++ b/remoting/client/plugin/pepper_view.h
@@ -18,7 +18,7 @@
#include "base/task.h"
#include "media/base/video_frame.h"
#include "remoting/client/chromoting_view.h"
-#include "third_party/ppapi/cpp/device_context_2d.h"
+#include "third_party/ppapi/cpp/graphics_2d.h"
namespace remoting {
@@ -56,7 +56,7 @@ class PepperView : public ChromotingView {
// object creation, and never change.
ChromotingInstance* const instance_;
- pp::DeviceContext2D device_context_;
+ pp::Graphics2D device_context_;
int viewport_x_;
int viewport_y_;