OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 ui::IsTouchDevicePresent(); | 453 ui::IsTouchDevicePresent(); |
454 #if defined(OS_ANDROID) | 454 #if defined(OS_ANDROID) |
455 prefs.device_supports_mouse = false; | 455 prefs.device_supports_mouse = false; |
456 #endif | 456 #endif |
457 | 457 |
458 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 458 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
459 | 459 |
460 prefs.touch_adjustment_enabled = | 460 prefs.touch_adjustment_enabled = |
461 !command_line.HasSwitch(switches::kDisableTouchAdjustment); | 461 !command_line.HasSwitch(switches::kDisableTouchAdjustment); |
462 prefs.compositor_touch_hit_testing = | 462 prefs.compositor_touch_hit_testing = |
463 !command_line.HasSwitch( | 463 !command_line.HasSwitch(cc::switches::kDisableCompositorTouchHitTesting); |
464 cc::switches::kDisableCompositorTouchHitTesting) && | |
465 !command_line.HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths); | |
466 | |
467 | 464 |
468 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 465 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
469 bool default_enable_scroll_animator = true; | 466 bool default_enable_scroll_animator = true; |
470 #else | 467 #else |
471 bool default_enable_scroll_animator = false; | 468 bool default_enable_scroll_animator = false; |
472 #endif | 469 #endif |
473 prefs.enable_scroll_animator = default_enable_scroll_animator; | 470 prefs.enable_scroll_animator = default_enable_scroll_animator; |
474 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) | 471 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) |
475 prefs.enable_scroll_animator = true; | 472 prefs.enable_scroll_animator = true; |
476 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) | 473 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) |
(...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1859 return true; | 1856 return true; |
1860 } | 1857 } |
1861 | 1858 |
1862 void RenderViewHostImpl::AttachToFrameTree() { | 1859 void RenderViewHostImpl::AttachToFrameTree() { |
1863 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1860 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1864 | 1861 |
1865 frame_tree->ResetForMainFrameSwap(); | 1862 frame_tree->ResetForMainFrameSwap(); |
1866 } | 1863 } |
1867 | 1864 |
1868 } // namespace content | 1865 } // namespace content |
OLD | NEW |