Rename ClientDimensions to ClientResolution and add pixel-size and DPI fields.

remoting/host/client_session.cc

 // 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.
 
 #include "remoting/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "media/video/capture/screen/screen_capturer.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_opus.h"
 #include "remoting/codec/audio_encoder_speex.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vp8.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_scheduler.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/video_scheduler.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 
 namespace remoting {
 
+namespace {
+// Default DPI to assume for old clients that use notifyClientDimensions.
+const int kDefaultDPI = 96;
+} // namespace
+
 ClientSession::ClientSession(
     EventHandler* event_handler,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
     scoped_ptr<protocol::ConnectionToClient> connection,
     DesktopEnvironmentFactory* desktop_environment_factory,
@@ skipping 28 matching lines @@
   // later and set them only when connection is authenticated.
   connection_->set_clipboard_stub(&auth_clipboard_filter_);
   connection_->set_host_stub(this);
   connection_->set_input_stub(&auth_input_filter_);
 
   // |auth_*_filter_|'s states reflect whether the session is authenticated.
   auth_input_filter_.set_enabled(false);
   auth_clipboard_filter_.set_enabled(false);
 }
 
-void ClientSession::NotifyClientDimensions(
-    const protocol::ClientDimensions& dimensions) {
-  if (dimensions.has_width() && dimensions.has_height()) {
-    VLOG(1) << "Received ClientDimensions (width="
-            << dimensions.width() << ", height=" << dimensions.height() << ")";
-    event_handler_->OnClientDimensionsChanged(
-        this, SkISize::Make(dimensions.width(), dimensions.height()));
+void ClientSession::NotifyClientResolution(
+    const protocol::ClientResolution& resolution) {
+  if (resolution.has_dips_width() && resolution.has_dips_height()) {
+    VLOG(1) << "Received ClientResolution (dips_width="
+            << resolution.width() << ", dips_height="
+            << resolution.height() << ")";
+    event_handler_->OnClientResolutionChanged(
+        this,
+        SkISize::Make(resolution.dips_width(), resolution.dips_height()),
+        SkIPoint::Make(kDefaultDPI, kDefaultDPI));

[Jamie, 2013/02/11 23:25:58]

Why not use the new fields, if present? Is that coming in a follow-up?

[Wez, 2013/02/12 01:55:28]

Adding that separately, in crrev.com/12225113.

   }
 }
 
 void ClientSession::ControlVideo(const protocol::VideoControl& video_control) {
   if (video_control.has_enable()) {
     VLOG(1) << "Received VideoControl (enable="
             << video_control.enable() << ")";
     if (video_scheduler_)
       video_scheduler_->Pause(!video_control.enable());
   }
@@ skipping 223 matching lines @@
   NOTIMPLEMENTED();
   return scoped_ptr<AudioEncoder>(NULL);
 }
 
 // static
 void ClientSessionTraits::Destruct(const ClientSession* client) {
   client->network_task_runner_->DeleteSoon(FROM_HERE, client);
 }
 
 }  // namespace remoting