OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <unicode/uchar.h> | 7 #include <unicode/uchar.h> |
8 | 8 |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 allow_universal_access_from_file_urls(false), | 67 allow_universal_access_from_file_urls(false), |
68 allow_file_access_from_file_urls(false), | 68 allow_file_access_from_file_urls(false), |
69 webaudio_enabled(false), | 69 webaudio_enabled(false), |
70 experimental_webgl_enabled(false), | 70 experimental_webgl_enabled(false), |
71 gl_multisampling_enabled(true), | 71 gl_multisampling_enabled(true), |
72 show_composited_layer_borders(false), | 72 show_composited_layer_borders(false), |
73 show_composited_layer_tree(false), | 73 show_composited_layer_tree(false), |
74 show_fps_counter(false), | 74 show_fps_counter(false), |
75 asynchronous_spell_checking_enabled(true), | 75 asynchronous_spell_checking_enabled(true), |
76 accelerated_compositing_enabled(false), | 76 accelerated_compositing_enabled(false), |
| 77 threaded_compositing_enabled(false), |
77 force_compositing_mode(false), | 78 force_compositing_mode(false), |
78 allow_webui_compositing(false), | 79 allow_webui_compositing(false), |
79 composite_to_texture_enabled(false), | 80 composite_to_texture_enabled(false), |
80 accelerated_layers_enabled(false), | 81 accelerated_layers_enabled(false), |
81 accelerated_video_enabled(false), | 82 accelerated_video_enabled(false), |
82 accelerated_2d_canvas_enabled(false), | 83 accelerated_2d_canvas_enabled(false), |
83 accelerated_drawing_enabled(false), | 84 accelerated_drawing_enabled(false), |
84 accelerated_plugins_enabled(false), | 85 accelerated_plugins_enabled(false), |
85 memory_info_enabled(false), | 86 memory_info_enabled(false), |
86 interactive_form_validation_enabled(true), | 87 interactive_form_validation_enabled(true), |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 // Display an FPS indicator if requested on the command line. | 243 // Display an FPS indicator if requested on the command line. |
243 settings->setShowFPSCounter(show_fps_counter); | 244 settings->setShowFPSCounter(show_fps_counter); |
244 | 245 |
245 // Display the current compositor tree as overlay if requested on | 246 // Display the current compositor tree as overlay if requested on |
246 // the command line | 247 // the command line |
247 settings->setShowPlatformLayerTree(show_composited_layer_tree); | 248 settings->setShowPlatformLayerTree(show_composited_layer_tree); |
248 | 249 |
249 // Enable gpu-accelerated compositing if requested on the command line. | 250 // Enable gpu-accelerated compositing if requested on the command line. |
250 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); | 251 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); |
251 | 252 |
| 253 settings->setUseThreadedCompositor(threaded_compositing_enabled); |
| 254 |
252 // Always enter compositing if requested on the command line. | 255 // Always enter compositing if requested on the command line. |
253 settings->setForceCompositingMode(force_compositing_mode); | 256 settings->setForceCompositingMode(force_compositing_mode); |
254 | 257 |
255 // Enable composite to offscreen texture if requested on the command line. | 258 // Enable composite to offscreen texture if requested on the command line. |
256 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); | 259 settings->setCompositeToTextureEnabled(composite_to_texture_enabled); |
257 | 260 |
258 // Enable gpu-accelerated 2d canvas if requested on the command line. | 261 // Enable gpu-accelerated 2d canvas if requested on the command line. |
259 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); | 262 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); |
260 | 263 |
261 // Enable gpu-accelerated drawing if requested on the command line. | 264 // Enable gpu-accelerated drawing if requested on the command line. |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 settings->setFullScreenEnabled(fullscreen_enabled); | 302 settings->setFullScreenEnabled(fullscreen_enabled); |
300 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); | 303 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); |
301 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); | 304 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); |
302 settings->setShouldPrintBackgrounds(should_print_backgrounds); | 305 settings->setShouldPrintBackgrounds(should_print_backgrounds); |
303 settings->setEnableScrollAnimator(enable_scroll_animator); | 306 settings->setEnableScrollAnimator(enable_scroll_animator); |
304 settings->setHixie76WebSocketProtocolEnabled( | 307 settings->setHixie76WebSocketProtocolEnabled( |
305 hixie76_websocket_protocol_enabled); | 308 hixie76_websocket_protocol_enabled); |
306 | 309 |
307 WebNetworkStateNotifier::setOnLine(is_online); | 310 WebNetworkStateNotifier::setOnLine(is_online); |
308 } | 311 } |
OLD | NEW |