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

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

Issue 2166573003: Track TextInputState from multiple RenderWidgets in TextInputManager (Mac) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GetTextInputType() must be public to be accessed by the Cocoa view Created 4 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 (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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace( 396 void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace(
397 const gfx::Point& point, 397 const gfx::Point& point,
398 const cc::SurfaceId& original_surface, 398 const cc::SurfaceId& original_surface,
399 gfx::Point* transformed_point) { 399 gfx::Point* transformed_point) {
400 *transformed_point = point; 400 *transformed_point = point;
401 } 401 }
402 402
403 void RenderWidgetHostViewBase::TextInputStateChanged( 403 void RenderWidgetHostViewBase::TextInputStateChanged(
404 const TextInputState& text_input_state) { 404 const TextInputState& text_input_state) {
405 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms. 405 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms.
406 #if defined(USE_AURA) 406 #if defined(USE_AURA) || defined(OS_MACOSX)
kenrb 2016/07/21 21:48:16 Should this be replaced with #if !defined(OS_ANDRO
EhsanK 2016/07/25 17:12:02 Done. I guess I was just being very specific.
407 if (GetTextInputManager()) 407 if (GetTextInputManager())
408 GetTextInputManager()->UpdateTextInputState(this, text_input_state); 408 GetTextInputManager()->UpdateTextInputState(this, text_input_state);
409 #endif 409 #endif
410 } 410 }
411 411
412 void RenderWidgetHostViewBase::ImeCancelComposition() { 412 void RenderWidgetHostViewBase::ImeCancelComposition() {
413 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms. 413 // TODO(ekaramad): Use TextInputManager code paths for IME on other platforms.
414 #if defined(USE_AURA) 414 #if defined(USE_AURA)
415 if (GetTextInputManager()) 415 if (GetTextInputManager())
416 GetTextInputManager()->ImeCancelComposition(this); 416 GetTextInputManager()->ImeCancelComposition(this);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 459
460 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const { 460 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const {
461 return false; 461 return false;
462 } 462 }
463 463
464 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const { 464 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
465 return cc::SurfaceId(); 465 return cc::SurfaceId();
466 } 466 }
467 467
468 } // namespace content 468 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698