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

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

Issue 1192323002: Cleanup: Remove experimental V8 cache strategies that we discarded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better comments. Created 5 years, 6 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/public/common/web_preferences.h ('k') | content/renderer/render_view_impl.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"
(...skipping 13 matching lines...) Expand all
24 24
25 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_MAC, 25 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_MAC,
26 WebSettings::EditingBehaviorMac); 26 WebSettings::EditingBehaviorMac);
27 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_WIN, 27 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_WIN,
28 WebSettings::EditingBehaviorWin); 28 WebSettings::EditingBehaviorWin);
29 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX, 29 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX,
30 WebSettings::EditingBehaviorUnix); 30 WebSettings::EditingBehaviorUnix);
31 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID, 31 STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID,
32 WebSettings::EditingBehaviorAndroid); 32 WebSettings::EditingBehaviorAndroid);
33 33
34 // This change has both Chrome + blink components. The #if-guard allows us
35 // to do this in two steps.
36 #ifdef CLEANUP_V8_CACHE_OPTIONS_GUARD
34 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_DEFAULT, 37 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_DEFAULT,
35 WebSettings::V8CacheOptionsDefault); 38 WebSettings::V8CacheOptionsDefault);
39 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE,
40 WebSettings::V8CacheOptionsNone);
36 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE, 41 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE,
37 WebSettings::V8CacheOptionsParse); 42 WebSettings::V8CacheOptionsParse);
38 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE, 43 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE,
39 WebSettings::V8CacheOptionsCode); 44 WebSettings::V8CacheOptionsCode);
40 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE_COMPRESSED,
41 WebSettings::V8CacheOptionsCodeCompressed);
42 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE,
43 WebSettings::V8CacheOptionsNone);
44 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE_MEMORY,
45 WebSettings::V8CacheOptionsParseMemory);
46 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS,
47 WebSettings::V8CacheOptionsHeuristics);
48 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS_MOBILE,
49 WebSettings::V8CacheOptionsHeuristicsMobile);
50 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS_DEFAULT,
51 WebSettings::V8CacheOptionsHeuristicsDefault);
52 STATIC_ASSERT_MATCHING_ENUMS(
53 V8_CACHE_OPTIONS_HEURISTICS_DEFAULT_MOBILE,
54 WebSettings::V8CacheOptionsHeuristicsDefaultMobile);
55 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_RECENT,
56 WebSettings::V8CacheOptionsRecent);
57 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_RECENT_SMALL,
58 WebSettings::V8CacheOptionsRecentSmall);
59 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST, 45 STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST,
60 WebSettings::V8CacheOptionsRecentSmall); 46 WebSettings::V8CacheOptionsCode);
47 #endif // CLEANUP_V8_CACHE_OPTIONS_GUARD
61 48
62 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ALLOWED, 49 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ALLOWED,
63 WebSettings::ImageAnimationPolicyAllowed); 50 WebSettings::ImageAnimationPolicyAllowed);
64 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE, 51 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
65 WebSettings::ImageAnimationPolicyAnimateOnce); 52 WebSettings::ImageAnimationPolicyAnimateOnce);
66 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_NO_ANIMATION, 53 STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_NO_ANIMATION,
67 WebSettings::ImageAnimationPolicyNoAnimation); 54 WebSettings::ImageAnimationPolicyNoAnimation);
68 55
69 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_NONE, 56 STATIC_ASSERT_MATCHING_ENUMS(ui::POINTER_TYPE_NONE,
70 WebSettings::PointerTypeNone); 57 WebSettings::PointerTypeNone);
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script"); 219 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
233 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact"); 220 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
234 pictograph_font_family_map[kCommonScript] = 221 pictograph_font_family_map[kCommonScript] =
235 base::ASCIIToUTF16("Times New Roman"); 222 base::ASCIIToUTF16("Times New Roman");
236 } 223 }
237 224
238 WebPreferences::~WebPreferences() { 225 WebPreferences::~WebPreferences() {
239 } 226 }
240 227
241 } // namespace content 228 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698