Index: headless/lib/browser/headless_screen.cc |
diff --git a/headless/lib/browser/headless_screen.cc b/headless/lib/browser/headless_screen.cc |
index 9cc1e4745a56f81b41cc2bd6afd129aa703bd1f2..1d32988580020e55f620f26771c0a5c212b55c92 100644 |
--- a/headless/lib/browser/headless_screen.cc |
+++ b/headless/lib/browser/headless_screen.cc |
@@ -9,8 +9,6 @@ |
#include "base/logging.h" |
#include "ui/aura/env.h" |
#include "ui/aura/window.h" |
-#include "ui/aura/window_event_dispatcher.h" |
-#include "ui/aura/window_tree_host.h" |
#include "ui/base/ime/input_method.h" |
#include "ui/gfx/geometry/rect_conversions.h" |
#include "ui/gfx/geometry/size_conversions.h" |
@@ -18,15 +16,6 @@ |
namespace headless { |
-namespace { |
- |
-bool IsRotationPortrait(display::Display::Rotation rotation) { |
- return rotation == display::Display::ROTATE_90 || |
- rotation == display::Display::ROTATE_270; |
-} |
- |
-} // namespace |
- |
// static |
HeadlessScreen* HeadlessScreen::Create(const gfx::Size& size) { |
return new HeadlessScreen(gfx::Rect(size)); |
@@ -34,101 +23,6 @@ HeadlessScreen* HeadlessScreen::Create(const gfx::Size& size) { |
HeadlessScreen::~HeadlessScreen() {} |
-aura::WindowTreeHost* HeadlessScreen::CreateHostForPrimaryDisplay() { |
- DCHECK(!host_); |
- host_ = aura::WindowTreeHost::Create( |
- gfx::Rect(GetPrimaryDisplay().GetSizeInPixel())); |
- // Some tests don't correctly manage window focus/activation states. |
- // Makes sure InputMethod is default focused so that IME basics can work. |
- host_->GetInputMethod()->OnFocus(); |
- host_->window()->AddObserver(this); |
- host_->InitHost(); |
- host_->window()->Show(); |
- return host_; |
-} |
- |
-void HeadlessScreen::SetDeviceScaleFactor(float device_scale_factor) { |
- display::Display display(GetPrimaryDisplay()); |
- gfx::Rect bounds_in_pixel(display.GetSizeInPixel()); |
- display.SetScaleAndBounds(device_scale_factor, bounds_in_pixel); |
- display_list().UpdateDisplay(display); |
-} |
- |
-void HeadlessScreen::SetDisplayRotation(display::Display::Rotation rotation) { |
- display::Display display(GetPrimaryDisplay()); |
- gfx::Rect bounds_in_pixel(display.GetSizeInPixel()); |
- gfx::Rect new_bounds(bounds_in_pixel); |
- if (IsRotationPortrait(rotation) != IsRotationPortrait(display.rotation())) { |
- new_bounds.set_width(bounds_in_pixel.height()); |
- new_bounds.set_height(bounds_in_pixel.width()); |
- } |
- display.set_rotation(rotation); |
- display.SetScaleAndBounds(display.device_scale_factor(), new_bounds); |
- display_list().UpdateDisplay(display); |
- host_->SetRootTransform(GetRotationTransform() * GetUIScaleTransform()); |
-} |
- |
-void HeadlessScreen::SetUIScale(float ui_scale) { |
- ui_scale_ = ui_scale; |
- display::Display display(GetPrimaryDisplay()); |
- gfx::Rect bounds_in_pixel(display.GetSizeInPixel()); |
- gfx::Rect new_bounds = gfx::ToNearestRect( |
- gfx::ScaleRect(gfx::RectF(bounds_in_pixel), 1.0f / ui_scale)); |
- display.SetScaleAndBounds(display.device_scale_factor(), new_bounds); |
- display_list().UpdateDisplay(display); |
- host_->SetRootTransform(GetRotationTransform() * GetUIScaleTransform()); |
-} |
- |
-void HeadlessScreen::SetWorkAreaInsets(const gfx::Insets& insets) { |
- display::Display display(GetPrimaryDisplay()); |
- display.UpdateWorkAreaFromInsets(insets); |
- display_list().UpdateDisplay(display); |
-} |
- |
-gfx::Transform HeadlessScreen::GetRotationTransform() const { |
- gfx::Transform rotate; |
- display::Display display(GetPrimaryDisplay()); |
- switch (display.rotation()) { |
- case display::Display::ROTATE_0: |
- break; |
- case display::Display::ROTATE_90: |
- rotate.Translate(display.bounds().height(), 0); |
- rotate.Rotate(90); |
- break; |
- case display::Display::ROTATE_270: |
- rotate.Translate(0, display.bounds().width()); |
- rotate.Rotate(270); |
- break; |
- case display::Display::ROTATE_180: |
- rotate.Translate(display.bounds().width(), display.bounds().height()); |
- rotate.Rotate(180); |
- break; |
- } |
- |
- return rotate; |
-} |
- |
-gfx::Transform HeadlessScreen::GetUIScaleTransform() const { |
- gfx::Transform ui_scale; |
- ui_scale.Scale(1.0f / ui_scale_, 1.0f / ui_scale_); |
- return ui_scale; |
-} |
- |
-void HeadlessScreen::OnWindowBoundsChanged(aura::Window* window, |
- const gfx::Rect& old_bounds, |
- const gfx::Rect& new_bounds) { |
- DCHECK_EQ(host_->window(), window); |
- display::Display display(GetPrimaryDisplay()); |
- display.SetSize(gfx::ScaleToFlooredSize(new_bounds.size(), |
- display.device_scale_factor())); |
- display_list().UpdateDisplay(display); |
-} |
- |
-void HeadlessScreen::OnWindowDestroying(aura::Window* window) { |
- if (host_->window() == window) |
- host_ = NULL; |
-} |
- |
gfx::Point HeadlessScreen::GetCursorScreenPoint() { |
return aura::Env::GetInstance()->last_mouse_location(); |
} |
@@ -139,18 +33,15 @@ bool HeadlessScreen::IsWindowUnderCursor(gfx::NativeWindow window) { |
gfx::NativeWindow HeadlessScreen::GetWindowAtScreenPoint( |
const gfx::Point& point) { |
- if (!host_ || !host_->window()) |
- return nullptr; |
- return host_->window()->GetTopWindowContainingPoint(point); |
+ return nullptr; |
} |
display::Display HeadlessScreen::GetDisplayNearestWindow( |
- gfx::NativeWindow window) const { |
+ gfx::NativeView window) const { |
return GetPrimaryDisplay(); |
} |
-HeadlessScreen::HeadlessScreen(const gfx::Rect& screen_bounds) |
- : host_(NULL), ui_scale_(1.0f) { |
+HeadlessScreen::HeadlessScreen(const gfx::Rect& screen_bounds) { |
static int64_t synthesized_display_id = 2000; |
display::Display display(synthesized_display_id++); |
display.SetScaleAndBounds(1.0f, screen_bounds); |