Propagate DPI information to web-app.

remoting/client/rectangle_update_decoder.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/client/rectangle_update_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 12 matching lines @@
 using remoting::protocol::SessionConfig;
 
 namespace remoting {
 
 RectangleUpdateDecoder::RectangleUpdateDecoder(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     scoped_refptr<FrameConsumerProxy> consumer)
     : task_runner_(task_runner),
       consumer_(consumer),
       source_size_(SkISize::Make(0, 0)),
+      source_dpi_(SkIPoint::Make(0, 0)),
       view_size_(SkISize::Make(0, 0)),
       clip_area_(SkIRect::MakeEmpty()),
       paint_scheduled_(false) {
 }
 
 RectangleUpdateDecoder::~RectangleUpdateDecoder() {
 }
 
 void RectangleUpdateDecoder::Initialize(const SessionConfig& config) {
   // Initialize decoder based on the selected codec.
@@ skipping 25 matching lines @@
   if (packet->format().has_screen_width() &&
       packet->format().has_screen_height()) {
     SkISize source_size = SkISize::Make(packet->format().screen_width(),
                                         packet->format().screen_height());
     if (source_size_ != source_size) {
       source_size_ = source_size;
       decoder_needs_reset = true;
     }
   }
 
+  // If the source DPI has changed, store it. 96 is the default DPI as defined
+  // in video.proto.
+  SkIPoint source_dpi(SkIPoint::Make(packet->format().x_dpi(),
+                                     packet->format().y_dpi()));
+  if (source_dpi.x() == 0) {
+    source_dpi.setX(96);

[Wez, 2012/07/19 01:00:42]

See comment elsewhere re faking the DPI here.

[Jamie, 2012/07/19 23:00:06]

Done.

+  }
+  if (source_dpi.y() == 0) {
+    source_dpi.setY(96);
+  }
+  if (source_dpi != source_dpi_) {
+    source_dpi_ = source_dpi;
+    decoder_needs_reset = true;
+  }
+
   // If we've never seen a screen size, ignore the packet.
   if (source_size_.isZero()) {
     return;
   }
 
   if (decoder_needs_reset) {
     decoder_->Initialize(source_size_);
-    consumer_->SetSourceSize(source_size_);
+    consumer_->SetSourceSize(source_size_, source_dpi_);
   }
 
   if (!decoder_->IsReadyForData()) {
     // TODO(ajwong): This whole thing should move into an invalid state.
     LOG(ERROR) << "Decoder is unable to process data. Dropping packet.";
     return;
   }
 
   if (decoder_->DecodePacket(packet.get()) == Decoder::DECODE_DONE)
     SchedulePaint();
@@ skipping 113 matching lines @@
       } else {
         ++i;
       }
     }
 
     SchedulePaint();
   }
 }
 
 }  // namespace remoting