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

Side by Side Diff: third_party/WebKit/Source/web/AssertMatchingEnums.cpp

Issue 2679383003: Share schemes needed for CSP between the browser and the renderer. (Closed)
Patch Set: Rebase and fix conflict. Created 3 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 832
833 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::Default, 833 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::Default,
834 V8CacheStrategiesForCacheStorage::Default); 834 V8CacheStrategiesForCacheStorage::Default);
835 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::None, 835 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::None,
836 V8CacheStrategiesForCacheStorage::None); 836 V8CacheStrategiesForCacheStorage::None);
837 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::Normal, 837 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::Normal,
838 V8CacheStrategiesForCacheStorage::Normal); 838 V8CacheStrategiesForCacheStorage::Normal);
839 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::Aggressive, 839 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::Aggressive,
840 V8CacheStrategiesForCacheStorage::Aggressive); 840 V8CacheStrategiesForCacheStorage::Aggressive);
841 841
842 STATIC_ASSERT_ENUM(WebSecurityPolicy::PolicyAreaNone,
843 SchemeRegistry::PolicyAreaNone);
844 STATIC_ASSERT_ENUM(WebSecurityPolicy::PolicyAreaImage,
845 SchemeRegistry::PolicyAreaImage);
846 STATIC_ASSERT_ENUM(WebSecurityPolicy::PolicyAreaStyle,
847 SchemeRegistry::PolicyAreaStyle);
848 STATIC_ASSERT_ENUM(WebSecurityPolicy::PolicyAreaAll,
849 SchemeRegistry::PolicyAreaAll);
850
851 STATIC_ASSERT_ENUM(WebSandboxFlags::None, SandboxNone); 842 STATIC_ASSERT_ENUM(WebSandboxFlags::None, SandboxNone);
852 STATIC_ASSERT_ENUM(WebSandboxFlags::Navigation, SandboxNavigation); 843 STATIC_ASSERT_ENUM(WebSandboxFlags::Navigation, SandboxNavigation);
853 STATIC_ASSERT_ENUM(WebSandboxFlags::Plugins, SandboxPlugins); 844 STATIC_ASSERT_ENUM(WebSandboxFlags::Plugins, SandboxPlugins);
854 STATIC_ASSERT_ENUM(WebSandboxFlags::Origin, SandboxOrigin); 845 STATIC_ASSERT_ENUM(WebSandboxFlags::Origin, SandboxOrigin);
855 STATIC_ASSERT_ENUM(WebSandboxFlags::Forms, SandboxForms); 846 STATIC_ASSERT_ENUM(WebSandboxFlags::Forms, SandboxForms);
856 STATIC_ASSERT_ENUM(WebSandboxFlags::Scripts, SandboxScripts); 847 STATIC_ASSERT_ENUM(WebSandboxFlags::Scripts, SandboxScripts);
857 STATIC_ASSERT_ENUM(WebSandboxFlags::TopNavigation, SandboxTopNavigation); 848 STATIC_ASSERT_ENUM(WebSandboxFlags::TopNavigation, SandboxTopNavigation);
858 STATIC_ASSERT_ENUM(WebSandboxFlags::Popups, SandboxPopups); 849 STATIC_ASSERT_ENUM(WebSandboxFlags::Popups, SandboxPopups);
859 STATIC_ASSERT_ENUM(WebSandboxFlags::AutomaticFeatures, 850 STATIC_ASSERT_ENUM(WebSandboxFlags::AutomaticFeatures,
860 SandboxAutomaticFeatures); 851 SandboxAutomaticFeatures);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 ProgressBarCompletion::DOMContentLoaded); 890 ProgressBarCompletion::DOMContentLoaded);
900 STATIC_ASSERT_ENUM( 891 STATIC_ASSERT_ENUM(
901 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames, 892 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames,
902 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames); 893 ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);
903 894
904 static_assert(kSerializedScriptValueVersion == 895 static_assert(kSerializedScriptValueVersion ==
905 SerializedScriptValue::wireFormatVersion, 896 SerializedScriptValue::wireFormatVersion,
906 ""); 897 "");
907 898
908 } // namespace blink 899 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp ('k') | third_party/WebKit/Source/web/WebSecurityPolicy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698