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

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

Issue 784503002: Revert "Plumb composition character bounds from C++ to Java" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 gesture_provider_.SetMultiTouchZoomSupportEnabled(enabled); 828 gesture_provider_.SetMultiTouchZoomSupportEnabled(enabled);
829 } 829 }
830 830
831 void RenderWidgetHostViewAndroid::ImeCancelComposition() { 831 void RenderWidgetHostViewAndroid::ImeCancelComposition() {
832 ime_adapter_android_.CancelComposition(); 832 ime_adapter_android_.CancelComposition();
833 } 833 }
834 834
835 void RenderWidgetHostViewAndroid::ImeCompositionRangeChanged( 835 void RenderWidgetHostViewAndroid::ImeCompositionRangeChanged(
836 const gfx::Range& range, 836 const gfx::Range& range,
837 const std::vector<gfx::Rect>& character_bounds) { 837 const std::vector<gfx::Rect>& character_bounds) {
838 ime_adapter_android_.SetCharacterBounds(character_bounds); 838 // TODO(yukawa): Implement this.
839 } 839 }
840 840
841 void RenderWidgetHostViewAndroid::FocusedNodeChanged(bool is_editable_node) { 841 void RenderWidgetHostViewAndroid::FocusedNodeChanged(bool is_editable_node) {
842 ime_adapter_android_.FocusedNodeChanged(is_editable_node); 842 ime_adapter_android_.FocusedNodeChanged(is_editable_node);
843 if (selection_controller_) 843 if (selection_controller_)
844 selection_controller_->OnSelectionEditable(is_editable_node); 844 selection_controller_->OnSelectionEditable(is_editable_node);
845 } 845 }
846 846
847 void RenderWidgetHostViewAndroid::RenderProcessGone( 847 void RenderWidgetHostViewAndroid::RenderProcessGone(
848 base::TerminationStatus status, int error_code) { 848 base::TerminationStatus status, int error_code) {
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
1887 results->orientationAngle = display.RotationAsDegree(); 1887 results->orientationAngle = display.RotationAsDegree();
1888 results->orientationType = 1888 results->orientationType =
1889 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display); 1889 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
1890 gfx::DeviceDisplayInfo info; 1890 gfx::DeviceDisplayInfo info;
1891 results->depth = info.GetBitsPerPixel(); 1891 results->depth = info.GetBitsPerPixel();
1892 results->depthPerComponent = info.GetBitsPerComponent(); 1892 results->depthPerComponent = info.GetBitsPerComponent();
1893 results->isMonochrome = (results->depthPerComponent == 0); 1893 results->isMonochrome = (results->depthPerComponent == 0);
1894 } 1894 }
1895 1895
1896 } // namespace content 1896 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698