| 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_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/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 if (host_) { | 943 if (host_) { |
| 944 SynchronousCompositorImpl* compositor = | 944 SynchronousCompositorImpl* compositor = |
| 945 SynchronousCompositorImpl::FromID(host_->GetProcess()->GetID(), | 945 SynchronousCompositorImpl::FromID(host_->GetProcess()->GetID(), |
| 946 host_->GetRoutingID()); | 946 host_->GetRoutingID()); |
| 947 if (compositor) | 947 if (compositor) |
| 948 return compositor->HandleInputEvent(input_event); | 948 return compositor->HandleInputEvent(input_event); |
| 949 } | 949 } |
| 950 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 950 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 951 } | 951 } |
| 952 | 952 |
| 953 void RenderWidgetHostViewAndroid::OnAccessibilityNotifications( | 953 void RenderWidgetHostViewAndroid::OnAccessibilityEvents( |
| 954 const std::vector<AccessibilityHostMsg_NotificationParams>& params) { | 954 const std::vector<AccessibilityHostMsg_EventParams>& params) { |
| 955 if (!host_ || | 955 if (!host_ || |
| 956 host_->accessibility_mode() != AccessibilityModeComplete || | 956 host_->accessibility_mode() != AccessibilityModeComplete || |
| 957 !content_view_core_) { | 957 !content_view_core_) { |
| 958 return; | 958 return; |
| 959 } | 959 } |
| 960 | 960 |
| 961 if (!GetBrowserAccessibilityManager()) { | 961 if (!GetBrowserAccessibilityManager()) { |
| 962 SetBrowserAccessibilityManager( | 962 SetBrowserAccessibilityManager( |
| 963 new BrowserAccessibilityManagerAndroid( | 963 new BrowserAccessibilityManagerAndroid( |
| 964 content_view_core_->GetJavaObject(), | 964 content_view_core_->GetJavaObject(), |
| 965 BrowserAccessibilityManagerAndroid::GetEmptyDocument(), | 965 BrowserAccessibilityManagerAndroid::GetEmptyDocument(), |
| 966 this)); | 966 this)); |
| 967 } | 967 } |
| 968 GetBrowserAccessibilityManager()->OnAccessibilityNotifications(params); | 968 GetBrowserAccessibilityManager()->OnAccessibilityEvents(params); |
| 969 } | 969 } |
| 970 | 970 |
| 971 void RenderWidgetHostViewAndroid::SetAccessibilityFocus(int acc_obj_id) { | 971 void RenderWidgetHostViewAndroid::SetAccessibilityFocus(int acc_obj_id) { |
| 972 if (!host_) | 972 if (!host_) |
| 973 return; | 973 return; |
| 974 | 974 |
| 975 host_->AccessibilitySetFocus(acc_obj_id); | 975 host_->AccessibilitySetFocus(acc_obj_id); |
| 976 } | 976 } |
| 977 | 977 |
| 978 void RenderWidgetHostViewAndroid::AccessibilityDoDefaultAction(int acc_obj_id) { | 978 void RenderWidgetHostViewAndroid::AccessibilityDoDefaultAction(int acc_obj_id) { |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1287 // RenderWidgetHostView, public: | 1287 // RenderWidgetHostView, public: |
| 1288 | 1288 |
| 1289 // static | 1289 // static |
| 1290 RenderWidgetHostView* | 1290 RenderWidgetHostView* |
| 1291 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 1291 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
| 1292 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 1292 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
| 1293 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 1293 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| 1294 } | 1294 } |
| 1295 | 1295 |
| 1296 } // namespace content | 1296 } // namespace content |
| OLD | NEW |