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

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

Issue 14293008: Remove frame flattening calls from Chromium as it is being removed from Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 months 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
« 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) 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/Platform/chromium/public/WebSize.h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 dns_prefetching_enabled(true), 60 dns_prefetching_enabled(true),
61 local_storage_enabled(false), 61 local_storage_enabled(false),
62 databases_enabled(false), 62 databases_enabled(false),
63 application_cache_enabled(false), 63 application_cache_enabled(false),
64 tabs_to_links(true), 64 tabs_to_links(true),
65 caret_browsing_enabled(false), 65 caret_browsing_enabled(false),
66 hyperlink_auditing_enabled(true), 66 hyperlink_auditing_enabled(true),
67 is_online(true), 67 is_online(true),
68 user_style_sheet_enabled(false), 68 user_style_sheet_enabled(false),
69 author_and_user_styles_enabled(true), 69 author_and_user_styles_enabled(true),
70 frame_flattening_enabled(false),
71 allow_universal_access_from_file_urls(false), 70 allow_universal_access_from_file_urls(false),
72 allow_file_access_from_file_urls(false), 71 allow_file_access_from_file_urls(false),
73 webaudio_enabled(false), 72 webaudio_enabled(false),
74 experimental_webgl_enabled(false), 73 experimental_webgl_enabled(false),
75 flash_3d_enabled(true), 74 flash_3d_enabled(true),
76 flash_stage3d_enabled(false), 75 flash_stage3d_enabled(false),
77 flash_stage3d_baseline_enabled(false), 76 flash_stage3d_baseline_enabled(false),
78 gl_multisampling_enabled(true), 77 gl_multisampling_enabled(true),
79 privileged_webgl_extensions_enabled(false), 78 privileged_webgl_extensions_enabled(false),
80 webgl_errors_to_console_enabled(true), 79 webgl_errors_to_console_enabled(true),
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 settings->setCaretBrowsingEnabled(caret_browsing_enabled); 305 settings->setCaretBrowsingEnabled(caret_browsing_enabled);
307 settings->setHyperlinkAuditingEnabled(hyperlink_auditing_enabled); 306 settings->setHyperlinkAuditingEnabled(hyperlink_auditing_enabled);
308 settings->setCookieEnabled(cookie_enabled); 307 settings->setCookieEnabled(cookie_enabled);
309 308
310 // This setting affects the behavior of links in an editable region: 309 // This setting affects the behavior of links in an editable region:
311 // clicking the link should select it rather than navigate to it. 310 // clicking the link should select it rather than navigate to it.
312 // Safari uses the same default. It is unlikley an embedder would want to 311 // Safari uses the same default. It is unlikley an embedder would want to
313 // change this, since it would break existing rich text editors. 312 // change this, since it would break existing rich text editors.
314 settings->setEditableLinkBehaviorNeverLive(); 313 settings->setEditableLinkBehaviorNeverLive();
315 314
316 settings->setFrameFlatteningEnabled(frame_flattening_enabled);
317
318 settings->setFontRenderingModeNormal(); 315 settings->setFontRenderingModeNormal();
319 settings->setJavaEnabled(java_enabled); 316 settings->setJavaEnabled(java_enabled);
320 317
321 // By default, allow_universal_access_from_file_urls is set to false and thus 318 // By default, allow_universal_access_from_file_urls is set to false and thus
322 // we mitigate attacks from local HTML files by not granting file:// URLs 319 // we mitigate attacks from local HTML files by not granting file:// URLs
323 // universal access. Only test shell will enable this. 320 // universal access. Only test shell will enable this.
324 settings->setAllowUniversalAccessFromFileURLs( 321 settings->setAllowUniversalAccessFromFileURLs(
325 allow_universal_access_from_file_urls); 322 allow_universal_access_from_file_urls);
326 settings->setAllowFileAccessFromFileURLs(allow_file_access_from_file_urls); 323 settings->setAllowFileAccessFromFileURLs(allow_file_access_from_file_urls);
327 324
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 484 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
488 COMPILE_ASSERT_MATCHING_ENUMS( 485 COMPILE_ASSERT_MATCHING_ENUMS(
489 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 486 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
490 COMPILE_ASSERT_MATCHING_ENUMS( 487 COMPILE_ASSERT_MATCHING_ENUMS(
491 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 488 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
492 COMPILE_ASSERT_MATCHING_ENUMS( 489 COMPILE_ASSERT_MATCHING_ENUMS(
493 WebPreferences::EDITING_BEHAVIOR_ANDROID, 490 WebPreferences::EDITING_BEHAVIOR_ANDROID,
494 WebSettings::EditingBehaviorAndroid); 491 WebSettings::EditingBehaviorAndroid);
495 492
496 } // namespace webkit_glue 493 } // namespace webkit_glue
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