Remove workaround for ash-chrome M104 and prior [chromium/src : main]

Seija K. (Gerrit)

unread,

Feb 21, 2023, 1:03:38 PMFeb 21

to Maksim Sisov, Kramer Ge, ozone-...@chromium.org

Attention is currently required from: Kramer Ge, Maksim Sisov.

Seija K. would like Maksim Sisov and Kramer Ge to review this change.

Remove workaround for ash-chrome M104 and prior

We do not use those versions anymore.

Bug: None
Change-Id: I3f77a1f1accb9f25fc5d16d93aa60bdd57df3759
---
M ui/ozone/platform/wayland/host/wayland_input_method_context.cc
1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/ui/ozone/platform/wayland/host/wayland_input_method_context.cc b/ui/ozone/platform/wayland/host/wayland_input_method_context.cc
index 9ee65f03..0939538 100644
--- a/ui/ozone/platform/wayland/host/wayland_input_method_context.cc
+++ b/ui/ozone/platform/wayland/host/wayland_input_method_context.cc
@@ -566,26 +566,6 @@
   if (!layout_engine)
     return;
 
-  // TODO(crbug.com/1289236): This is for the backward compatibility with older
-  // ash-chrome (M101 and earlier). In that version of ash-chrome didn't send
-  // CapsLock so that we hit an issue on using it.
-  // Because newer ash-chrome always sends CapsLock modifier map, as short term
-  // workaround, check the condition to identify whether Lacros is running
-  // on top of enough newer ash-chrome.
-  // To avoid accident, we also check text_input_extension, which is available
-  // only on ash-chrome.
-  // We can remove this workaround check in M104 or later.
-  absl::optional<std::vector<base::StringPiece>> modifiers;
-  if (!connection_->text_input_extension_v1() ||
-      base::Contains(modifiers_map_, XKB_MOD_NAME_CAPS)) {
-    std::vector<base::StringPiece> modifier_content;
-    for (size_t i = 0; i < modifiers_map_.size(); ++i) {
-      if (modifiers_bits & (1 << i))
-        modifier_content.emplace_back(modifiers_map_[i]);
-    }
-    modifiers = std::move(modifier_content);
-  }
-
   DomCode dom_code = static_cast<XkbKeyboardLayoutEngine*>(layout_engine)
                          ->GetDomCodeByKeysym(keysym, modifiers);
   if (dom_code == DomCode::NONE)

To view, visit change 4275445. To unsubscribe, or for help writing mail filters, visit settings.

Seija K. (Gerrit)

unread,

Feb 21, 2023, 1:03:41 PMFeb 21

to ozone-...@chromium.org, Maksim Sisov, Kramer Ge, chromium...@chromium.org

Attention is currently required from: Kramer Ge, Maksim Sisov.

View Change

To view, visit change 4275445. To unsubscribe, or for help writing mail filters, visit settings.

Maksim Sisov (Gerrit)

unread,

Feb 22, 2023, 1:20:00 AMFeb 22

to Seija K., ozone-...@chromium.org, Kramer Ge, chromium...@chromium.org

Attention is currently required from: Kramer Ge, Seija K..

Patch set 1:Code-Review +1

View Change

To view, visit change 4275445. To unsubscribe, or for help writing mail filters, visit settings.

Kramer Ge (Gerrit)

unread,

Feb 24, 2023, 2:00:38 PMFeb 24

to Seija K., ozone-...@chromium.org, Maksim Sisov, chromium...@chromium.org

Attention is currently required from: Seija K..

Patch set 2:Code-Review +1

View Change

To view, visit change 4275445. To unsubscribe, or for help writing mail filters, visit settings.

Maksim Sisov (Gerrit)

unread,

Sep 12, 2023, 9:39:09 AMSep 12

to Seija K., ozone-...@chromium.org, chromium...@chromium.org

Attention is currently required from: Seija K..

Patch set 2:-Code-Review

View Change

1 comment:

Patchset:
- Patch Set #2:
  looks like it's no longer needed?

To view, visit change 4275445. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward