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

Side by Side Diff: third_party/WebKit/Source/core/frame/UseCounter.h

Issue 1392993002: Strictly block blockable mixed subresources in subframes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 BackspaceNavigatedBackAfterFormInteraction = 958, 836 BackspaceNavigatedBackAfterFormInteraction = 958,
837 CSPSourceWildcardWouldMatchExactHost = 959, 837 CSPSourceWildcardWouldMatchExactHost = 959,
838 CredentialManagerGet = 960, 838 CredentialManagerGet = 960,
839 CredentialManagerGetWithUI = 961, 839 CredentialManagerGetWithUI = 961,
840 CredentialManagerGetWithoutUI = 962, 840 CredentialManagerGetWithoutUI = 962,
841 CredentialManagerStore = 963, 841 CredentialManagerStore = 963,
842 CredentialManagerRequireUserMediation = 964, 842 CredentialManagerRequireUserMediation = 964,
843 // The above items are available in M47 branch. 843 // The above items are available in M47 branch.
844 844
845 RequestAutocomplete = 965, 845 RequestAutocomplete = 965,
846 BlockableMixedContentInSubframeBlocked = 966,
846 847
847 // Add new features immediately above this line. Don't change assigned 848 // Add new features immediately above this line. Don't change assigned
848 // numbers of any item, and don't reuse removed slots. 849 // numbers of any item, and don't reuse removed slots.
849 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/ 850 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/
850 // to update the UMA mapping. 851 // to update the UMA mapping.
851 NumberOfFeatures, // This enum value must be last. 852 NumberOfFeatures, // This enum value must be last.
852 }; 853 };
853 854
854 // "count" sets the bit for this feature to 1. Repeated calls are ignored. 855 // "count" sets the bit for this feature to 1. Repeated calls are ignored.
855 static void count(const Frame*, Feature); 856 static void count(const Frame*, Feature);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 941
941 bool hasRecordedMeasurement(Feature feature) const { return m_countBits.hasR ecordedMeasurement(feature); } 942 bool hasRecordedMeasurement(Feature feature) const { return m_countBits.hasR ecordedMeasurement(feature); }
942 943
943 CountBits m_countBits; 944 CountBits m_countBits;
944 BitVector m_CSSFeatureBits; 945 BitVector m_CSSFeatureBits;
945 }; 946 };
946 947
947 } // namespace blink 948 } // namespace blink
948 949
949 #endif // UseCounter_h 950 #endif // UseCounter_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698