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

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

Issue 671503005: Plumb composition character bounds for Android 5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 OnShowDisambiguationPopup) 466 OnShowDisambiguationPopup)
467 IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionChanged, OnSelectionChanged) 467 IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionChanged, OnSelectionChanged)
468 IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionBoundsChanged, 468 IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionBoundsChanged,
469 OnSelectionBoundsChanged) 469 OnSelectionBoundsChanged)
470 #if defined(OS_WIN) 470 #if defined(OS_WIN)
471 IPC_MESSAGE_HANDLER(ViewHostMsg_WindowlessPluginDummyWindowCreated, 471 IPC_MESSAGE_HANDLER(ViewHostMsg_WindowlessPluginDummyWindowCreated,
472 OnWindowlessPluginDummyWindowCreated) 472 OnWindowlessPluginDummyWindowCreated)
473 IPC_MESSAGE_HANDLER(ViewHostMsg_WindowlessPluginDummyWindowDestroyed, 473 IPC_MESSAGE_HANDLER(ViewHostMsg_WindowlessPluginDummyWindowDestroyed,
474 OnWindowlessPluginDummyWindowDestroyed) 474 OnWindowlessPluginDummyWindowDestroyed)
475 #endif 475 #endif
476 #if defined(OS_MACOSX) || defined(USE_AURA) 476 #if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
477 IPC_MESSAGE_HANDLER(InputHostMsg_ImeCompositionRangeChanged, 477 IPC_MESSAGE_HANDLER(InputHostMsg_ImeCompositionRangeChanged,
478 OnImeCompositionRangeChanged) 478 OnImeCompositionRangeChanged)
479 #endif 479 #endif
480 IPC_MESSAGE_UNHANDLED(handled = false) 480 IPC_MESSAGE_UNHANDLED(handled = false)
481 IPC_END_MESSAGE_MAP() 481 IPC_END_MESSAGE_MAP()
482 482
483 if (!handled && input_router_ && input_router_->OnMessageReceived(msg)) 483 if (!handled && input_router_ && input_router_->OnMessageReceived(msg))
484 return true; 484 return true;
485 485
486 if (!handled && view_ && view_->OnMessageReceived(msg)) 486 if (!handled && view_ && view_->OnMessageReceived(msg))
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 1679
1680 void RenderWidgetHostImpl::OnTextInputTypeChanged( 1680 void RenderWidgetHostImpl::OnTextInputTypeChanged(
1681 ui::TextInputType type, 1681 ui::TextInputType type,
1682 ui::TextInputMode input_mode, 1682 ui::TextInputMode input_mode,
1683 bool can_compose_inline, 1683 bool can_compose_inline,
1684 int flags) { 1684 int flags) {
1685 if (view_) 1685 if (view_)
1686 view_->TextInputTypeChanged(type, input_mode, can_compose_inline, flags); 1686 view_->TextInputTypeChanged(type, input_mode, can_compose_inline, flags);
1687 } 1687 }
1688 1688
1689 #if defined(OS_MACOSX) || defined(USE_AURA) 1689 #if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
1690 void RenderWidgetHostImpl::OnImeCompositionRangeChanged( 1690 void RenderWidgetHostImpl::OnImeCompositionRangeChanged(
1691 const gfx::Range& range, 1691 const gfx::Range& range,
1692 const std::vector<gfx::Rect>& character_bounds) { 1692 const std::vector<gfx::Rect>& character_bounds) {
1693 if (view_) 1693 if (view_)
1694 view_->ImeCompositionRangeChanged(range, character_bounds); 1694 view_->ImeCompositionRangeChanged(range, character_bounds);
1695 } 1695 }
1696 #endif 1696 #endif
1697 1697
1698 void RenderWidgetHostImpl::OnImeCancelComposition() { 1698 void RenderWidgetHostImpl::OnImeCancelComposition() {
1699 if (view_) 1699 if (view_)
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
2397 } 2397 }
2398 #endif 2398 #endif
2399 2399
2400 SkColorType RenderWidgetHostImpl::PreferredReadbackFormat() { 2400 SkColorType RenderWidgetHostImpl::PreferredReadbackFormat() {
2401 if (view_) 2401 if (view_)
2402 return view_->PreferredReadbackFormat(); 2402 return view_->PreferredReadbackFormat();
2403 return kN32_SkColorType; 2403 return kN32_SkColorType;
2404 } 2404 }
2405 2405
2406 } // namespace content 2406 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698