OLD | NEW |
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 "components/view_manager/display_manager.h" | 5 #include "components/view_manager/display_manager.h" |
6 | 6 |
7 #include "base/numerics/safe_conversions.h" | 7 #include "base/numerics/safe_conversions.h" |
8 #include "components/view_manager/display_manager_factory.h" | 8 #include "components/view_manager/display_manager_factory.h" |
9 #include "components/view_manager/gles2/gpu_state.h" | 9 #include "components/view_manager/gles2/gpu_state.h" |
10 #include "components/view_manager/native_viewport/onscreen_context_provider.h" | 10 #include "components/view_manager/native_viewport/onscreen_context_provider.h" |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
272 case ui::ET_TOUCH_PRESSED: | 272 case ui::ET_TOUCH_PRESSED: |
273 platform_window_->SetCapture(); | 273 platform_window_->SetCapture(); |
274 break; | 274 break; |
275 case ui::ET_MOUSE_RELEASED: | 275 case ui::ET_MOUSE_RELEASED: |
276 case ui::ET_TOUCH_RELEASED: | 276 case ui::ET_TOUCH_RELEASED: |
277 platform_window_->ReleaseCapture(); | 277 platform_window_->ReleaseCapture(); |
278 break; | 278 break; |
279 default: | 279 default: |
280 break; | 280 break; |
281 } | 281 } |
282 | |
283 #if defined(USE_X11) | |
284 // We want to emulate the WM_CHAR generation behaviour of Windows. | |
285 // | |
286 // On Linux, we've previously inserted characters by having | |
287 // InputMethodAuraLinux take all key down events and send a character event | |
288 // to the TextInputClient. This causes a mismatch in code that has to be | |
289 // shared between Windows and Linux, including blink code. Now that we're | |
290 // trying to have one way of doing things, we need to standardize on and | |
291 // emulate Windows character events. | |
292 // | |
293 // This is equivalent to what we're doing in the current Linux port, but | |
294 // done once instead of done multiple times in different places. | |
295 if (event->type() == ui::ET_KEY_PRESSED) { | |
296 ui::KeyEvent* key_press_event = static_cast<ui::KeyEvent*>(event); | |
297 ui::KeyEvent char_event(key_press_event->GetCharacter(), | |
298 key_press_event->key_code(), | |
299 key_press_event->flags()); | |
300 | |
301 DCHECK_EQ(key_press_event->GetCharacter(), char_event.GetCharacter()); | |
302 DCHECK_EQ(key_press_event->key_code(), char_event.key_code()); | |
303 DCHECK_EQ(key_press_event->flags(), char_event.flags()); | |
304 | |
305 char_event.SetExtendedKeyEventData( | |
306 make_scoped_ptr(new mojo::MojoExtendedKeyEventData( | |
307 key_press_event->GetLocatedWindowsKeyboardCode(), | |
308 key_press_event->GetText(), | |
309 key_press_event->GetUnmodifiedText()))); | |
310 char_event.set_platform_keycode(key_press_event->platform_keycode()); | |
311 | |
312 delegate_->OnEvent(mojo::Event::From(char_event)); | |
313 } | |
314 #endif | |
315 } | 282 } |
316 | 283 |
317 void DefaultDisplayManager::OnCloseRequest() { | 284 void DefaultDisplayManager::OnCloseRequest() { |
318 platform_window_->Close(); | 285 platform_window_->Close(); |
319 } | 286 } |
320 | 287 |
321 void DefaultDisplayManager::OnClosed() { | 288 void DefaultDisplayManager::OnClosed() { |
322 delegate_->OnDisplayClosed(); | 289 delegate_->OnDisplayClosed(); |
323 } | 290 } |
324 | 291 |
325 void DefaultDisplayManager::OnWindowStateChanged( | 292 void DefaultDisplayManager::OnWindowStateChanged( |
326 ui::PlatformWindowState new_state) { | 293 ui::PlatformWindowState new_state) { |
327 } | 294 } |
328 | 295 |
329 void DefaultDisplayManager::OnLostCapture() { | 296 void DefaultDisplayManager::OnLostCapture() { |
330 } | 297 } |
331 | 298 |
332 void DefaultDisplayManager::OnAcceleratedWidgetAvailable( | 299 void DefaultDisplayManager::OnAcceleratedWidgetAvailable( |
333 gfx::AcceleratedWidget widget, | 300 gfx::AcceleratedWidget widget, |
334 float device_pixel_ratio) { | 301 float device_pixel_ratio) { |
335 context_provider_->SetAcceleratedWidget(widget); | 302 context_provider_->SetAcceleratedWidget(widget); |
336 UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio); | 303 UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio); |
337 } | 304 } |
338 | 305 |
339 void DefaultDisplayManager::OnActivationChanged(bool active) { | 306 void DefaultDisplayManager::OnActivationChanged(bool active) { |
340 } | 307 } |
341 | 308 |
342 } // namespace view_manager | 309 } // namespace view_manager |
OLD | NEW |