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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_base.cc

Issue 2228633005: Cancel composition on RenderWidgetHostCocoaView after a child frame's RWHV receives the correspondi… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a unit test Created 4 years, 4 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 const TextInputState& text_input_state) { 438 const TextInputState& text_input_state) {
439 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms. 439 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms.
440 #if !defined(OS_ANDROID) 440 #if !defined(OS_ANDROID)
441 if (GetTextInputManager()) 441 if (GetTextInputManager())
442 GetTextInputManager()->UpdateTextInputState(this, text_input_state); 442 GetTextInputManager()->UpdateTextInputState(this, text_input_state);
443 #endif 443 #endif
444 } 444 }
445 445
446 void RenderWidgetHostViewBase::ImeCancelComposition() { 446 void RenderWidgetHostViewBase::ImeCancelComposition() {
447 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms. 447 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms.
448 #if defined(USE_AURA) 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(USE_AURA)
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698