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

Unified Diff: remoting/base/encoder_zlib.cc

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix merge conflicts 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/base/encoder_zlib.h ('k') | remoting/base/protocol/chromotocol.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/encoder_zlib.cc
diff --git a/remoting/base/encoder_zlib.cc b/remoting/base/encoder_zlib.cc
index 84842acaa1f0dea9940dab5a01f5a8eed33ef683..fdf8725b182cfc45e03492f76fbf50dda3ab15a1 100644
--- a/remoting/base/encoder_zlib.cc
+++ b/remoting/base/encoder_zlib.cc
@@ -48,7 +48,7 @@ void EncoderZlib::EncodeRect(CompressorZlib* compressor,
const int bytes_per_pixel = GetBytesPerPixel(capture_data_->pixel_format());
const int row_size = bytes_per_pixel * rect.width();
- HostMessage* message = PrepareMessage(&rect);
+ ChromotingHostMessage* message = PrepareMessage(&rect);
const uint8 * in = capture_data_->data_planes().data[0] +
rect.y() * strides +
rect.x() * bytes_per_pixel;
@@ -107,8 +107,8 @@ void EncoderZlib::EncodeRect(CompressorZlib* compressor,
}
}
-HostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
- HostMessage* message = new HostMessage();
+ChromotingHostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
+ ChromotingHostMessage* message = new ChromotingHostMessage();
UpdateStreamPacketMessage* packet = message->mutable_update_stream_packet();
// Prepare the begin rect content.
@@ -126,7 +126,8 @@ HostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
return message;
}
-void EncoderZlib::SubmitMessage(HostMessage* message, size_t rect_index) {
+void EncoderZlib::SubmitMessage(ChromotingHostMessage* message,
+ size_t rect_index) {
EncodingState state = EncodingInProgress;
if (rect_index == 0 && message->update_stream_packet().has_begin_rect())
state |= EncodingStarting;
« no previous file with comments | « remoting/base/encoder_zlib.h ('k') | remoting/base/protocol/chromotocol.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698