OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_base.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/accessibility/browser_accessibility_manager.h" | 9 #include "content/browser/accessibility/browser_accessibility_manager.h" |
10 #include "content/browser/gpu/gpu_data_manager_impl.h" | 10 #include "content/browser/gpu/gpu_data_manager_impl.h" |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
448 #if !defined(OS_ANDROID) | 448 #if !defined(OS_ANDROID) |
449 if (GetTextInputManager()) | 449 if (GetTextInputManager()) |
450 GetTextInputManager()->ImeCancelComposition(this); | 450 GetTextInputManager()->ImeCancelComposition(this); |
451 #endif | 451 #endif |
452 } | 452 } |
453 | 453 |
454 void RenderWidgetHostViewBase::ImeCompositionRangeChanged( | 454 void RenderWidgetHostViewBase::ImeCompositionRangeChanged( |
455 const gfx::Range& range, | 455 const gfx::Range& range, |
456 const std::vector<gfx::Rect>& character_bounds) { | 456 const std::vector<gfx::Rect>& character_bounds) { |
457 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms. | 457 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms. |
458 #if defined(USE_AURA) | 458 #if !defined(OS_ANDROID) |
459 if (GetTextInputManager()) { | 459 if (GetTextInputManager()) { |
460 GetTextInputManager()->ImeCompositionRangeChanged(this, range, | 460 GetTextInputManager()->ImeCompositionRangeChanged(this, range, |
461 character_bounds); | 461 character_bounds); |
462 } | 462 } |
463 #endif | 463 #endif |
464 } | 464 } |
465 | 465 |
466 TextInputManager* RenderWidgetHostViewBase::GetTextInputManager() { | 466 TextInputManager* RenderWidgetHostViewBase::GetTextInputManager() { |
467 if (text_input_manager_) | 467 if (text_input_manager_) |
468 return text_input_manager_; | 468 return text_input_manager_; |
(...skipping 24 matching lines...) Expand all Loading... |
493 | 493 |
494 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const { | 494 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const { |
495 return false; | 495 return false; |
496 } | 496 } |
497 | 497 |
498 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const { | 498 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const { |
499 return cc::SurfaceId(); | 499 return cc::SurfaceId(); |
500 } | 500 } |
501 | 501 |
502 } // namespace content | 502 } // namespace content |
OLD | NEW |