Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Issue 343923002: Revert of Convert sticky keys to a chromeos::EventRewriter phase. (Closed)

Created:
6 years, 6 months ago by kpschoedel
Modified:
6 years, 6 months ago
CC:
chromium-reviews, nkostylev+watch_chromium.org, ben+ash_chromium.org, oshima+watch_chromium.org, kalyank, stevenjb+watch_chromium.org, davemoore+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@x354034-er
Visibility:
Public.

Description

Revert of Convert sticky keys to a chromeos::EventRewriter phase. (https://codereview.chromium.org/255033003/) Reason for revert: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%285%29/builds/27608/steps/memory%20test%3A%20unit/logs/stdio The change to chromeos::EventRewriter::RewriteEvent() leads to a ui::MouseEvent object being used for a ui::MouseWheelEvent. Original issue's description: > Convert sticky keys to a chromeos::EventRewriter phase. > > BUG=354035 > TEST=unit_tests,ash_unittests,manual > R=sadrul@chromium.org,derat@chromium.org > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=278342

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1303 lines, -1189 lines) Patch
M ash/shell.cc View 2 chunks +7 lines, -4 lines 0 comments Download
M ash/sticky_keys/sticky_keys_controller.h View 6 chunks +75 lines, -103 lines 0 comments Download
M ash/sticky_keys/sticky_keys_controller.cc View 10 chunks +321 lines, -194 lines 0 comments Download
M ash/sticky_keys/sticky_keys_overlay_unittest.cc View 2 chunks +197 lines, -3 lines 0 comments Download
M ash/sticky_keys/sticky_keys_unittest.cc View 18 chunks +583 lines, -288 lines 0 comments Download
M chrome/browser/chromeos/chrome_browser_main_chromeos.cc View 2 chunks +6 lines, -7 lines 0 comments Download
M chrome/browser/chromeos/events/event_rewriter.h View 5 chunks +2 lines, -16 lines 0 comments Download
M chrome/browser/chromeos/events/event_rewriter.cc View 6 chunks +64 lines, -136 lines 0 comments Download
M chrome/browser/chromeos/events/event_rewriter_unittest.cc View 35 chunks +48 lines, -438 lines 0 comments Download

Messages

Total messages: 9 (0 generated)
kpschoedel
Created Revert of Convert sticky keys to a chromeos::EventRewriter phase.
6 years, 6 months ago (2014-06-19 14:05:37 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/kpschoedel@chromium.org/343923002/1
6 years, 6 months ago (2014-06-19 14:06:27 UTC) #2
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-19 14:06:28 UTC) #3
commit-bot: I haz the power
No LGTM from a valid reviewer yet. Only full committers are accepted. Even if an ...
6 years, 6 months ago (2014-06-19 14:06:29 UTC) #4
Daniel Erat
rubberstamp lgtm
6 years, 6 months ago (2014-06-19 14:09:28 UTC) #5
Daniel Erat
The CQ bit was checked by derat@chromium.org
6 years, 6 months ago (2014-06-19 14:09:35 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/kpschoedel@chromium.org/343923002/1
6 years, 6 months ago (2014-06-19 14:11:05 UTC) #7
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-06-19 18:25:26 UTC) #8
commit-bot: I haz the power
6 years, 6 months ago (2014-06-19 18:25:27 UTC) #9
Failed to apply patch for ash/shell.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/shell.cc
  Hunk #1 succeeded at 896 with fuzz 2 (offset 7 lines).
  Hunk #2 FAILED at 928.
  1 out of 2 hunks FAILED -- saving rejects to file ash/shell.cc.rej

Patch:       ash/shell.cc
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index
2c393065aba614f7c7caa01fa365b5f490a2a9c8..c8b327979249e3eaabbad01a31fc24a65b6edf96
100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -889,6 +889,13 @@
 
   // The order in which event filters are added is significant.
 
+#if defined(OS_CHROMEOS)
+  // The StickyKeysController also rewrites events and must be added
+  // before observers, but after the EventRewriterEventFilter.
+  sticky_keys_controller_.reset(new StickyKeysController);
+  AddPreTargetHandler(sticky_keys_controller_.get());
+#endif
+
   // wm::UserActivityDetector passes events to observers, so let them get
   // rewritten first.
   user_activity_detector_.reset(new ::wm::UserActivityDetector);
@@ -921,10 +928,6 @@
   // created.
 #if defined(OS_CHROMEOS)
     keyboard::InitializeKeyboard();
-#endif
-
-#if defined(OS_CHROMEOS)
-  sticky_keys_controller_.reset(new StickyKeysController);
 #endif
 
   lock_state_controller_.reset(new LockStateController);

Powered by Google App Engine
This is Rietveld 408576698