[Chromecast] Handle device scale factor correctly

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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/browser/cast_browser_main_parts.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
@@ skipping 27 matching lines @@
 #include "chromecast/browser/url_request_context_factory.h"
 #include "chromecast/chromecast_features.h"
 #include "chromecast/common/platform_client_auth.h"
 #include "chromecast/media/base/key_systems_common.h"
 #include "chromecast/media/base/media_resource_tracker.h"
 #include "chromecast/media/base/video_plane_controller.h"
 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h"
 #include "chromecast/net/connectivity_checker.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/cast_sys_info.h"
+#include "chromecast/public/graphics_properties_shlib.h"
 #include "chromecast/service/cast_service.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "media/base/media.h"
 #include "ui/compositor/compositor_switches.h"
@@ skipping 302 matching lines @@
 
   // Set GL strings so GPU config code can make correct feature blacklisting/
   // whitelisting decisions.
   // Note: SetGLStrings can be called before GpuDataManager::Initialize.
   std::unique_ptr<CastSysInfo> sys_info = CreateSysInfo();
   content::GpuDataManager::GetInstance()->SetGLStrings(
       sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
       sys_info->GetGlVersion());
 #endif
 
 #if defined(USE_AURA)

[alokp, 2016/05/12 21:35:16]

nit: move the logic to determine display size into a function

[halliwell, 2016/05/13 23:48:03]

Done (also moved it into CastScreen source file).

-  // Screen can (and should) exist even with no displays connected. Its presence
-  // is assumed as an interface to access display information, e.g. from metrics
-  // code.  See CastContentWindow::CreateWindowTree for update when resolution
-  // is available.
-  cast_browser_process_->SetCastScreen(base::WrapUnique(new CastScreen));
+  gfx::Size display_size(1280, 720);

[alokp, 2016/05/12 21:35:16]

nit: make this more explicit by defining a kDefaultDisplaySize here or at the
top of this file.

[halliwell, 2016/05/13 23:48:03]

no need now it's in a helper.

+  if (GraphicsPropertiesShlib::IsSupported(
+          GraphicsPropertiesShlib::k1080p,
+          base::CommandLine::ForCurrentProcess()->argv()))

[alokp, 2016/05/12 21:35:16]

nit: braces for multi-line if blocks

[halliwell, 2016/05/13 23:48:03]

Done.

+    display_size = gfx::Size(1920, 1080);
+
+  cast_browser_process_->SetCastScreen(
+      base::WrapUnique(new CastScreen(display_size)));
   DCHECK(!display::Screen::GetScreen());
   display::Screen::SetScreenInstance(cast_browser_process_->cast_screen());
 #endif
 
   content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
       kChromeResourceScheme);
   return 0;
 }
 
 void CastBrowserMainParts::PreMainMessageLoopRun() {
@@ skipping 31 matching lines @@
     LOG(ERROR) << "PlatformClientAuth::Initialize failed.";
 
   cast_browser_process_->SetRemoteDebuggingServer(base::WrapUnique(
       new RemoteDebuggingServer(cast_browser_process_->browser_client()
                                     ->EnableRemoteDebuggingImmediately())));
 
 #if defined(USE_AURA) && !BUILDFLAG(DISABLE_DISPLAY)
   // TODO(halliwell) move audio builds to use ozone_platform_cast, then can
   // simplify this by removing DISABLE_DISPLAY condition.  Should then also
   // assert(ozone_platform_cast) in BUILD.gn where it depends on //ui/ozone.
-  video_plane_controller_.reset(
-      new media::VideoPlaneController(GetMediaTaskRunner()));
-  cast_browser_process_->cast_screen()->SetDisplayResizeCallback(
-      base::Bind(&media::VideoPlaneController::SetGraphicsPlaneResolution,
-                 base::Unretained(video_plane_controller_.get())));
+  gfx::Size display_size =
+      display::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
+  video_plane_controller_.reset(new media::VideoPlaneController(
+      Size(display_size.width(), display_size.height()), GetMediaTaskRunner()));
   ui::OverlayManagerCast::SetOverlayCompositedCallback(
       base::Bind(&media::VideoPlaneController::SetGeometry,
                  base::Unretained(video_plane_controller_.get())));
 #endif
 
   cast_browser_process_->SetCastService(
       cast_browser_process_->browser_client()->CreateCastService(
           cast_browser_process_->browser_context(),
           cast_browser_process_->pref_service(),
           url_request_context_factory_->GetSystemGetter(),
@@ skipping 61 matching lines @@
 void CastBrowserMainParts::PostDestroyThreads() {
 #if !defined(OS_ANDROID)
   media_resource_tracker_->FinalizeAndDestroy();
   media_resource_tracker_ = nullptr;
   media_pipeline_backend_manager_.reset();
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast