Reland of Android: support multiple displays on C++ side

content/browser/web_contents/web_contents_view_android.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 "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/drop_data.h"
+#include "ui/android/window_android.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
-// static
-void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
-  const display::Display& display =
-      display::Screen::GetScreen()->GetPrimaryDisplay();
+namespace {
+void DisplayToScreenInfo(const display::Display& display, ScreenInfo* results) {
   results->rect = display.bounds();
   // TODO(husky): Remove any system controls from availableRect.
   results->available_rect = display.work_area();
   results->device_scale_factor = display.device_scale_factor();
   results->orientation_angle = display.RotationAsDegree();
   results->orientation_type =
       RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
   gfx::DeviceDisplayInfo info;
   results->depth = display.color_depth();
   results->depth_per_component = display.depth_per_component();
   results->is_monochrome = display.is_monochrome();
 }
+}
+
+// static
+void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
+  DisplayToScreenInfo(display::Screen::GetScreen()->GetPrimaryDisplay(),
+                      results);
+}
 
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewAndroid* rv = new WebContentsViewAndroid(
       web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
@@ skipping 40 matching lines @@
 
   // TODO(sievers): This should return null.
   return GetNativeView();
 }
 
 gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const {
   return content_view_core_ ? content_view_core_->GetWindowAndroid() : nullptr;
 }
 
 void WebContentsViewAndroid::GetScreenInfo(ScreenInfo* result) const {
-  // ScreenInfo isn't tied to the widget on Android. Always return the default.
-  WebContentsView::GetDefaultScreenInfo(result);
+  // Since API 17 Android supports multiple displays with different properties.
+  ui::WindowAndroid* window =

[mthiesse, 2016/10/26 14:49:49]

I think you could simplify this function to:

DisplayToScreenInfo(display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeView()),
result);

[Tima Vaisburd, 2016/10/27 07:55:58]

Good point! I rewrote this similarly, keeping primary display in case
GetNativeView() returns 0.

+      content_view_core_ ? content_view_core_->GetWindowAndroid() : nullptr;
+
+  if (window)
+    DisplayToScreenInfo(window->GetDisplay(), result);
+  else
+    WebContentsView::GetDefaultScreenInfo(result);
 }
 
 void WebContentsViewAndroid::GetContainerBounds(gfx::Rect* out) const {
   *out = content_view_core_ ? gfx::Rect(content_view_core_->GetViewSize())
                             : gfx::Rect();
 }
 
 void WebContentsViewAndroid::SetPageTitle(const base::string16& title) {
   if (content_view_core_)
     content_view_core_->SetTitle(title);
@@ skipping 201 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content