Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2311)

Unified Diff: ash/display/display_configuration_controller.cc

Issue 1594683002: Introduce DisplayConfigurationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_576375_display1b1
Patch Set: Rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_configuration_controller.h ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_configuration_controller.cc
diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..beb7bf88c42b64f5dc930273e9e3e158d4a854e7
--- /dev/null
+++ b/ash/display/display_configuration_controller.cc
@@ -0,0 +1,170 @@
+// Copyright 2016 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_configuration_controller.h"
+
+#include "ash/display/display_animator.h"
+#include "ash/display/display_layout.h"
+#include "ash/display/display_manager.h"
+#include "ash/rotator/screen_rotation_animator.h"
+#include "ash/screen_util.h"
+#include "base/time/time.h"
+
+#if defined(OS_CHROMEOS)
+#include "ash/display/display_animator_chromeos.h"
+#include "base/sys_info.h"
+#endif
+
+namespace {
+
+// Specifies how long the display change should have been disabled
+// after each display change operations.
+// |kCycleDisplayThrottleTimeoutMs| is set to be longer to avoid
+// changing the settings while the system is still configurating
+// displays. It will be overriden by |kAfterDisplayChangeThrottleTimeoutMs|
+// when the display change happens, so the actual timeout is much shorter.
+const int64_t kAfterDisplayChangeThrottleTimeoutMs = 500;
+const int64_t kCycleDisplayThrottleTimeoutMs = 4000;
+const int64_t kSetPrimaryDisplayThrottleTimeoutMs = 500;
+
+} // namespace
+
+namespace ash {
+
+class DisplayConfigurationController::DisplayChangeLimiter {
+ public:
+ DisplayChangeLimiter() : throttle_timeout_(base::Time::Now()) {}
+
+ void SetThrottleTimeout(int64_t throttle_ms) {
+ throttle_timeout_ =
+ base::Time::Now() + base::TimeDelta::FromMilliseconds(throttle_ms);
+ }
+
+ bool IsThrottled() const { return base::Time::Now() < throttle_timeout_; }
+
+ private:
+ base::Time throttle_timeout_;
+
+ DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
+};
+
+DisplayConfigurationController::DisplayConfigurationController(
+ DisplayManager* display_manager,
+ WindowTreeHostManager* window_tree_host_manager)
+ : display_manager_(display_manager),
+ window_tree_host_manager_(window_tree_host_manager),
+ weak_ptr_factory_(this) {
+ window_tree_host_manager_->AddObserver(this);
+#if defined(OS_CHROMEOS)
+ if (base::SysInfo::IsRunningOnChromeOS())
+ limiter_.reset(new DisplayChangeLimiter);
+ display_animator_.reset(new DisplayAnimatorChromeOS());
+#endif
+}
+
+DisplayConfigurationController::~DisplayConfigurationController() {
+ window_tree_host_manager_->RemoveObserver(this);
+}
+
+void DisplayConfigurationController::SetDisplayLayout(
+ int64_t display_id,
+ const DisplayLayout& layout,
+ bool user_action) {
+ if (user_action && display_animator_) {
+ display_animator_->StartFadeOutAnimation(
+ base::Bind(&DisplayConfigurationController::SetDisplayLayoutImpl,
+ weak_ptr_factory_.GetWeakPtr(), display_id, layout));
+ } else {
+ SetDisplayLayoutImpl(display_id, layout);
+ }
+}
+
+void DisplayConfigurationController::SetMirrorMode(bool mirror,
+ bool user_action) {
+ if (display_manager_->GetNumDisplays() <= 1 ||
+ display_manager_->IsInMirrorMode() == mirror || IsLimited()) {
+ return;
+ }
+ if (user_action && display_animator_) {
+ display_animator_->StartFadeOutAnimation(
+ base::Bind(&DisplayConfigurationController::SetMirrorModeImpl,
+ weak_ptr_factory_.GetWeakPtr(), mirror));
+ } else {
+ SetMirrorModeImpl(mirror);
+ }
+}
+
+void DisplayConfigurationController::SetDisplayRotation(
+ int64_t display_id,
+ gfx::Display::Rotation rotation,
+ gfx::Display::RotationSource source,
+ bool user_action) {
+ ash::ScreenRotationAnimator screen_rotation_animator(display_id);
+ if (user_action && screen_rotation_animator.CanAnimate())
+ screen_rotation_animator.Rotate(rotation, source);
+ else
+ display_manager_->SetDisplayRotation(display_id, rotation, source);
+}
+
+void DisplayConfigurationController::SetPrimaryDisplayId(int64_t display_id,
+ bool user_action) {
+ if (display_manager_->GetNumDisplays() <= 1 || IsLimited())
+ return;
+
+ if (user_action && display_animator_) {
+ display_animator_->StartFadeOutAnimation(
+ base::Bind(&DisplayConfigurationController::SetPrimaryDisplayIdImpl,
+ weak_ptr_factory_.GetWeakPtr(), display_id));
+ } else {
+ SetPrimaryDisplayIdImpl(display_id);
+ }
+}
+
+void DisplayConfigurationController::OnDisplayConfigurationChanged() {
+ // TODO(oshima): Stop all animations.
+ if (limiter_)
+ limiter_->SetThrottleTimeout(kAfterDisplayChangeThrottleTimeoutMs);
+}
+
+// Protected
+
+void DisplayConfigurationController::ResetAnimatorForTest() {
+ if (!display_animator_)
+ return;
+ display_animator_.reset();
+}
+
+// Private
+
+bool DisplayConfigurationController::IsLimited() {
+ return limiter_ && limiter_->IsThrottled();
+}
+
+void DisplayConfigurationController::SetDisplayLayoutImpl(
+ int64_t display_id,
+ const DisplayLayout& layout) {
+ // TODO(oshima/stevenjb): Add support for 3+ displays.
+ display_manager_->SetLayoutForCurrentDisplays(layout);
+ if (display_animator_)
+ display_animator_->StartFadeInAnimation();
+}
+
+void DisplayConfigurationController::SetMirrorModeImpl(bool mirror) {
+ display_manager_->SetMirrorMode(mirror);
+ if (limiter_)
+ limiter_->SetThrottleTimeout(kCycleDisplayThrottleTimeoutMs);
+ if (display_animator_)
+ display_animator_->StartFadeInAnimation();
+}
+
+void DisplayConfigurationController::SetPrimaryDisplayIdImpl(
+ int64_t display_id) {
+ window_tree_host_manager_->SetPrimaryDisplayId(display_id);
+ if (limiter_)
+ limiter_->SetThrottleTimeout(kSetPrimaryDisplayThrottleTimeoutMs);
+ if (display_animator_)
+ display_animator_->StartFadeInAnimation();
+}
+
+} // namespace ash
« no previous file with comments | « ash/display/display_configuration_controller.h ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698