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

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

Issue 1676703002: Stop using macros to paste together names for static_asserts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: static-asserts-enums: a,b,#a Created 4 years, 10 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 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/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.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 STATIC_ASSERT_MATCHING_ENUMS(content_name, blink_name) \ 20 #define STATIC_ASSERT_ENUM(a, b) \
21 static_assert( \ 21 static_assert(static_cast<int>(a) == static_cast<int>(b), \
22 static_cast<int>(content_name) == static_cast<int>(blink_name), \ 22 "mismatching enums: " #a)
23 "mismatching enums: " #content_name)
24 23
25 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_MAC, 24 STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
26 WebSettings::EditingBehaviorMac); 25 STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
27 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_WIN, 26 STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
28 WebSettings::EditingBehaviorWin); 27 STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_ANDROID,
29 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX, 28 WebSettings::EditingBehaviorAndroid);
30 WebSettings::EditingBehaviorUnix);
31 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID,
32 WebSettings::EditingBehaviorAndroid);
33 29
34 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_DEFAULT, 30 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_DEFAULT,
35 WebSettings::V8CacheOptionsDefault); 31 WebSettings::V8CacheOptionsDefault);
36 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE, 32 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_NONE, WebSettings::V8CacheOptionsNone);
37 WebSettings::V8CacheOptionsNone); 33 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_PARSE, WebSettings::V8CacheOptionsParse);
38 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE, 34 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE, WebSettings::V8CacheOptionsCode);
39 WebSettings::V8CacheOptionsParse); 35 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_LAST, WebSettings::V8CacheOptionsCode);
40 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE,
41 WebSettings::V8CacheOptionsCode);
42 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST,
43 WebSettings::V8CacheOptionsCode);
44 36
45 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ALLOWED, 37 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ALLOWED,
46 WebSettings::ImageAnimationPolicyAllowed); 38 WebSettings::ImageAnimationPolicyAllowed);
47 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE, 39 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
48 WebSettings::ImageAnimationPolicyAnimateOnce); 40 WebSettings::ImageAnimationPolicyAnimateOnce);
49 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_NO_ANIMATION, 41 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION,
50 WebSettings::ImageAnimationPolicyNoAnimation); 42 WebSettings::ImageAnimationPolicyNoAnimation);
51 43
52 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_NONE, 44 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone);
53 blink::PointerTypeNone); 45 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse);
54 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_COARSE, 46 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine);
55 blink::PointerTypeCoarse);
56 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_FINE,
57 blink::PointerTypeFine);
58 47
59 STATIC_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_NONE, 48 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_NONE, blink::HoverTypeNone);
60 blink::HoverTypeNone); 49 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_ON_DEMAND, blink::HoverTypeOnDemand);
61 STATIC_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_ON_DEMAND, 50 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_HOVER, blink::HoverTypeHover);
62 blink::HoverTypeOnDemand);
63 STATIC_ASSERT_MATCHING_ENUMS(ui::HOVER_TYPE_HOVER,
64 blink::HoverTypeHover);
65 51
66 WebPreferences::WebPreferences() 52 WebPreferences::WebPreferences()
67 : default_font_size(16), 53 : default_font_size(16),
68 default_fixed_font_size(13), 54 default_fixed_font_size(13),
69 minimum_font_size(0), 55 minimum_font_size(0),
70 minimum_logical_font_size(6), 56 minimum_logical_font_size(6),
71 default_encoding("ISO-8859-1"), 57 default_encoding("ISO-8859-1"),
72 #if defined(OS_WIN) 58 #if defined(OS_WIN)
73 context_menu_on_mouse_up(true), 59 context_menu_on_mouse_up(true),
74 #else 60 #else
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script"); 203 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
218 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact"); 204 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
219 pictograph_font_family_map[kCommonScript] = 205 pictograph_font_family_map[kCommonScript] =
220 base::ASCIIToUTF16("Times New Roman"); 206 base::ASCIIToUTF16("Times New Roman");
221 } 207 }
222 208
223 WebPreferences::~WebPreferences() { 209 WebPreferences::~WebPreferences() {
224 } 210 }
225 211
226 } // namespace content 212 } // namespace content
OLDNEW
« no previous file with comments | « content/child/web_url_request_util.cc ('k') | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698