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

Unified Diff: ui/aura/root_window.cc

Issue 10310067: Remove ui-enable-dip option (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 7 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 | « ui/aura/monitor_change_observer_x11.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index e6797dcd024fa26ceb2e6e6fe40a9336e38d2018..b29e4d73092556764671ad5cad9282a31b7bfcc5 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -280,14 +280,10 @@ bool RootWindow::DispatchKeyEvent(KeyEvent* event) {
bool RootWindow::DispatchScrollEvent(ScrollEvent* event) {
DispatchHeldMouseMove();
- if (ui::IsDIPEnabled()) {
- float scale = ui::GetDeviceScaleFactor(layer());
- ui::Transform transform = layer()->transform();
- transform.ConcatScale(scale, scale);
- event->UpdateForRootTransform(transform);
- } else {
- event->UpdateForRootTransform(layer()->transform());
- }
+ float scale = ui::GetDeviceScaleFactor(layer());
+ ui::Transform transform = layer()->transform();
+ transform.ConcatScale(scale, scale);
+ event->UpdateForRootTransform(transform);
last_mouse_location_ = event->location();
synthesize_mouse_move_ = false;
@@ -311,14 +307,10 @@ bool RootWindow::DispatchScrollEvent(ScrollEvent* event) {
bool RootWindow::DispatchTouchEvent(TouchEvent* event) {
DispatchHeldMouseMove();
- if (ui::IsDIPEnabled()) {
- float scale = ui::GetDeviceScaleFactor(layer());
- ui::Transform transform = layer()->transform();
- transform.ConcatScale(scale, scale);
- event->UpdateForRootTransform(transform);
- } else {
- event->UpdateForRootTransform(layer()->transform());
- }
+ float scale = ui::GetDeviceScaleFactor(layer());
+ ui::Transform transform = layer()->transform();
+ transform.ConcatScale(scale, scale);
+ event->UpdateForRootTransform(transform);
bool handled = false;
ui::TouchStatus status = ui::TOUCH_STATUS_UNKNOWN;
Window* target = capture_window_;
@@ -934,14 +926,10 @@ bool RootWindow::IsFocusedWindow(const Window* window) const {
}
bool RootWindow::DispatchMouseEventImpl(MouseEvent* event) {
- if (ui::IsDIPEnabled()) {
- float scale = ui::GetDeviceScaleFactor(layer());
- ui::Transform transform = layer()->transform();
- transform.ConcatScale(scale, scale);
- event->UpdateForRootTransform(transform);
- } else {
- event->UpdateForRootTransform(layer()->transform());
- }
+ float scale = ui::GetDeviceScaleFactor(layer());
+ ui::Transform transform = layer()->transform();
+ transform.ConcatScale(scale, scale);
+ event->UpdateForRootTransform(transform);
Window* target =
mouse_pressed_handler_ ? mouse_pressed_handler_ : capture_window_;
if (!target)
« no previous file with comments | « ui/aura/monitor_change_observer_x11.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698