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

Side by Side Diff: ash/host/ash_window_tree_host_x11.cc

Issue 1209913002: InputMethod should stop TextInputClient::InsertChar/InsertText calls when the event is stopped prop… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed test failures. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/host/ash_window_tree_host_x11.h" 5 #include "ash/host/ash_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/Xfixes.h> 7 #include <X11/extensions/Xfixes.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 ui::LocatedEvent* event) { 234 ui::LocatedEvent* event) {
235 TranslateLocatedEvent(event); 235 TranslateLocatedEvent(event);
236 SendEventToProcessor(event); 236 SendEventToProcessor(event);
237 } 237 }
238 238
239 bool AshWindowTreeHostX11::DispatchKeyEventPostIME(const ui::KeyEvent& event) { 239 bool AshWindowTreeHostX11::DispatchKeyEventPostIME(const ui::KeyEvent& event) {
240 ui::KeyEvent event_copy(event); 240 ui::KeyEvent event_copy(event);
241 input_method_handler()->SetPostIME(true); 241 input_method_handler()->SetPostIME(true);
242 ui::EventSource::DeliverEventToProcessor(&event_copy); 242 ui::EventSource::DeliverEventToProcessor(&event_copy);
243 input_method_handler()->SetPostIME(false); 243 input_method_handler()->SetPostIME(false);
244 return event_copy.handled(); 244 return event_copy.stopped_propagation();
245 } 245 }
246 246
247 ui::EventDispatchDetails AshWindowTreeHostX11::DeliverEventToProcessor( 247 ui::EventDispatchDetails AshWindowTreeHostX11::DeliverEventToProcessor(
248 ui::Event* event) { 248 ui::Event* event) {
249 return ui::EventSource::DeliverEventToProcessor(event); 249 return ui::EventSource::DeliverEventToProcessor(event);
250 } 250 }
251 251
252 #if defined(OS_CHROMEOS) 252 #if defined(OS_CHROMEOS)
253 void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) { 253 void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
254 if (!ui::IsXInput2Available()) 254 if (!ui::IsXInput2Available())
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 #endif 295 #endif
296 296
297 AshWindowTreeHost* AshWindowTreeHost::Create( 297 AshWindowTreeHost* AshWindowTreeHost::Create(
298 const AshWindowTreeHostInitParams& init_params) { 298 const AshWindowTreeHostInitParams& init_params) {
299 if (init_params.offscreen) 299 if (init_params.offscreen)
300 return new AshWindowTreeHostUnified(init_params.initial_bounds); 300 return new AshWindowTreeHostUnified(init_params.initial_bounds);
301 return new AshWindowTreeHostX11(init_params.initial_bounds); 301 return new AshWindowTreeHostX11(init_params.initial_bounds);
302 } 302 }
303 303
304 } // namespace ash 304 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698