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

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: fix content settings browser test 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 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 BackspaceNavigatedBackAfterFormInteraction = 958, 834 BackspaceNavigatedBackAfterFormInteraction = 958,
835 CSPSourceWildcardWouldMatchExactHost = 959, 835 CSPSourceWildcardWouldMatchExactHost = 959,
836 CredentialManagerGet = 960, 836 CredentialManagerGet = 960,
837 CredentialManagerGetWithUI = 961, 837 CredentialManagerGetWithUI = 961,
838 CredentialManagerGetWithoutUI = 962, 838 CredentialManagerGetWithoutUI = 962,
839 CredentialManagerStore = 963, 839 CredentialManagerStore = 963,
840 CredentialManagerRequireUserMediation = 964, 840 CredentialManagerRequireUserMediation = 964,
841 RequestAutocomplete = 965, 841 RequestAutocomplete = 965,
842 CastOverlayClicked = 966, 842 CastOverlayClicked = 966,
843 CastOverlayShown = 967, 843 CastOverlayShown = 967,
844 BlockableMixedContentInSubframeBlocked = 968,
844 845
845 // Add new features immediately above this line. Don't change assigned 846 // Add new features immediately above this line. Don't change assigned
846 // numbers of any item, and don't reuse removed slots. 847 // numbers of any item, and don't reuse removed slots.
847 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/ 848 // Also, run update_use_counter_feature_enum.py in chromium/src/tools/me trics/histograms/
848 // to update the UMA mapping. 849 // to update the UMA mapping.
849 NumberOfFeatures, // This enum value must be last. 850 NumberOfFeatures, // This enum value must be last.
850 }; 851 };
851 852
852 // "count" sets the bit for this feature to 1. Repeated calls are ignored. 853 // "count" sets the bit for this feature to 1. Repeated calls are ignored.
853 static void count(const Frame*, Feature); 854 static void count(const Frame*, Feature);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 939
939 bool hasRecordedMeasurement(Feature feature) const { return m_countBits.hasR ecordedMeasurement(feature); } 940 bool hasRecordedMeasurement(Feature feature) const { return m_countBits.hasR ecordedMeasurement(feature); }
940 941
941 CountBits m_countBits; 942 CountBits m_countBits;
942 BitVector m_CSSFeatureBits; 943 BitVector m_CSSFeatureBits;
943 }; 944 };
944 945
945 } // namespace blink 946 } // namespace blink
946 947
947 #endif // UseCounter_h 948 #endif // UseCounter_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698