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

Side by Side Diff: content/public/common/web_preferences.cc

Issue 791923003: replace COMPILE_ASSERT with static_assert in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixups Created 5 years, 11 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 | « content/common/sandbox_mac.mm ('k') | content/renderer/gpu/stream_texture_host_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/public/common/web_preferences.h" 5 #include "content/public/common/web_preferences.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "third_party/WebKit/public/web/WebSettings.h" 10 #include "third_party/WebKit/public/web/WebSettings.h"
11 #include "third_party/icu/source/common/unicode/uchar.h" 11 #include "third_party/icu/source/common/unicode/uchar.h"
12 12
13 using blink::WebSettings; 13 using blink::WebSettings;
14 14
15 namespace content { 15 namespace content {
16 16
17 // "Zyyy" is the ISO 15924 script code for undetermined script aka Common. 17 // "Zyyy" is the ISO 15924 script code for undetermined script aka Common.
18 const char kCommonScript[] = "Zyyy"; 18 const char kCommonScript[] = "Zyyy";
19 19
20 #define COMPILE_ASSERT_MATCHING_ENUMS(content_name, blink_name) \ 20 #define STATIC_ASSERT_MATCHING_ENUMS(content_name, blink_name) \
21 COMPILE_ASSERT( \ 21 static_assert( \
22 static_cast<int>(content_name) == static_cast<int>(blink_name), \ 22 static_cast<int>(content_name) == static_cast<int>(blink_name), \
23 mismatching_enums) 23 "mismatching enums: " #content_name)
24 24
25 COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_MAC, 25 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_MAC,
26 WebSettings::EditingBehaviorMac); 26 WebSettings::EditingBehaviorMac);
27 COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_WIN, 27 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_WIN,
28 WebSettings::EditingBehaviorWin); 28 WebSettings::EditingBehaviorWin);
29 COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX, 29 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX,
30 WebSettings::EditingBehaviorUnix); 30 WebSettings::EditingBehaviorUnix);
31 COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID, 31 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID,
32 WebSettings::EditingBehaviorAndroid); 32 WebSettings::EditingBehaviorAndroid);
33 33
34 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_DEFAULT, 34 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_DEFAULT,
35 WebSettings::V8CacheOptionsDefault); 35 WebSettings::V8CacheOptionsDefault);
36 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE, 36 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE,
37 WebSettings::V8CacheOptionsParse); 37 WebSettings::V8CacheOptionsParse);
38 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE, 38 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE,
39 WebSettings::V8CacheOptionsCode); 39 WebSettings::V8CacheOptionsCode);
40 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE_COMPRESSED, 40 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE_COMPRESSED,
41 WebSettings::V8CacheOptionsCodeCompressed); 41 WebSettings::V8CacheOptionsCodeCompressed);
42 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE, 42 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE,
43 WebSettings::V8CacheOptionsNone); 43 WebSettings::V8CacheOptionsNone);
44 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE_MEMORY, 44 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE_MEMORY,
45 WebSettings::V8CacheOptionsParseMemory); 45 WebSettings::V8CacheOptionsParseMemory);
46 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS, 46 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS,
47 WebSettings::V8CacheOptionsHeuristics); 47 WebSettings::V8CacheOptionsHeuristics);
48 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS_MOBILE, 48 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS_MOBILE,
49 WebSettings::V8CacheOptionsHeuristicsMobile); 49 WebSettings::V8CacheOptionsHeuristicsMobile);
50 COMPILE_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST, 50 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST,
51 WebSettings::V8CacheOptionsHeuristicsMobile); 51 WebSettings::V8CacheOptionsHeuristicsMobile);
52 52
53 COMPILE_ASSERT_MATCHING_ENUMS(V8_SCRIPT_STREAMING_MODE_ALL, 53 STATIC_ASSERT_MATCHING_ENUMS(V8_SCRIPT_STREAMING_MODE_ALL,
54 WebSettings::V8ScriptStreamingModeAll); 54 WebSettings::V8ScriptStreamingModeAll);
55 COMPILE_ASSERT_MATCHING_ENUMS( 55 STATIC_ASSERT_MATCHING_ENUMS(
56 V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER, 56 V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER,
57 WebSettings::V8ScriptStreamingModeOnlyAsyncAndDefer); 57 WebSettings::V8ScriptStreamingModeOnlyAsyncAndDefer);
58 COMPILE_ASSERT_MATCHING_ENUMS( 58 STATIC_ASSERT_MATCHING_ENUMS(
59 V8_SCRIPT_STREAMING_MODE_ALL_PLUS_BLOCK_PARSER_BLOCKING, 59 V8_SCRIPT_STREAMING_MODE_ALL_PLUS_BLOCK_PARSER_BLOCKING,
60 WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking); 60 WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking);
61 COMPILE_ASSERT_MATCHING_ENUMS( 61 STATIC_ASSERT_MATCHING_ENUMS(
62 V8_SCRIPT_STREAMING_MODE_LAST, 62 V8_SCRIPT_STREAMING_MODE_LAST,
63 WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking); 63 WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking);
64 64
65 COMPILE_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_NONE, 65 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_NONE,
66 WebSettings::PointerTypeNone); 66 WebSettings::PointerTypeNone);
67 COMPILE_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_COARSE, 67 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_COARSE,
68 WebSettings::PointerTypeCoarse); 68 WebSettings::PointerTypeCoarse);
69 COMPILE_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_FINE, 69 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_FINE,
70 WebSettings::PointerTypeFine); 70 WebSettings::PointerTypeFine);
71 71
72 COMPILE_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_NONE, 72 STATIC_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_NONE,
73 WebSettings::HoverTypeNone); 73 WebSettings::HoverTypeNone);
74 COMPILE_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_ON_DEMAND, 74 STATIC_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_ON_DEMAND,
75 WebSettings::HoverTypeOnDemand); 75 WebSettings::HoverTypeOnDemand);
76 COMPILE_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_HOVER, 76 STATIC_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_HOVER,
77 WebSettings::HoverTypeHover); 77 WebSettings::HoverTypeHover);
78 78
79 WebPreferences::WebPreferences() 79 WebPreferences::WebPreferences()
80 : default_font_size(16), 80 : default_font_size(16),
81 default_fixed_font_size(13), 81 default_fixed_font_size(13),
82 minimum_font_size(0), 82 minimum_font_size(0),
83 minimum_logical_font_size(6), 83 minimum_logical_font_size(6),
84 default_encoding("ISO-8859-1"), 84 default_encoding("ISO-8859-1"),
85 javascript_enabled(true), 85 javascript_enabled(true),
86 web_security_enabled(true), 86 web_security_enabled(true),
87 javascript_can_open_windows_automatically(true), 87 javascript_can_open_windows_automatically(true),
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script"); 217 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
218 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact"); 218 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
219 pictograph_font_family_map[kCommonScript] = 219 pictograph_font_family_map[kCommonScript] =
220 base::ASCIIToUTF16("Times New Roman"); 220 base::ASCIIToUTF16("Times New Roman");
221 } 221 }
222 222
223 WebPreferences::~WebPreferences() { 223 WebPreferences::~WebPreferences() {
224 } 224 }
225 225
226 } // namespace content 226 } // namespace content
OLDNEW
« no previous file with comments | « content/common/sandbox_mac.mm ('k') | content/renderer/gpu/stream_texture_host_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698