Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2580)

Unified Diff: remoting/client/plugin/pepper_view.cc

Issue 3078005: Rename ChromotingPlugin -> ChromotingInstance to be more consistent with... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/pepper_view.h ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/pepper_view.cc
===================================================================
--- remoting/client/plugin/pepper_view.cc (revision 55094)
+++ remoting/client/plugin/pepper_view.cc (working copy)
@@ -6,7 +6,7 @@
#include "base/message_loop.h"
#include "remoting/base/decoder_zlib.h"
-#include "remoting/client/plugin/chromoting_plugin.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/image_data.h"
@@ -15,8 +15,8 @@
namespace remoting {
-PepperView::PepperView(ChromotingPlugin* plugin)
- : plugin_(plugin),
+PepperView::PepperView(ChromotingInstance* instance)
+ : instance_(instance),
backing_store_width_(0),
backing_store_height_(0),
viewport_x_(0),
@@ -38,7 +38,7 @@
}
void PepperView::Paint() {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(NewRunnableMethod(this, &PepperView::Paint));
return;
}
@@ -84,7 +84,7 @@
}
void PepperView::SetSolidFill(uint32 color) {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::SetSolidFill, color));
return;
@@ -95,7 +95,7 @@
}
void PepperView::UnsetSolidFill() {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::UnsetSolidFill));
return;
@@ -105,7 +105,7 @@
}
void PepperView::SetViewport(int x, int y, int width, int height) {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(NewRunnableMethod(this, &PepperView::SetViewport,
x, y, width, height));
return;
@@ -121,14 +121,14 @@
device_context_ =
pp::DeviceContext2D(pp::Size(viewport_width_, viewport_height_), false);
- if (!plugin_->BindGraphicsDeviceContext(device_context_)) {
+ if (!instance_->BindGraphicsDeviceContext(device_context_)) {
LOG(ERROR) << "Couldn't bind the device context.";
return;
}
}
void PepperView::SetHostScreenSize(int width, int height) {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(NewRunnableMethod(this,
&PepperView::SetHostScreenSize,
width, height));
@@ -140,7 +140,7 @@
}
void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::HandleBeginUpdateStream,
msg));
@@ -170,7 +170,7 @@
}
void PepperView::HandleUpdateStreamPacket(HostMessage* msg) {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::HandleUpdateStreamPacket,
msg));
@@ -181,7 +181,7 @@
}
void PepperView::HandleEndUpdateStream(HostMessage* msg) {
- if (!plugin_->CurrentlyOnPluginThread()) {
+ if (!instance_->CurrentlyOnPluginThread()) {
RunTaskOnPluginThread(
NewRunnableMethod(this, &PepperView::HandleEndUpdateStream,
msg));
« no previous file with comments | « remoting/client/plugin/pepper_view.h ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698