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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 | 213 |
214 #if defined(OS_ANDROID) | 214 #if defined(OS_ANDROID) |
215 #include <cpu-features.h> | 215 #include <cpu-features.h> |
216 | 216 |
217 #include "content/common/android/device_telephony_info.h" | 217 #include "content/common/android/device_telephony_info.h" |
218 #include "content/common/gpu/client/context_provider_command_buffer.h" | 218 #include "content/common/gpu/client/context_provider_command_buffer.h" |
219 #include "content/renderer/android/address_detector.h" | 219 #include "content/renderer/android/address_detector.h" |
220 #include "content/renderer/android/content_detector.h" | 220 #include "content/renderer/android/content_detector.h" |
221 #include "content/renderer/android/email_detector.h" | 221 #include "content/renderer/android/email_detector.h" |
222 #include "content/renderer/android/phone_number_detector.h" | 222 #include "content/renderer/android/phone_number_detector.h" |
| 223 #include "content/renderer/android/synchronous_compositor_impl.h" |
223 #include "content/renderer/media/stream_texture_factory_impl_android.h" | 224 #include "content/renderer/media/stream_texture_factory_impl_android.h" |
224 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" | 225 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" |
225 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 226 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
226 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 227 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
227 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" | 228 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" |
228 #include "ui/gfx/rect_f.h" | 229 #include "ui/gfx/rect_f.h" |
229 #include "webkit/media/android/webmediaplayer_android.h" | 230 #include "webkit/media/android/webmediaplayer_android.h" |
230 #include "webkit/media/android/webmediaplayer_manager_android.h" | 231 #include "webkit/media/android/webmediaplayer_manager_android.h" |
231 #elif defined(OS_WIN) | 232 #elif defined(OS_WIN) |
232 // TODO(port): these files are currently Windows only because they concern: | 233 // TODO(port): these files are currently Windows only because they concern: |
(...skipping 2387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2620 InputHandlerManager* input_handler_manager = | 2621 InputHandlerManager* input_handler_manager = |
2621 RenderThreadImpl::current()->input_handler_manager(); | 2622 RenderThreadImpl::current()->input_handler_manager(); |
2622 if (input_handler_manager) { | 2623 if (input_handler_manager) { |
2623 input_handler_manager->AddInputHandler( | 2624 input_handler_manager->AddInputHandler( |
2624 routing_id_, | 2625 routing_id_, |
2625 compositor_->GetInputHandler(), | 2626 compositor_->GetInputHandler(), |
2626 AsWeakPtr()); | 2627 AsWeakPtr()); |
2627 } | 2628 } |
2628 #endif | 2629 #endif |
2629 | 2630 |
| 2631 #if defined(OS_ANDROID) |
| 2632 if (input_handler_manager && GetSynchronousCompositor()) { |
| 2633 input_handler_manager->SetRootLayerScrollDelegate( |
| 2634 routing_id_, GetSynchronousCompositor()); |
| 2635 } |
| 2636 #endif |
| 2637 |
2630 RenderWidget::didActivateCompositor(input_handler_identifier); | 2638 RenderWidget::didActivateCompositor(input_handler_identifier); |
2631 } | 2639 } |
2632 | 2640 |
2633 void RenderViewImpl::didHandleGestureEvent( | 2641 void RenderViewImpl::didHandleGestureEvent( |
2634 const WebGestureEvent& event, | 2642 const WebGestureEvent& event, |
2635 bool event_cancelled) { | 2643 bool event_cancelled) { |
2636 RenderWidget::didHandleGestureEvent(event, event_cancelled); | 2644 RenderWidget::didHandleGestureEvent(event, event_cancelled); |
2637 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 2645 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
2638 DidHandleGestureEvent(event)); | 2646 DidHandleGestureEvent(event)); |
2639 } | 2647 } |
(...skipping 3925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6565 WebURL url = icon_urls[i].iconURL(); | 6573 WebURL url = icon_urls[i].iconURL(); |
6566 if (!url.isEmpty()) | 6574 if (!url.isEmpty()) |
6567 urls.push_back(FaviconURL(url, | 6575 urls.push_back(FaviconURL(url, |
6568 ToFaviconType(icon_urls[i].iconType()))); | 6576 ToFaviconType(icon_urls[i].iconType()))); |
6569 } | 6577 } |
6570 SendUpdateFaviconURL(urls); | 6578 SendUpdateFaviconURL(urls); |
6571 } | 6579 } |
6572 | 6580 |
6573 | 6581 |
6574 } // namespace content | 6582 } // namespace content |
OLD | NEW |