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

Side by Side Diff: content/shell/renderer/layout_test/blink_test_helpers.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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
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 "content/shell/renderer/layout_test/blink_test_helpers.h" 5 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 18 matching lines...) Expand all
29 to->default_encoding = from.default_text_encoding_name.utf8().data(); 29 to->default_encoding = from.default_text_encoding_name.utf8().data();
30 to->javascript_enabled = from.java_script_enabled; 30 to->javascript_enabled = from.java_script_enabled;
31 to->supports_multiple_windows = from.supports_multiple_windows; 31 to->supports_multiple_windows = from.supports_multiple_windows;
32 to->loads_images_automatically = from.loads_images_automatically; 32 to->loads_images_automatically = from.loads_images_automatically;
33 to->plugins_enabled = from.plugins_enabled; 33 to->plugins_enabled = from.plugins_enabled;
34 to->tabs_to_links = from.tabs_to_links; 34 to->tabs_to_links = from.tabs_to_links;
35 to->experimental_webgl_enabled = from.experimental_webgl_enabled; 35 to->experimental_webgl_enabled = from.experimental_webgl_enabled;
36 // experimentalCSSRegionsEnabled is deprecated and ignored. 36 // experimentalCSSRegionsEnabled is deprecated and ignored.
37 to->hyperlink_auditing_enabled = from.hyperlink_auditing_enabled; 37 to->hyperlink_auditing_enabled = from.hyperlink_auditing_enabled;
38 to->caret_browsing_enabled = from.caret_browsing_enabled; 38 to->caret_browsing_enabled = from.caret_browsing_enabled;
39 to->allow_displaying_insecure_content =
40 from.allow_display_of_insecure_content;
41 to->allow_running_insecure_content = from.allow_running_of_insecure_content; 39 to->allow_running_insecure_content = from.allow_running_of_insecure_content;
42 to->should_respect_image_orientation = from.should_respect_image_orientation; 40 to->should_respect_image_orientation = from.should_respect_image_orientation;
43 to->allow_file_access_from_file_urls = from.allow_file_access_from_file_urls; 41 to->allow_file_access_from_file_urls = from.allow_file_access_from_file_urls;
44 to->javascript_can_open_windows_automatically = 42 to->javascript_can_open_windows_automatically =
45 from.java_script_can_open_windows_automatically; 43 from.java_script_can_open_windows_automatically;
46 to->web_security_enabled = 44 to->web_security_enabled =
47 from.web_security_enabled; 45 from.web_security_enabled;
48 to->disable_reading_from_canvas = from.disable_reading_from_canvas; 46 to->disable_reading_from_canvas = from.disable_reading_from_canvas;
49 to->strict_mixed_content_checking = 47 to->strict_mixed_content_checking =
50 from.strict_mixed_content_checking; 48 from.strict_mixed_content_checking;
(...skipping 14 matching lines...) Expand all
65 prefs->xslt_enabled = true; 63 prefs->xslt_enabled = true;
66 prefs->xss_auditor_enabled = false; 64 prefs->xss_auditor_enabled = false;
67 #if defined(OS_MACOSX) 65 #if defined(OS_MACOSX)
68 prefs->editing_behavior = EDITING_BEHAVIOR_MAC; 66 prefs->editing_behavior = EDITING_BEHAVIOR_MAC;
69 #else 67 #else
70 prefs->editing_behavior = EDITING_BEHAVIOR_WIN; 68 prefs->editing_behavior = EDITING_BEHAVIOR_WIN;
71 #endif 69 #endif
72 prefs->application_cache_enabled = true; 70 prefs->application_cache_enabled = true;
73 prefs->tabs_to_links = false; 71 prefs->tabs_to_links = false;
74 prefs->hyperlink_auditing_enabled = false; 72 prefs->hyperlink_auditing_enabled = false;
75 prefs->allow_displaying_insecure_content = true;
76 prefs->allow_running_insecure_content = false; 73 prefs->allow_running_insecure_content = false;
77 prefs->disable_reading_from_canvas = false; 74 prefs->disable_reading_from_canvas = false;
78 prefs->strict_mixed_content_checking = false; 75 prefs->strict_mixed_content_checking = false;
79 prefs->strict_powerful_feature_restrictions = false; 76 prefs->strict_powerful_feature_restrictions = false;
80 prefs->webgl_errors_to_console_enabled = false; 77 prefs->webgl_errors_to_console_enabled = false;
81 base::string16 serif; 78 base::string16 serif;
82 #if defined(OS_MACOSX) 79 #if defined(OS_MACOSX)
83 prefs->cursive_font_family_map[kCommonScript] = 80 prefs->cursive_font_family_map[kCommonScript] =
84 base::ASCIIToUTF16("Apple Chancery"); 81 base::ASCIIToUTF16("Apple Chancery");
85 prefs->fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Papyrus"); 82 prefs->fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Papyrus");
(...skipping 23 matching lines...) Expand all
109 prefs->default_maximum_page_scale_factor = 4.f; 106 prefs->default_maximum_page_scale_factor = 4.f;
110 } 107 }
111 108
112 base::FilePath GetWebKitRootDirFilePath() { 109 base::FilePath GetWebKitRootDirFilePath() {
113 base::FilePath base_path; 110 base::FilePath base_path;
114 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 111 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
115 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")); 112 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
116 } 113 }
117 114
118 } // namespace content 115 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/LayoutTests/http/tests/fetch/resources/init.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698