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 2957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2968 | 2968 |
2969 void RenderViewImpl::requestPointerUnlock() { | 2969 void RenderViewImpl::requestPointerUnlock() { |
2970 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); | 2970 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); |
2971 } | 2971 } |
2972 | 2972 |
2973 bool RenderViewImpl::isPointerLocked() { | 2973 bool RenderViewImpl::isPointerLocked() { |
2974 return mouse_lock_dispatcher_->IsMouseLockedTo( | 2974 return mouse_lock_dispatcher_->IsMouseLockedTo( |
2975 webwidget_mouse_lock_target_.get()); | 2975 webwidget_mouse_lock_target_.get()); |
2976 } | 2976 } |
2977 | 2977 |
2978 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { | 2978 void RenderViewImpl::didActivateCompositor() { |
2979 #if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003 | 2979 #if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003 |
2980 InputHandlerManager* input_handler_manager = | 2980 InputHandlerManager* input_handler_manager = |
2981 RenderThreadImpl::current()->input_handler_manager(); | 2981 RenderThreadImpl::current()->input_handler_manager(); |
2982 if (input_handler_manager) { | 2982 if (input_handler_manager) { |
2983 input_handler_manager->AddInputHandler( | 2983 input_handler_manager->AddInputHandler( |
2984 routing_id_, | 2984 routing_id_, |
2985 compositor_->GetInputHandler(), | 2985 compositor_->GetInputHandler(), |
2986 AsWeakPtr()); | 2986 AsWeakPtr()); |
2987 } | 2987 } |
2988 #endif | 2988 #endif |
2989 | 2989 |
2990 RenderWidget::didActivateCompositor(input_handler_identifier); | 2990 RenderWidget::didActivateCompositor(); |
2991 } | 2991 } |
2992 | 2992 |
2993 void RenderViewImpl::didHandleGestureEvent( | 2993 void RenderViewImpl::didHandleGestureEvent( |
2994 const WebGestureEvent& event, | 2994 const WebGestureEvent& event, |
2995 bool event_cancelled) { | 2995 bool event_cancelled) { |
2996 RenderWidget::didHandleGestureEvent(event, event_cancelled); | 2996 RenderWidget::didHandleGestureEvent(event, event_cancelled); |
2997 | 2997 |
2998 if (event.type != blink::WebGestureEvent::GestureTap) | 2998 if (event.type != blink::WebGestureEvent::GestureTap) |
2999 return; | 2999 return; |
3000 | 3000 |
(...skipping 3466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6467 for (size_t i = 0; i < icon_urls.size(); i++) { | 6467 for (size_t i = 0; i < icon_urls.size(); i++) { |
6468 WebURL url = icon_urls[i].iconURL(); | 6468 WebURL url = icon_urls[i].iconURL(); |
6469 if (!url.isEmpty()) | 6469 if (!url.isEmpty()) |
6470 urls.push_back(FaviconURL(url, | 6470 urls.push_back(FaviconURL(url, |
6471 ToFaviconType(icon_urls[i].iconType()))); | 6471 ToFaviconType(icon_urls[i].iconType()))); |
6472 } | 6472 } |
6473 SendUpdateFaviconURL(urls); | 6473 SendUpdateFaviconURL(urls); |
6474 } | 6474 } |
6475 | 6475 |
6476 } // namespace content | 6476 } // namespace content |
OLD | NEW |