Chromium Code Reviews| Index: third_party/WebKit/Source/core/frame/UseCounter.h |
| diff --git a/third_party/WebKit/Source/core/frame/UseCounter.h b/third_party/WebKit/Source/core/frame/UseCounter.h |
| index 9c0079b2620f77182bd533f5612b9825f3170c1c..9b8c93ff110278933dae72a1e9ec8eef32bfcd89 100644 |
| --- a/third_party/WebKit/Source/core/frame/UseCounter.h |
| +++ b/third_party/WebKit/Source/core/frame/UseCounter.h |
| @@ -163,6 +163,8 @@ class CORE_EXPORT UseCounter { |
| DOMNodeInsertedIntoDocumentEvent = 147, |
| DOMCharacterDataModifiedEvent = 148, |
| DocumentAllLegacyCall = 150, |
| + HTMLEmbedElementLegacyCall = 152, |
| + HTMLObjectElementLegacyCall = 153, |
|
esprehn
2017/02/15 01:40:46
looks like bad merge on UseCounter
aboxhall
2017/02/15 02:06:16
Done.
|
| GetMatchedCSSRules = 155, |
| PrefixedAudioDecodedByteCount = 164, |
| PrefixedVideoDecodedByteCount = 165, |
| @@ -996,6 +998,8 @@ class CORE_EXPORT UseCounter { |
| FileAPINativeLineEndings = 1320, |
| PointerEventAttributeCount = 1321, |
| CompositedReplication = 1322, |
| + EncryptedMediaAllSelectedContentTypesHaveCodecs = 1323, |
| + EncryptedMediaAllSelectedContentTypesMissingCodecs = 1324, |
| V8DataTransferItem_WebkitGetAsEntry_Method = 1325, |
| V8HTMLInputElement_WebkitEntries_AttributeGetter = 1326, |
| Entry_Filesystem_AttributeGetter_IsolatedFileSystem = 1327, |
| @@ -1465,6 +1469,7 @@ class CORE_EXPORT UseCounter { |
| V8HTMLVideoElement_Poster_AttributeGetter = 1815, |
| V8HTMLVideoElement_Poster_AttributeSetter = 1816, |
| NotificationPermissionRequestedIframe = 1817, |
| + InertAttribute = 1818, |
| // Add new features immediately above this line. Don't change assigned |
| // numbers of any item, and don't reuse removed slots. |