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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 flash_3d_enabled(true), | 78 flash_3d_enabled(true), |
79 flash_stage3d_enabled(false), | 79 flash_stage3d_enabled(false), |
80 gl_multisampling_enabled(true), | 80 gl_multisampling_enabled(true), |
81 privileged_webgl_extensions_enabled(false), | 81 privileged_webgl_extensions_enabled(false), |
82 webgl_errors_to_console_enabled(true), | 82 webgl_errors_to_console_enabled(true), |
83 show_composited_layer_borders(false), | 83 show_composited_layer_borders(false), |
84 show_composited_layer_tree(false), | 84 show_composited_layer_tree(false), |
85 show_fps_counter(false), | 85 show_fps_counter(false), |
86 accelerated_compositing_for_overflow_scroll_enabled(false), | 86 accelerated_compositing_for_overflow_scroll_enabled(false), |
87 accelerated_compositing_for_scrollable_frames_enabled(false), | 87 accelerated_compositing_for_scrollable_frames_enabled(false), |
| 88 composited_scrolling_for_frames_enabled(false), |
88 show_paint_rects(false), | 89 show_paint_rects(false), |
89 render_vsync_enabled(true), | 90 render_vsync_enabled(true), |
90 asynchronous_spell_checking_enabled(true), | 91 asynchronous_spell_checking_enabled(true), |
91 unified_textchecker_enabled(false), | 92 unified_textchecker_enabled(false), |
92 accelerated_compositing_enabled(false), | 93 accelerated_compositing_enabled(false), |
93 force_compositing_mode(false), | 94 force_compositing_mode(false), |
94 fixed_position_compositing_enabled(false), | 95 fixed_position_compositing_enabled(false), |
95 accelerated_compositing_for_3d_transforms_enabled(false), | 96 accelerated_compositing_for_3d_transforms_enabled(false), |
96 accelerated_compositing_for_animation_enabled(false), | 97 accelerated_compositing_for_animation_enabled(false), |
97 accelerated_compositing_for_video_enabled(false), | 98 accelerated_compositing_for_video_enabled(false), |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 | 358 |
358 // Enables accelerated compositing for overflow scroll. | 359 // Enables accelerated compositing for overflow scroll. |
359 settings->setAcceleratedCompositingForOverflowScrollEnabled( | 360 settings->setAcceleratedCompositingForOverflowScrollEnabled( |
360 accelerated_compositing_for_overflow_scroll_enabled); | 361 accelerated_compositing_for_overflow_scroll_enabled); |
361 | 362 |
362 // Enables accelerated compositing for scrollable frames if requested on | 363 // Enables accelerated compositing for scrollable frames if requested on |
363 // command line. | 364 // command line. |
364 settings->setAcceleratedCompositingForScrollableFramesEnabled( | 365 settings->setAcceleratedCompositingForScrollableFramesEnabled( |
365 accelerated_compositing_for_scrollable_frames_enabled); | 366 accelerated_compositing_for_scrollable_frames_enabled); |
366 | 367 |
| 368 // Enables composited scrolling for frames if requested on command line. |
| 369 settings->setCompositedScrollingForFramesEnabled( |
| 370 composited_scrolling_for_frames_enabled); |
| 371 |
367 // Display the current compositor tree as overlay if requested on | 372 // Display the current compositor tree as overlay if requested on |
368 // the command line | 373 // the command line |
369 settings->setShowPlatformLayerTree(show_composited_layer_tree); | 374 settings->setShowPlatformLayerTree(show_composited_layer_tree); |
370 | 375 |
371 // Display visualization of what has changed on the screen using an | 376 // Display visualization of what has changed on the screen using an |
372 // overlay of rects, if requested on the command line. | 377 // overlay of rects, if requested on the command line. |
373 settings->setShowPaintRects(show_paint_rects); | 378 settings->setShowPaintRects(show_paint_rects); |
374 | 379 |
375 // Set whether to throttle framerate to Vsync. | 380 // Set whether to throttle framerate to Vsync. |
376 settings->setRenderVSyncEnabled(render_vsync_enabled); | 381 settings->setRenderVSyncEnabled(render_vsync_enabled); |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 mismatching_enums) | 495 mismatching_enums) |
491 | 496 |
492 COMPILE_ASSERT_MATCHING_ENUMS( | 497 COMPILE_ASSERT_MATCHING_ENUMS( |
493 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 498 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
494 COMPILE_ASSERT_MATCHING_ENUMS( | 499 COMPILE_ASSERT_MATCHING_ENUMS( |
495 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 500 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
496 COMPILE_ASSERT_MATCHING_ENUMS( | 501 COMPILE_ASSERT_MATCHING_ENUMS( |
497 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 502 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
498 | 503 |
499 } // namespace webkit_glue | 504 } // namespace webkit_glue |
OLD | NEW |