Set scale/orientation property to aura root window

ash/display/display_controller.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 "ash/display/display_controller.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/json/json_value_converter.h"
+#include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
@@ skipping 67 matching lines @@
     case DisplayLayout::LEFT:
       return std::string("left");
   }
   return std::string("unknown");
 }
 
 internal::DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
+// Native window property (Atom in X11) that specifies
+// the display's rotation and scale factor.
+// The value of the rotation is one of 0=(normal)
+// 1=(90 degree clock wise), 2=(180 degree) or 3=(270 degree).
+// The value of the scale factor is in percent (100, 140, 200 etc).
+const char kRotationProp[] = "CHROME_DISPLAY_ROTATION";

[Daniel Erat, 2013/01/30 21:04:27]

either move these to the top of the file or into the method that uses them

they should also start with underscores, e.g. _CHROME_DISPLAY_ROTATION.  if we
have other custom atoms, they should also start with underscores -- see
http://tronche.com/gui/x/icccm/sec-1.html#s-1.2.3 ("The protocol specification
recommends that atoms used for private vendor-specific reasons should begin with
an underscore.")

[oshima, 2013/01/30 23:45:53]

Done.

+const char kScaleFactorProp[] = "CHROME_DISPLAY_SCALE_FACTOR";
+
+void SetDisplayPropertiesToHostWindow(aura::RootWindow* root,

[Daniel Erat, 2013/01/30 21:04:27]

nit: s/To/On/

[oshima, 2013/01/30 23:45:53]

Done.

+                                    const gfx::Display& display) {

[Daniel Erat, 2013/01/30 21:04:27]

nit: fix indenting

[oshima, 2013/01/30 23:45:53]

Done.

+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  int rotation = 0;
+  if (command_line->HasSwitch(switches::kAshOverrideDisplayOrientation)) {
+    std::string value = command_line->
+        GetSwitchValueASCII(switches::kAshOverrideDisplayOrientation);
+    DCHECK(base::StringToInt(value, &rotation));
+    DCHECK(0 <= rotation && rotation <= 3) << "Invalid rotation value="
+                                           << rotation;
+    if (rotation < 0 || rotation > 3)
+      rotation = 0;
+  }
+  root->SetHostWindowProperty(kRotationProp, rotation);
+  root->SetHostWindowProperty(kScaleFactorProp,
+                              100 * display.device_scale_factor());
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayLayout
 
 DisplayLayout::DisplayLayout()
     : position(RIGHT),
       offset(0) {}
 
 DisplayLayout::DisplayLayout(DisplayLayout::Position position, int offset)
@@ skipping 153 matching lines @@
         primary_candidate = display;
         break;
       } else if (display->bounds_in_pixel().y() < y) {
         primary_candidate = display;
         y = display->bounds_in_pixel().y();
       }
     }
   }
 #endif
   primary_display_id = primary_candidate->id();
-  aura::RootWindow* root = AddRootWindowForDisplay(*primary_candidate);
-  root->SetHostBounds(primary_candidate->bounds_in_pixel());

[oshima, 2013/01/29 21:20:38]

the bound is already set in AddRootWnidowForDisplay, so this wasn't necessary.

+  AddRootWindowForDisplay(*primary_candidate);
   UpdateDisplayBoundsForLayout();
 }
 
 void DisplayController::InitSecondaryDisplays() {
   internal::DisplayManager* display_manager = GetDisplayManager();
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     const gfx::Display* display = display_manager->GetDisplayAt(i);
     if (primary_display_id != display->id()) {
       aura::RootWindow* root = AddRootWindowForDisplay(*display);
       Shell::GetInstance()->InitRootWindowForSecondaryDisplay(root);
@@ skipping 242 matching lines @@
   return display_manager->GetDisplayAt(0)->id() == primary_display_id ?
       display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);
 }
 
 void DisplayController::OnDisplayBoundsChanged(const gfx::Display& display) {
   if (limiter_.get())
     limiter_->SetThrottleTimeout(kAfterDisplayChangeThrottleTimeoutMs);
 
   NotifyDisplayConfigurationChanging();
   UpdateDisplayBoundsForLayout();
-  root_windows_[display.id()]->SetHostBounds(display.bounds_in_pixel());
+  aura::RootWindow* root = root_windows_[display.id()];
+  SetDisplayPropertiesToHostWindow(root, display);
+  root->SetHostBounds(display.bounds_in_pixel());
 }
 
 void DisplayController::OnDisplayAdded(const gfx::Display& display) {
   if (limiter_.get())
     limiter_->SetThrottleTimeout(kAfterDisplayChangeThrottleTimeoutMs);
 
   NotifyDisplayConfigurationChanging();
   if (primary_root_window_for_replace_) {
     DCHECK(root_windows_.empty());
     primary_display_id = display.id();
@@ skipping 58 matching lines @@
   // root window itself yet because the stack may be using it.
   controller->Shutdown();
   MessageLoop::current()->DeleteSoon(FROM_HERE, controller);
 }
 
 aura::RootWindow* DisplayController::AddRootWindowForDisplay(
     const gfx::Display& display) {
   aura::RootWindow* root =
       GetDisplayManager()->CreateRootWindowForDisplay(display);
   root_windows_[display.id()] = root;
+  SetDisplayPropertiesToHostWindow(root, display);
 
 #if defined(OS_CHROMEOS)
   static bool force_constrain_pointer_to_root =
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshConstrainPointerToRoot);
   if (base::chromeos::IsRunningOnChromeOS() || force_constrain_pointer_to_root)
     root->ConfineCursorToWindow();
 #endif
   return root;
 }
@@ skipping 44 matching lines @@
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 void DisplayController::NotifyDisplayConfigurationChanging() {
   FOR_EACH_OBSERVER(Observer, observers_, OnDisplayConfigurationChanging());
 }
 
 }  // namespace ash