Added the desktop shape fields to VideoPacket.

remoting/client/plugin/chromoting_instance.h

 // Copyright (c) 2012 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.
 
 // TODO(ajwong): We need to come up with a better description of the
 // responsibilities for each thread.
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/cpp/var.h"
 #include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 // Windows defines 'PostMessage', so we have to undef it before we
 // include instance_private.h
 #if defined(PostMessage)
 #undef PostMessage
 #endif
 
 #include "ppapi/cpp/instance.h"
 #include "remoting/client/client_context.h"
@@ skipping 97 matching lines @@
   // protocol::ClipboardStub interface.
   virtual void InjectClipboardEvent(
       const protocol::ClipboardEvent& event) OVERRIDE;
 
   // protocol::CursorShapeStub interface.
   virtual void SetCursorShape(
       const protocol::CursorShapeInfo& cursor_shape) OVERRIDE;
 
   // Called by PepperView.
   void SetDesktopSize(const SkISize& size, const SkIPoint& dpi);
+  void SetDesktopShape(const SkRegion& shape);
   void OnFirstFrameReceived();
 
   // Return statistics record by ChromotingClient.
   // If no connection is currently active then NULL will be returned.
   ChromotingStats* GetStats();
 
   // Registers a global log message handler that redirects the log output to
   // our plugin instance.
   // This is called by the plugin's PPP_InitializeModule.
   // Note that no logging will be processed unless a ChromotingInstance has been
@@ skipping 78 matching lines @@
 
   bool initialized_;
 
   PepperPluginThreadDelegate plugin_thread_delegate_;
   scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_;
   ClientContext context_;
   scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_;
   scoped_ptr<PepperView> view_;
   pp::View plugin_view_;
 
+  // Contains the most-recently-reported desktop shape, if any.
+  scoped_ptr<SkRegion> desktop_shape_;
+
   scoped_ptr<PepperSignalStrategy> signal_strategy_;
 
   scoped_ptr<protocol::ConnectionToHost> host_connection_;
   scoped_ptr<ChromotingClient> client_;
 
   // Input pipeline components, in reverse order of distance from input source.
   protocol::MouseInputFilter mouse_input_filter_;
   protocol::InputEventTracker input_tracker_;
 #if defined(OS_MACOSX)
   MacKeyEventProcessor mac_key_event_processor_;
 #endif
   KeyEventMapper key_mapper_;
   PepperInputHandler input_handler_;
 
   // PIN Fetcher.
   bool use_async_pin_dialog_;
   protocol::SecretFetchedCallback secret_fetched_callback_;
 
   base::WeakPtr<PepperTokenFetcher> pepper_token_fetcher_;
 
   base::WeakPtrFactory<ChromotingInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_