[Chromecast] Handle device scale factor correctly

chromecast/media/base/video_plane_controller.cc

 // Copyright 2015 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 "chromecast/media/base/video_plane_controller.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 122 matching lines @@
   // (i.e. allow at least as much time between calls as the call itself takes).
   std::vector<int64_t> samples_;
   size_t sample_counter_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(RateLimitedSetVideoPlaneGeometry);
 };
 
 VideoPlaneController::VideoPlaneController(
+    const Size& graphics_resolution,
     scoped_refptr<base::SingleThreadTaskRunner> media_task_runner)
     : is_paused_(false),
       have_screen_res_(false),
-      have_graphics_plane_res_(false),
       screen_res_(0, 0),
-      graphics_plane_res_(0, 0),
+      graphics_plane_res_(graphics_resolution),
       have_video_plane_geometry_(false),
       video_plane_display_rect_(0, 0),
       video_plane_transform_(VideoPlane::TRANSFORM_NONE),
       media_task_runner_(media_task_runner),
       video_plane_wrapper_(
           new RateLimitedSetVideoPlaneGeometry(media_task_runner_)) {}
 
 VideoPlaneController::~VideoPlaneController() {}
 
 void VideoPlaneController::SetGeometry(const RectF& display_rect,
@@ skipping 29 matching lines @@
 
   VLOG(1) << "New screen resolution " << resolution.width << "x"
           << resolution.height;
 
   have_screen_res_ = true;
   screen_res_ = resolution;
 
   MaybeRunSetGeometry();
 }
 
-void VideoPlaneController::SetGraphicsPlaneResolution(const Size& resolution) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(ResolutionSizeValid(resolution));
-  if (have_graphics_plane_res_ && SizeEqual(resolution, graphics_plane_res_)) {
-    VLOG(2) << "No change found in graphics plane resolution.";
-    return;
-  }
-
-  VLOG(1) << "New graphics plane resolution " << resolution.width << "x"
-          << resolution.height;
-
-  have_graphics_plane_res_ = true;
-  graphics_plane_res_ = resolution;
-
-  // Any cached video plane geometry parameters are no longer valid since they
-  // were relative to the PREVIOUS graphics plane resolution. Thus, the cached
-  // parameters are cleared, and it's the caller's responsibility to call
-  // SetGeometry() with arguments relative to the NEW graphics plane if needed.
-  ClearVideoPlaneGeometry();
-}
-
 void VideoPlaneController::Pause() {
   DCHECK(thread_checker_.CalledOnValidThread());
   VLOG(1) << "Pausing controller. No more VideoPlane SetGeometry calls.";
   is_paused_ = true;
 }
 
 void VideoPlaneController::Resume() {
   DCHECK(thread_checker_.CalledOnValidThread());
   VLOG(1) << "Resuming controller. VideoPlane SetGeometry calls are active.";
   is_paused_ = false;
@@ skipping 31 matching lines @@
     scaled_rect.height *= sy;
   }
 
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&RateLimitedSetVideoPlaneGeometry::SetGeometry,
                  video_plane_wrapper_, scaled_rect, video_plane_transform_));
 }
 
 bool VideoPlaneController::HaveDataForSetGeometry() const {
-  return have_screen_res_ && have_graphics_plane_res_ &&
-         have_video_plane_geometry_;
+  return have_screen_res_ && have_video_plane_geometry_;
 }
 
 void VideoPlaneController::ClearVideoPlaneGeometry() {
   have_video_plane_geometry_ = false;
   video_plane_display_rect_ = RectF(0, 0);
   video_plane_transform_ = VideoPlane::TRANSFORM_NONE;
 }
 
 }  // namespace media
 }  // namespace chromecast