Changing UpdateStreamPacket protobuf definition for chromoting

remoting/base/protocol/chromotocol.proto

 // 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.
 //
 // Protocol for communication between chromoting client and host.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
@@ skipping 33 matching lines @@
   PixelFormatRgb565 = 2;
   PixelFormatRgb24 = 3;
   PixelFormatRgb32 = 4;
   PixelFormatRgba = 5;
   PixelFormatYv12 = 6;
   PixelFormatYv16 = 7;
   PixelFormatEmpty = 8;
   PixelFormatAscii = 9;
 }
 
-// A message with info about the update stream.
+// A message that denotes the beginning of an updating rectangle in an update
+// stream packet.
 // NEXT ID: 6
-message UpdateStreamPacketHeader {
+message UpdateStreamBeginRect {
   // X,Y coordinates (in screen pixels) for origin of this update.
   required int32 x = 1;
   required int32 y = 2;
 
   // Width, height (in screen pixels) for this update.
   required int32 width = 3;
   required int32 height = 4;
 
   // The encoding used for this image update.
   optional UpdateStreamEncoding encoding = 5 [default=EncodingNone];
 
   // The pixel format of this image.
   optional PixelFormat pixel_format = 6 [default=PixelFormatRgb24];
 }
 
+// A message that contains partial data for updating an rectangle in an
+// update stream packet.
+// NEXT ID: 3
+message UpdateStreamRectData {
+  // The sequence number of the partial data for updating a rectangle.
+  optional int32 sequence_number = 1 [default=0];
+
+  // The partial data for updating a rectangle.
+  required bytes data = 2;
+}
+
+// A message that denotes the end of an updating rectangle.
+// NEXT ID: 1
+message UpdateStreamEndRect {
+}
+
 // A message to denote a partial update stream.
-// NEXT ID: 3
+// NEXT ID: 4
 message UpdateStreamPacketMessage {
-  // TODO(garykac): Make this required and fix unit tests.
-  optional UpdateStreamPacketHeader header = 2;
-  optional bytes data = 1;
+  optional UpdateStreamBeginRect begin_rect = 1;
+  optional UpdateStreamRectData rect_data = 2;
+  optional UpdateStreamEndRect end_rect = 3;
 }
 
 // Defines the message that is sent from the host to the client.
 // Only one of these messages should be present.
 // NEXT ID: 5
 message HostMessage {
   optional InitClientMessage init_client= 1;
   optional BeginUpdateStreamMessage begin_update_stream = 2;
   optional EndUpdateStreamMessage end_update_stream = 3;
   optional UpdateStreamPacketMessage update_stream_packet = 4;
@@ skipping 56 matching lines @@
 // Only one of these messages should be present.
 // NEXT ID: 7
 message ClientMessage {
   optional KeyEvent key_event = 1;
   optional MouseSetPositionEvent mouse_set_position_event = 2;
   optional MouseMoveEvent mouse_move_event = 3;
   optional MouseWheelEvent mouse_wheel_event = 4;
   optional MouseDownEvent mouse_down_event = 5;
   optional MouseUpEvent mouse_up_event = 6;
 }