commit b8b6d56285606a3c20bd158a48739249e289c04d
author Xianda Sun <sunxd@chromium.org> Fri Dec 14 23:54:57 2018
committer Commit Bot <commit-bot@chromium.org> Fri Dec 14 23:54:57 2018
tree 7ca214e06ec03fc685048198aa9815c9ed786722
parent 2033d608299d63987c046f7d048793ee8d50855e

Enable v2 hit testing with VizDisplayCompositor

This patch enables V2 viz hit testing (OOPIF hit testing with cc data)
with VizDisplayCompositor.

Bug: 901882
Change-Id: If8fc1483303e6081e985d02249de9e75959f4420
Reviewed-on: https://chromium-review.googlesource.com/c/1370464
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Ria Jiang <riajiang@chromium.org>
Commit-Queue: Xianda Sun <sunxd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616881}

components/viz/common/features.cc

diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc
index c75f178d..6c434bf4 100644
--- a/components/viz/common/features.cc
+++ b/components/viz/common/features.cc
@@ -68,6 +68,8 @@
 }
 
 bool IsVizHitTestingDrawQuadEnabled() {
+  if (IsVizHitTestingSurfaceLayerEnabled())
+    return false;
   return base::FeatureList::IsEnabled(kEnableVizHitTestDrawQuad) ||
          base::FeatureList::IsEnabled(kVizDisplayCompositor);
 }
@@ -78,12 +80,9 @@
 }
 
 bool IsVizHitTestingSurfaceLayerEnabled() {
-  // TODO(riajiang): Check kVizDisplayCompositor feature when it works with
-  // that config.
-  return (base::CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kUseVizHitTestSurfaceLayer) ||
-          base::FeatureList::IsEnabled(kEnableVizHitTestSurfaceLayer)) &&
-         !IsVizHitTestingDrawQuadEnabled();
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kUseVizHitTestSurfaceLayer) ||
+         base::FeatureList::IsEnabled(kEnableVizHitTestSurfaceLayer);
 }
 
 bool IsDrawOcclusionEnabled() {