Commit 799b8c8b authored by pkotwicz's avatar pkotwicz Committed by Commit bot

Remove GestureInterpreterLibevdevCros::SetAllowedKeys() because it is a no-op

EventConverterEvdev::SetAllowedKeys() and EvdevConverterEvdev::AllowAllKeys()
are only called for internal keyboards. GestureInterpreterLibevdevCros is not
used for internal keyboards. The current implementation of
GestureInterpreterLibevdevCros::SetAllowedKeys() and
GestureInterpreterLibevdevCros::AllowAllKeys() is buggy, so just remove it

BUG=None
TEST=None

Review URL: https://codereview.chromium.org/1003523004

Cr-Commit-Position: refs/heads/master@{#320155}
parent 7ebfce1f
......@@ -37,6 +37,9 @@ EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
has_touchpad_(devinfo.HasTouchpad()),
has_caps_lock_led_(devinfo.HasLedEvent(LED_CAPSL)),
delegate_(delegate.Pass()) {
// This class assumes it does not deal with internal keyboards.
CHECK(!has_keyboard_ || type != INPUT_DEVICE_INTERNAL);
memset(&evdev_, 0, sizeof(evdev_));
evdev_.log = OnLogMessage;
evdev_.log_udata = this;
......@@ -87,17 +90,6 @@ bool EventReaderLibevdevCros::HasCapsLockLed() const {
return has_caps_lock_led_;
}
void EventReaderLibevdevCros::SetAllowedKeys(
scoped_ptr<std::set<DomCode>> allowed_keys) {
DCHECK(HasKeyboard());
delegate_->SetAllowedKeys(allowed_keys.Pass());
}
void EventReaderLibevdevCros::AllowAllKeys() {
DCHECK(HasKeyboard());
delegate_->AllowAllKeys();
}
void EventReaderLibevdevCros::OnStopped() {
delegate_->OnLibEvdevCrosStopped(&evdev_, &evstate_);
}
......
......@@ -37,12 +37,6 @@ class EventReaderLibevdevCros : public EventConverterEvdev {
// Notifier for stop. This is called with the final event state.
virtual void OnLibEvdevCrosStopped(Evdev* evdev, EventStateRec* state) = 0;
// Sets which keyboard keys should be processed.
virtual void SetAllowedKeys(scoped_ptr<std::set<DomCode>> allowed_keys) = 0;
// Allows all keys to be processed.
virtual void AllowAllKeys() = 0;
};
EventReaderLibevdevCros(int fd,
......@@ -59,8 +53,6 @@ class EventReaderLibevdevCros : public EventConverterEvdev {
bool HasMouse() const override;
bool HasTouchpad() const override;
bool HasCapsLockLed() const override;
void SetAllowedKeys(scoped_ptr<std::set<DomCode>> allowed_keys) override;
void AllowAllKeys() override;
void OnStopped() override;
private:
......
......@@ -214,25 +214,6 @@ void GestureInterpreterLibevdevCros::OnLibEvdevCrosStopped(
ReleaseMouseButtons(timestamp);
}
void GestureInterpreterLibevdevCros::SetAllowedKeys(
scoped_ptr<std::set<DomCode>> allowed_keys) {
if (!allowed_keys) {
allowed_keys_.reset();
return;
}
allowed_keys_.reset(new std::set<int>());
for (const auto& it : *allowed_keys) {
int evdev_code =
NativeCodeToEvdevCode(KeycodeConverter::DomCodeToNativeKeycode(it));
allowed_keys_->insert(evdev_code);
}
}
void GestureInterpreterLibevdevCros::AllowAllKeys() {
allowed_keys_.reset();
}
void GestureInterpreterLibevdevCros::OnGestureReady(const Gesture* gesture) {
switch (gesture->type) {
case kGestureTypeMove:
......@@ -453,9 +434,6 @@ void GestureInterpreterLibevdevCros::DispatchChangedKeys(
if (key >= BTN_DIGI && key < BTN_WHEEL)
continue;
if (allowed_keys_ && !allowed_keys_->count(key))
continue;
// Dispatch key press or release to keyboard.
dispatcher_->DispatchKeyEvent(
KeyEventParams(id_, key, value, StimeToTimedelta(timestamp)));
......
......@@ -53,9 +53,6 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
EventStateRec* evstate,
const timeval& time) override;
void OnLibEvdevCrosStopped(Evdev* evdev, EventStateRec* state) override;
void SetAllowedKeys(
scoped_ptr<std::set<DomCode>> allowed_keys) override;
void AllowAllKeys() override;
// Handler for gesture events generated from libgestures.
void OnGestureReady(const Gesture* gesture);
......@@ -93,10 +90,6 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
// and multi-touch mice.
bool is_mouse_;
// The evdev codes of the keys which should be processed. nullptr if all keys
// should be processed.
scoped_ptr<std::set<int>> allowed_keys_;
// Shared cursor state.
CursorDelegateEvdev* cursor_;
......
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