Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 8554002: Added a switch to enable a unified text checker and asynchronous (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 allow_universal_access_from_file_urls(false), 68 allow_universal_access_from_file_urls(false),
69 allow_file_access_from_file_urls(false), 69 allow_file_access_from_file_urls(false),
70 webaudio_enabled(false), 70 webaudio_enabled(false),
71 experimental_webgl_enabled(false), 71 experimental_webgl_enabled(false),
72 gl_multisampling_enabled(true), 72 gl_multisampling_enabled(true),
73 privileged_webgl_extensions_enabled(false), 73 privileged_webgl_extensions_enabled(false),
74 show_composited_layer_borders(false), 74 show_composited_layer_borders(false),
75 show_composited_layer_tree(false), 75 show_composited_layer_tree(false),
76 show_fps_counter(false), 76 show_fps_counter(false),
77 asynchronous_spell_checking_enabled(true), 77 asynchronous_spell_checking_enabled(true),
78 unified_textchecker_enabled(false),
78 accelerated_compositing_enabled(false), 79 accelerated_compositing_enabled(false),
79 threaded_compositing_enabled(false), 80 threaded_compositing_enabled(false),
80 force_compositing_mode(false), 81 force_compositing_mode(false),
81 allow_webui_compositing(false), 82 allow_webui_compositing(false),
82 composite_to_texture_enabled(false), 83 composite_to_texture_enabled(false),
83 fixed_position_compositing_enabled(false), 84 fixed_position_compositing_enabled(false),
84 accelerated_layers_enabled(false), 85 accelerated_layers_enabled(false),
85 accelerated_video_enabled(false), 86 accelerated_video_enabled(false),
86 accelerated_2d_canvas_enabled(false), 87 accelerated_2d_canvas_enabled(false),
87 accelerated_drawing_enabled(false), 88 accelerated_drawing_enabled(false),
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 296
296 // WebGL and accelerated 2D canvas are always gpu composited. 297 // WebGL and accelerated 2D canvas are always gpu composited.
297 settings->setAcceleratedCompositingForCanvasEnabled( 298 settings->setAcceleratedCompositingForCanvasEnabled(
298 experimental_webgl_enabled || accelerated_2d_canvas_enabled); 299 experimental_webgl_enabled || accelerated_2d_canvas_enabled);
299 300
300 // Enable memory info reporting to page if requested on the command line. 301 // Enable memory info reporting to page if requested on the command line.
301 settings->setMemoryInfoEnabled(memory_info_enabled); 302 settings->setMemoryInfoEnabled(memory_info_enabled);
302 303
303 settings->setAsynchronousSpellCheckingEnabled( 304 settings->setAsynchronousSpellCheckingEnabled(
304 asynchronous_spell_checking_enabled); 305 asynchronous_spell_checking_enabled);
306 settings->setUnifiedTextCheckerEnabled(unified_textchecker_enabled);
305 307
306 for (WebInspectorPreferences::const_iterator it = inspector_settings.begin(); 308 for (WebInspectorPreferences::const_iterator it = inspector_settings.begin();
307 it != inspector_settings.end(); ++it) 309 it != inspector_settings.end(); ++it)
308 web_view->setInspectorSetting(WebString::fromUTF8(it->first), 310 web_view->setInspectorSetting(WebString::fromUTF8(it->first),
309 WebString::fromUTF8(it->second)); 311 WebString::fromUTF8(it->second));
310 312
311 // Tabs to link is not part of the settings. WebCore calls 313 // Tabs to link is not part of the settings. WebCore calls
312 // ChromeClient::tabsToLinks which is part of the glue code. 314 // ChromeClient::tabsToLinks which is part of the glue code.
313 web_view->setTabsToLinks(tabs_to_links); 315 web_view->setTabsToLinks(tabs_to_links);
314 316
315 settings->setInteractiveFormValidationEnabled( 317 settings->setInteractiveFormValidationEnabled(
316 interactive_form_validation_enabled); 318 interactive_form_validation_enabled);
317 319
318 settings->setFullScreenEnabled(fullscreen_enabled); 320 settings->setFullScreenEnabled(fullscreen_enabled);
319 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); 321 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
320 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); 322 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
321 settings->setShouldPrintBackgrounds(should_print_backgrounds); 323 settings->setShouldPrintBackgrounds(should_print_backgrounds);
322 settings->setEnableScrollAnimator(enable_scroll_animator); 324 settings->setEnableScrollAnimator(enable_scroll_animator);
323 settings->setHixie76WebSocketProtocolEnabled( 325 settings->setHixie76WebSocketProtocolEnabled(
324 hixie76_websocket_protocol_enabled); 326 hixie76_websocket_protocol_enabled);
325 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 327 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
326 328
327 WebNetworkStateNotifier::setOnLine(is_online); 329 WebNetworkStateNotifier::setOnLine(is_online);
328 } 330 }
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698