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 "webkit/glue/webpreferences.h" | 5 #include "webkit/glue/webpreferences.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi
er.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi
er.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 flash_3d_enabled(true), | 77 flash_3d_enabled(true), |
78 flash_stage3d_enabled(false), | 78 flash_stage3d_enabled(false), |
79 gl_multisampling_enabled(true), | 79 gl_multisampling_enabled(true), |
80 privileged_webgl_extensions_enabled(false), | 80 privileged_webgl_extensions_enabled(false), |
81 webgl_errors_to_console_enabled(true), | 81 webgl_errors_to_console_enabled(true), |
82 show_composited_layer_borders(false), | 82 show_composited_layer_borders(false), |
83 show_composited_layer_tree(false), | 83 show_composited_layer_tree(false), |
84 show_fps_counter(false), | 84 show_fps_counter(false), |
85 accelerated_compositing_for_overflow_scroll_enabled(false), | 85 accelerated_compositing_for_overflow_scroll_enabled(false), |
86 accelerated_compositing_for_scrollable_frames_enabled(false), | 86 accelerated_compositing_for_scrollable_frames_enabled(false), |
| 87 composited_scrolling_for_frames_enabled(false), |
87 show_paint_rects(false), | 88 show_paint_rects(false), |
88 render_vsync_enabled(true), | 89 render_vsync_enabled(true), |
89 asynchronous_spell_checking_enabled(true), | 90 asynchronous_spell_checking_enabled(true), |
90 unified_textchecker_enabled(false), | 91 unified_textchecker_enabled(false), |
91 accelerated_compositing_enabled(false), | 92 accelerated_compositing_enabled(false), |
92 force_compositing_mode(false), | 93 force_compositing_mode(false), |
93 fixed_position_compositing_enabled(false), | 94 fixed_position_compositing_enabled(false), |
94 accelerated_compositing_for_3d_transforms_enabled(false), | 95 accelerated_compositing_for_3d_transforms_enabled(false), |
95 accelerated_compositing_for_animation_enabled(false), | 96 accelerated_compositing_for_animation_enabled(false), |
96 accelerated_compositing_for_video_enabled(false), | 97 accelerated_compositing_for_video_enabled(false), |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 | 354 |
354 // Enables accelerated compositing for overflow scroll. | 355 // Enables accelerated compositing for overflow scroll. |
355 settings->setAcceleratedCompositingForOverflowScrollEnabled( | 356 settings->setAcceleratedCompositingForOverflowScrollEnabled( |
356 accelerated_compositing_for_overflow_scroll_enabled); | 357 accelerated_compositing_for_overflow_scroll_enabled); |
357 | 358 |
358 // Enables accelerated compositing for scrollable frames if requested on | 359 // Enables accelerated compositing for scrollable frames if requested on |
359 // command line. | 360 // command line. |
360 settings->setAcceleratedCompositingForScrollableFramesEnabled( | 361 settings->setAcceleratedCompositingForScrollableFramesEnabled( |
361 accelerated_compositing_for_scrollable_frames_enabled); | 362 accelerated_compositing_for_scrollable_frames_enabled); |
362 | 363 |
| 364 // Enables composited scrolling for frames if requested on command line. |
| 365 settings->setCompositedScrollingForFramesEnabled( |
| 366 composited_scrolling_for_frames_enabled); |
| 367 |
363 // Display the current compositor tree as overlay if requested on | 368 // Display the current compositor tree as overlay if requested on |
364 // the command line | 369 // the command line |
365 settings->setShowPlatformLayerTree(show_composited_layer_tree); | 370 settings->setShowPlatformLayerTree(show_composited_layer_tree); |
366 | 371 |
367 // Display visualization of what has changed on the screen using an | 372 // Display visualization of what has changed on the screen using an |
368 // overlay of rects, if requested on the command line. | 373 // overlay of rects, if requested on the command line. |
369 settings->setShowPaintRects(show_paint_rects); | 374 settings->setShowPaintRects(show_paint_rects); |
370 | 375 |
371 // Set whether to throttle framerate to Vsync. | 376 // Set whether to throttle framerate to Vsync. |
372 settings->setRenderVSyncEnabled(render_vsync_enabled); | 377 settings->setRenderVSyncEnabled(render_vsync_enabled); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 mismatching_enums) | 486 mismatching_enums) |
482 | 487 |
483 COMPILE_ASSERT_MATCHING_ENUMS( | 488 COMPILE_ASSERT_MATCHING_ENUMS( |
484 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 489 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
485 COMPILE_ASSERT_MATCHING_ENUMS( | 490 COMPILE_ASSERT_MATCHING_ENUMS( |
486 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 491 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
487 COMPILE_ASSERT_MATCHING_ENUMS( | 492 COMPILE_ASSERT_MATCHING_ENUMS( |
488 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 493 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
489 | 494 |
490 } // namespace webkit_glue | 495 } // namespace webkit_glue |
OLD | NEW |