Revert "Move feature definitions for SkipBrowserTouchFilter to ui/events/blink so that they're usable from renderer cc code."
This reverts commit 2e61d97967e78ce0d9cfdacc62f439bc4a210fa9.
Reason for revert: this patch causes viz_content_unittests failure on linux-chromeos-dbg
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/12049
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8915241711014503632/+/steps/viz_content_unittests/0/logs/Deterministic_failure:_PassthroughTouchEventQueueTest.AckTouchEventInReverse__status_CRASH_/0
E.g.
[ RUN ] PassthroughTouchEventQueueTest.AckTouchEventInReverse
[2527:2527:0424/202234.872519:29241501123:FATAL:feature_list.cc(305)] Check failed: CheckFeatureIdentity(feature). SkipBrowserTouchFilter
Original change's description:
> Move feature definitions for SkipBrowserTouchFilter to ui/events/blink so that they're usable from renderer cc code.
>
> Also fix imports in some files that were depending on features being
> included through input_handler_proxy.h.
>
> Bug: 914500
> Change-Id: I9d45903e9061cbb3a3475a5b0095772a933e8845
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1576333
> Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Commit-Queue: Annie Sullivan <sullivan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#653866}
TBR=dgozman@chromium.org,sullivan@chromium.org,nzolghadr@chromium.org
Change-Id: Ib2743c7df08cb9f5480ea2ddcdc06b6720bc7d78
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 914500
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1583173
Reviewed-by: Takashi Sakamoto <tasak@google.com>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Cr-Commit-Position: refs/heads/master@{#653930}
diff --git a/content/browser/accessibility/dump_accessibility_browsertest_base.cc b/content/browser/accessibility/dump_accessibility_browsertest_base.cc
index 81d795d..8fd4f5b 100644
--- a/content/browser/accessibility/dump_accessibility_browsertest_base.cc
+++ b/content/browser/accessibility/dump_accessibility_browsertest_base.cc
@@ -27,7 +27,6 @@
#include "content/browser/renderer_host/render_widget_host_view_child_frame.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/common/content_features.h"
#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
diff --git a/content/browser/devtools/protocol/input_handler.cc b/content/browser/devtools/protocol/input_handler.cc
index fdd1744..d441a005 100644
--- a/content/browser/devtools/protocol/input_handler.cc
+++ b/content/browser/devtools/protocol/input_handler.cc
@@ -25,7 +25,6 @@
#include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
#include "content/common/input/synthetic_tap_gesture_params.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/common/content_features.h"
#include "ui/events/base_event_utils.h"
#include "ui/events/blink/web_input_event_traits.h"
#include "ui/events/gesture_detection/gesture_provider_config_helper.h"
diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc
index c7fcb2d..90583cfe 100644
--- a/content/browser/frame_host/frame_tree_browsertest.cc
+++ b/content/browser/frame_host/frame_tree_browsertest.cc
@@ -13,7 +13,6 @@
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
-#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/origin_util.h"
#include "content/public/common/url_constants.h"
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 4072c68b..f0ede24b 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -28,7 +28,6 @@
#include "content/common/frame_messages.h"
#include "content/common/frame_owner_properties.h"
#include "content/public/browser/browser_thread.h"
-#include "content/public/common/content_features.h"
#include "ipc/ipc_message.h"
namespace content {
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index aa5eb516..992eedf 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -72,7 +72,6 @@
#include "content/public/browser/android/compositor_client.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
-#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/gpu_stream_constants.h"
#include "gpu/command_buffer/client/context_support.h"
diff --git a/content/browser/renderer_host/input/passthrough_touch_event_queue.h b/content/browser/renderer_host/input/passthrough_touch_event_queue.h
index 35330cb..8fd4679 100644
--- a/content/browser/renderer_host/input/passthrough_touch_event_queue.h
+++ b/content/browser/renderer_host/input/passthrough_touch_event_queue.h
@@ -15,9 +15,9 @@
#include "base/time/time.h"
#include "content/browser/renderer_host/event_with_latency_info.h"
#include "content/common/content_export.h"
+#include "content/public/common/content_features.h"
#include "content/public/common/input_event_ack_source.h"
#include "content/public/common/input_event_ack_state.h"
-#include "ui/events/blink/blink_features.h"
namespace content {
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
index 0ca75808..72c7199 100644
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -489,6 +489,18 @@
const base::Feature kTouchpadAsyncPinchEvents{"TouchpadAsyncPinchEvents",
base::FEATURE_ENABLED_BY_DEFAULT};
+// Skips the browser touch event filter, ensuring that events that reach the
+// queue and would otherwise be filtered out will instead be passed onto the
+// renderer compositor process as long as the page hasn't timed out. Which event
+// types will be always forwarded is controlled by the "type" FeatureParam,
+// which can be either "discrete" (default) or "all".
+const base::Feature kSkipBrowserTouchFilter{"SkipBrowserTouchFilter",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
+const char kSkipBrowserTouchFilterTypeParamName[] = "type";
+const char kSkipBrowserTouchFilterTypeParamValueDiscrete[] = "discrete";
+const char kSkipBrowserTouchFilterTypeParamValueAll[] = "all";
+
// Allows developers transfer user activation state to any target window in the
// frame tree.
const base::Feature kUserActivationPostMessageTransfer{
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
index d303037..6ccc910 100644
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -108,6 +108,11 @@
CONTENT_EXPORT extern const base::Feature kSignedExchangeSubresourcePrefetch;
CONTENT_EXPORT extern const base::Feature kSignedHTTPExchange;
CONTENT_EXPORT extern const base::Feature kSignedHTTPExchangePingValidity;
+CONTENT_EXPORT extern const base::Feature kSkipBrowserTouchFilter;
+CONTENT_EXPORT extern const char kSkipBrowserTouchFilterTypeParamName[];
+CONTENT_EXPORT extern const char
+ kSkipBrowserTouchFilterTypeParamValueDiscrete[];
+CONTENT_EXPORT extern const char kSkipBrowserTouchFilterTypeParamValueAll[];
CONTENT_EXPORT extern const base::Feature kSpareRendererForSitePerProcess;
CONTENT_EXPORT extern const base::Feature kSyntheticPointerActions;
CONTENT_EXPORT extern const base::Feature kTimerThrottlingForHiddenFrames;
diff --git a/ui/events/blink/blink_features.cc b/ui/events/blink/blink_features.cc
index d9b953b..6e0e530 100644
--- a/ui/events/blink/blink_features.cc
+++ b/ui/events/blink/blink_features.cc
@@ -30,17 +30,4 @@
const base::Feature kDontSendKeyEventsToJavascript{
"DontSendKeyEventsToJavascript", base::FEATURE_DISABLED_BY_DEFAULT};
-
-const base::Feature kSkipBrowserTouchFilter{"SkipBrowserTouchFilter",
- base::FEATURE_DISABLED_BY_DEFAULT};
-const char kSkipBrowserTouchFilterTypeParamName[] = "type";
-const char kSkipBrowserTouchFilterTypeParamValueDiscrete[] = "discrete";
-const char kSkipBrowserTouchFilterTypeParamValueAll[] = "all";
-const char kSkipBrowserTouchFilterFilteringProcessParamName[] =
- "skip_filtering_process";
-const char kSkipBrowserTouchFilterFilteringProcessParamValueBrowser[] =
- "browser";
-const char
- kSkipBrowserTouchFilterFilteringProcessParamValueBrowserAndRenderer[] =
- "browser_and_renderer";
}
diff --git a/ui/events/blink/blink_features.h b/ui/events/blink/blink_features.h
index 075fee25..3c648d5 100644
--- a/ui/events/blink/blink_features.h
+++ b/ui/events/blink/blink_features.h
@@ -44,23 +44,6 @@
// When enabled, this feature prevent blink sending key event to web unless it
// is on installed PWA.
extern const base::Feature kDontSendKeyEventsToJavascript;
-
-// Skips the browser touch event filter, ensuring that events that reach the
-// queue and would otherwise be filtered out will instead be passed onto the
-// renderer compositor process as long as the page hasn't timed out. If
-// skip_filtering_process is browser_and_renderer, also skip the renderer cc
-// touch event filter, ensuring that events will be passed onto the renderer
-// main thread. Which event types will be always forwarded is controlled by the
-// "type" FeatureParam,
-// which can be either "discrete" (default) or "all".
-extern const base::Feature kSkipBrowserTouchFilter;
-extern const char kSkipBrowserTouchFilterTypeParamName[];
-extern const char kSkipBrowserTouchFilterTypeParamValueDiscrete[];
-extern const char kSkipBrowserTouchFilterTypeParamValueAll[];
-extern const char kSkipBrowserTouchFilterFilteringProcessParamName[];
-extern const char kSkipBrowserTouchFilterFilteringProcessParamValueBrowser[];
-extern const char
- kSkipBrowserTouchFilterFilteringProcessParamValueBrowserAndRenderer[];
}
#endif // UI_EVENTS_BLINK_BLINK_FEATURES_H_
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 96db4e8b..b2e2ff67c 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -13,7 +13,6 @@
#include "base/command_line.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -183,24 +182,6 @@
compositor_event_queue_ = std::make_unique<CompositorThreadEventQueue>();
scroll_predictor_ = std::make_unique<ScrollPredictor>(
base::FeatureList::IsEnabled(features::kResamplingScrollEvents));
-
- if (base::FeatureList::IsEnabled(features::kSkipBrowserTouchFilter) &&
- GetFieldTrialParamValueByFeature(
- features::kSkipBrowserTouchFilter,
- features::kSkipBrowserTouchFilterFilteringProcessParamName) ==
- features::
- kSkipBrowserTouchFilterFilteringProcessParamValueBrowserAndRenderer) {
- // Skipping filtering for touch events on renderer process is enabled.
- // Always skip filtering discrete events.
- skip_touch_filter_discrete_ = true;
- if (GetFieldTrialParamValueByFeature(
- features::kSkipBrowserTouchFilter,
- features::kSkipBrowserTouchFilterTypeParamName) ==
- features::kSkipBrowserTouchFilterTypeParamValueAll) {
- // The experiment config also specifies to skip touchmove events.
- skip_touch_filter_all_ = true;
- }
- }
}
InputHandlerProxy::~InputHandlerProxy() {}
diff --git a/ui/events/blink/input_handler_proxy.h b/ui/events/blink/input_handler_proxy.h
index 3275b97..99fbc64 100644
--- a/ui/events/blink/input_handler_proxy.h
+++ b/ui/events/blink/input_handler_proxy.h
@@ -239,12 +239,6 @@
// tests and to allow testing both Blink and CC input handling paths.
bool force_input_to_main_thread_;
- // These flags are set for the SkipBrowserTouchFilter experiment. The
- // experiment either skips filtering discrete (touch start/end) events to the
- // main thread, or all events (touch start/end/move).
- bool skip_touch_filter_discrete_ = false;
- bool skip_touch_filter_all_ = false;
-
DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy);
};
