Commit 42c72a44 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Remove static initializer in NeuralStylusPalmDetectionFilter.

Reduce the scode of `kRequiredAbsMtCodes` to a local scope, so it is
initialized on first use.

Also remove an unneeded included.

Bug: 537099
Change-Id: I984919c41d51a04ecbe6a85ddc56bffa9db833ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419916
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: default avatarMichael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809805}
parent f1bb2cb4
...@@ -403,9 +403,6 @@ bool NeuralStylusPalmDetectionFilter:: ...@@ -403,9 +403,6 @@ bool NeuralStylusPalmDetectionFilter::
kOzoneNNPalmSwitchName)); kOzoneNNPalmSwitchName));
} }
const std::vector<int> NeuralStylusPalmDetectionFilter::kRequiredAbsMtCodes = {
ABS_MT_POSITION_X, ABS_MT_POSITION_Y, ABS_MT_TOUCH_MAJOR};
bool NeuralStylusPalmDetectionFilter:: bool NeuralStylusPalmDetectionFilter::
CompatibleWithNeuralStylusPalmDetectionFilter( CompatibleWithNeuralStylusPalmDetectionFilter(
const EventDeviceInfo& devinfo, const EventDeviceInfo& devinfo,
...@@ -425,6 +422,9 @@ bool NeuralStylusPalmDetectionFilter:: ...@@ -425,6 +422,9 @@ bool NeuralStylusPalmDetectionFilter::
} }
return true; return true;
}; };
static const std::vector<int> kRequiredAbsMtCodes = {
ABS_MT_POSITION_X, ABS_MT_POSITION_Y, ABS_MT_TOUCH_MAJOR};
if (!std::all_of(kRequiredAbsMtCodes.begin(), kRequiredAbsMtCodes.end(), if (!std::all_of(kRequiredAbsMtCodes.begin(), kRequiredAbsMtCodes.end(),
code_check)) { code_check)) {
return false; return false;
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <bitset> #include <bitset>
#include <cstdint> #include <cstdint>
#include <deque>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -94,8 +93,6 @@ class COMPONENT_EXPORT(EVDEV) NeuralStylusPalmDetectionFilter ...@@ -94,8 +93,6 @@ class COMPONENT_EXPORT(EVDEV) NeuralStylusPalmDetectionFilter
const PalmFilterDeviceInfo palm_filter_dev_info_; const PalmFilterDeviceInfo palm_filter_dev_info_;
std::unique_ptr<NeuralStylusPalmDetectionFilterModel> model_; std::unique_ptr<NeuralStylusPalmDetectionFilterModel> model_;
static const std::vector<int> kRequiredAbsMtCodes;
DISALLOW_COPY_AND_ASSIGN(NeuralStylusPalmDetectionFilter); DISALLOW_COPY_AND_ASSIGN(NeuralStylusPalmDetectionFilter);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment