Index: remoting/client/plugin/chromoting_plugin.cc |
diff --git a/remoting/client/plugin/chromoting_plugin.cc b/remoting/client/plugin/chromoting_plugin.cc |
index 88b19cbde2baf187137564fde04a3b2dc5bcf391..c5b5b030edb60b75befa224218a6f4f56b83dc43 100644 |
--- a/remoting/client/plugin/chromoting_plugin.cc |
+++ b/remoting/client/plugin/chromoting_plugin.cc |
@@ -24,13 +24,15 @@ using std::vector; |
namespace remoting { |
-const char* ChromotingPlugin::kMimeType = |
- "pepper-application/x-chromoting-plugin::Chromoting"; |
- |
-ChromotingPlugin::ChromotingPlugin(PP_Instance instance) |
- : pp::Instance(instance), |
- width_(0), |
- height_(0) { |
+const char* ChromotingPlugin::kMimeType = "pepper-application/x-chromoting"; |
+ |
+ChromotingPlugin::ChromotingPlugin(PP_Instance pp_instance, |
+ const PPB_Instance* ppb_instance_funcs) |
+ : width_(0), |
+ height_(0), |
+ drawing_context_(NULL), |
+ pp_instance_(pp_instance), |
+ ppb_instance_funcs_(ppb_instance_funcs) { |
} |
ChromotingPlugin::~ChromotingPlugin() { |
@@ -115,8 +117,13 @@ void ChromotingPlugin::ViewChanged(const PP_Rect& position, |
width_ = position.size.width; |
height_ = position.size.height; |
+ /* |
+ * TODO(ajwong): Reenable this code once we fingure out how we want to |
+ * abstract away the C-api for DeviceContext2D. |
device_context_ = pp::DeviceContext2D(width_, height_, false); |
- if (!BindGraphicsDeviceContext(device_context_)) { |
+ if (!ppb_instance_funcs_->BindGraphicsDeviceContext( |
+ pp_instance_, |
+ device_context_.pp_resource())) { |
LOG(ERROR) << "Couldn't bind the device context."; |
return; |
} |
@@ -133,6 +140,7 @@ void ChromotingPlugin::ViewChanged(const PP_Rect& position, |
} else { |
LOG(ERROR) << "Unable to allocate image."; |
} |
+ */ |
//client_->SetViewport(0, 0, width_, height_); |
//client_->Repaint(); |