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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 #endif | 478 #endif |
479 | 479 |
480 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); | 480 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); |
481 | 481 |
482 prefs.touch_adjustment_enabled = | 482 prefs.touch_adjustment_enabled = |
483 !command_line.HasSwitch(switches::kDisableTouchAdjustment); | 483 !command_line.HasSwitch(switches::kDisableTouchAdjustment); |
484 | 484 |
485 prefs.slimming_paint_v2_enabled = | 485 prefs.slimming_paint_v2_enabled = |
486 command_line.HasSwitch(switches::kEnableSlimmingPaintV2); | 486 command_line.HasSwitch(switches::kEnableSlimmingPaintV2); |
487 | 487 |
| 488 prefs.blink_synchronized_painting_enabled = |
| 489 command_line.HasSwitch(switches::kEnableBlinkSynchronizedPainting); |
| 490 |
488 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) | 491 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
489 bool default_enable_scroll_animator = true; | 492 bool default_enable_scroll_animator = true; |
490 #else | 493 #else |
491 bool default_enable_scroll_animator = false; | 494 bool default_enable_scroll_animator = false; |
492 #endif | 495 #endif |
493 prefs.enable_scroll_animator = default_enable_scroll_animator; | 496 prefs.enable_scroll_animator = default_enable_scroll_animator; |
494 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) | 497 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) |
495 prefs.enable_scroll_animator = true; | 498 prefs.enable_scroll_animator = true; |
496 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) | 499 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) |
497 prefs.enable_scroll_animator = false; | 500 prefs.enable_scroll_animator = false; |
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1408 } else { | 1411 } else { |
1409 render_view_ready_on_process_launch_ = true; | 1412 render_view_ready_on_process_launch_ = true; |
1410 } | 1413 } |
1411 } | 1414 } |
1412 | 1415 |
1413 void RenderViewHostImpl::RenderViewReady() { | 1416 void RenderViewHostImpl::RenderViewReady() { |
1414 delegate_->RenderViewReady(this); | 1417 delegate_->RenderViewReady(this); |
1415 } | 1418 } |
1416 | 1419 |
1417 } // namespace content | 1420 } // namespace content |
OLD | NEW |