Add use counter for /deep/ and ::shadow usage in querySelector()

Bug: 771111 Change-Id: I7f791cb0c5c32d92adf1e05c6719a37fca871475 Reviewed-on: https://chromium-review.googlesource.com/697190 Commit-Queue: Takayoshi Kochi <kochi@chromium.org> Reviewed-by: Hayato Ito <hayato@chromium.org> Reviewed-by: nainar <nainar@chromium.org> Cr-Commit-Position: refs/heads/master@{#506722}
FairyWorld · Oct 5, 2017 · 9055c1f · 9055c1f
1 parent 5899dbd
commit 9055c1f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/third_party/WebKit/Source/core/css/SelectorChecker.cpp b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
@@ -414,10 +414,13 @@ SelectorChecker::MatchStatus SelectorChecker::MatchForRelation(
       return kSelectorFailsAllSiblings;
 
     case CSSSelector::kShadowPseudo: {
-      if (RuntimeEnabledFeatures::
-              ShadowPseudoElementInCSSDynamicProfileEnabled()) {
-        if (!is_ua_rule_ && mode_ != kQueryingRules &&
-            context.selector->GetPseudoType() == CSSSelector::kPseudoShadow) {
+      if (!is_ua_rule_ &&
+          context.selector->GetPseudoType() == CSSSelector::kPseudoShadow) {
+        if (mode_ == kQueryingRules) {
+          UseCounter::Count(context.element->GetDocument(),
+                            WebFeature::kPseudoShadowInStaticProfile);
+        } else if (RuntimeEnabledFeatures::
+                       ShadowPseudoElementInCSSDynamicProfileEnabled()) {
           Deprecation::CountDeprecation(context.element->GetDocument(),
                                         WebFeature::kCSSSelectorPseudoShadow);
         }
@@ -437,9 +440,14 @@ SelectorChecker::MatchStatus SelectorChecker::MatchForRelation(
     }
 
     case CSSSelector::kShadowDeep: {
-      if (!is_ua_rule_ && mode_ != kQueryingRules) {
-        Deprecation::CountDeprecation(context.element->GetDocument(),
-                                      WebFeature::kCSSDeepCombinator);
+      if (!is_ua_rule_) {
+        if (mode_ == kQueryingRules) {
+          UseCounter::Count(context.element->GetDocument(),
+                            WebFeature::kDeepCombinatorInStaticProfile);
+        } else {
+          Deprecation::CountDeprecation(context.element->GetDocument(),
+                                        WebFeature::kCSSDeepCombinator);
+        }
       }
       if (ShadowRoot* root = context.element->ContainingShadowRoot()) {
         if (root->GetType() == ShadowRootType::kUserAgent)

diff --git a/third_party/WebKit/public/platform/web_feature.mojom b/third_party/WebKit/public/platform/web_feature.mojom
@@ -1691,6 +1691,8 @@ enum WebFeature {
   kAsyncXhrInPageDismissal = 2160,
   kV8LineOrParagraphSeparatorAsLineTerminator = 2161,
   kAnimationSetPlaybackRateCompensatorySeek = 2162,
+  kDeepCombinatorInStaticProfile = 2163,
+  kPseudoShadowInStaticProfile = 2164,
 
   // Add new features immediately above this line. Don't change assigned
   // numbers of any item, and don't reuse removed slots.

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
@@ -16436,6 +16436,8 @@ uploading your change for review.  These are checked by presubmit scripts.
   <int value="2160" label="AsyncXhrInPageDismissal"/>
   <int value="2161" label="V8LineOrParagraphSeparatorAsLineTerminator"/>
   <int value="2162" label="AnimationSetPlaybackRateCompensatorySeek"/>
+  <int value="2163" label="DeepCombinatorInStaticProfile"/>
+  <int value="2164" label="PseudoShadowInStaticProfile"/>
 </enum>
 
 <enum name="FeedbackSource">