| Index: content/public/common/web_preferences.cc
|
| diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc
|
| index 480ed69b994349c0a17cbc0fb296a08be3320482..dce7c521280a953985610fb3355d490208cf950f 100644
|
| --- a/content/public/common/web_preferences.cc
|
| +++ b/content/public/common/web_preferences.cc
|
| @@ -31,33 +31,20 @@ STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX,
|
| STATIC_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID,
|
| WebSettings::EditingBehaviorAndroid);
|
|
|
| +// This change has both Chrome + blink components. The #if-guard allows us
|
| +// to do this in two steps.
|
| +#ifdef CLEANUP_V8_CACHE_OPTIONS_GUARD
|
| STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_DEFAULT,
|
| WebSettings::V8CacheOptionsDefault);
|
| +STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE,
|
| + WebSettings::V8CacheOptionsNone);
|
| STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE,
|
| WebSettings::V8CacheOptionsParse);
|
| STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE,
|
| WebSettings::V8CacheOptionsCode);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_CODE_COMPRESSED,
|
| - WebSettings::V8CacheOptionsCodeCompressed);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_NONE,
|
| - WebSettings::V8CacheOptionsNone);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_PARSE_MEMORY,
|
| - WebSettings::V8CacheOptionsParseMemory);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS,
|
| - WebSettings::V8CacheOptionsHeuristics);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS_MOBILE,
|
| - WebSettings::V8CacheOptionsHeuristicsMobile);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_HEURISTICS_DEFAULT,
|
| - WebSettings::V8CacheOptionsHeuristicsDefault);
|
| -STATIC_ASSERT_MATCHING_ENUMS(
|
| - V8_CACHE_OPTIONS_HEURISTICS_DEFAULT_MOBILE,
|
| - WebSettings::V8CacheOptionsHeuristicsDefaultMobile);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_RECENT,
|
| - WebSettings::V8CacheOptionsRecent);
|
| -STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_RECENT_SMALL,
|
| - WebSettings::V8CacheOptionsRecentSmall);
|
| STATIC_ASSERT_MATCHING_ENUMS(V8_CACHE_OPTIONS_LAST,
|
| - WebSettings::V8CacheOptionsRecentSmall);
|
| + WebSettings::V8CacheOptionsCode);
|
| +#endif // CLEANUP_V8_CACHE_OPTIONS_GUARD
|
|
|
| STATIC_ASSERT_MATCHING_ENUMS(IMAGE_ANIMATION_POLICY_ALLOWED,
|
| WebSettings::ImageAnimationPolicyAllowed);
|
|
|