| 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 2599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2610 RenderThreadImpl::current()->input_handler_manager(); | 2610 RenderThreadImpl::current()->input_handler_manager(); |
| 2611 if (input_handler_manager) { | 2611 if (input_handler_manager) { |
| 2612 input_handler_manager->AddInputHandler( | 2612 input_handler_manager->AddInputHandler( |
| 2613 routing_id_, | 2613 routing_id_, |
| 2614 compositor_->GetInputHandler(), | 2614 compositor_->GetInputHandler(), |
| 2615 AsWeakPtr()); | 2615 AsWeakPtr()); |
| 2616 } | 2616 } |
| 2617 #endif | 2617 #endif |
| 2618 | 2618 |
| 2619 RenderWidget::didActivateCompositor(input_handler_identifier); | 2619 RenderWidget::didActivateCompositor(input_handler_identifier); |
| 2620 | |
| 2621 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | |
| 2622 DidActivateCompositor(input_handler_identifier)); | |
| 2623 } | 2620 } |
| 2624 | 2621 |
| 2625 void RenderViewImpl::didHandleGestureEvent( | 2622 void RenderViewImpl::didHandleGestureEvent( |
| 2626 const WebGestureEvent& event, | 2623 const WebGestureEvent& event, |
| 2627 bool event_cancelled) { | 2624 bool event_cancelled) { |
| 2628 RenderWidget::didHandleGestureEvent(event, event_cancelled); | 2625 RenderWidget::didHandleGestureEvent(event, event_cancelled); |
| 2629 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 2626 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
| 2630 DidHandleGestureEvent(event)); | 2627 DidHandleGestureEvent(event)); |
| 2631 } | 2628 } |
| 2632 | 2629 |
| (...skipping 3907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6540 WebURL url = icon_urls[i].iconURL(); | 6537 WebURL url = icon_urls[i].iconURL(); |
| 6541 if (!url.isEmpty()) | 6538 if (!url.isEmpty()) |
| 6542 urls.push_back(FaviconURL(url, | 6539 urls.push_back(FaviconURL(url, |
| 6543 ToFaviconType(icon_urls[i].iconType()))); | 6540 ToFaviconType(icon_urls[i].iconType()))); |
| 6544 } | 6541 } |
| 6545 SendUpdateFaviconURL(urls); | 6542 SendUpdateFaviconURL(urls); |
| 6546 } | 6543 } |
| 6547 | 6544 |
| 6548 | 6545 |
| 6549 } // namespace content | 6546 } // namespace content |
| OLD | NEW |