| 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 1918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1929 // render_thread may be NULL in tests. | 1929 // render_thread may be NULL in tests. |
| 1930 InputHandlerManager* input_handler_manager = | 1930 InputHandlerManager* input_handler_manager = |
| 1931 render_thread ? render_thread->input_handler_manager() : NULL; | 1931 render_thread ? render_thread->input_handler_manager() : NULL; |
| 1932 if (input_handler_manager) { | 1932 if (input_handler_manager) { |
| 1933 input_handler_manager->AddInputHandler( | 1933 input_handler_manager->AddInputHandler( |
| 1934 routing_id_, | 1934 routing_id_, |
| 1935 compositor_->GetInputHandler(), | 1935 compositor_->GetInputHandler(), |
| 1936 AsWeakPtr()); | 1936 AsWeakPtr()); |
| 1937 } | 1937 } |
| 1938 #endif | 1938 #endif |
| 1939 | |
| 1940 RenderWidget::didActivateCompositor(); | |
| 1941 } | 1939 } |
| 1942 | 1940 |
| 1943 void RenderViewImpl::didHandleGestureEvent( | 1941 void RenderViewImpl::didHandleGestureEvent( |
| 1944 const WebGestureEvent& event, | 1942 const WebGestureEvent& event, |
| 1945 bool event_cancelled) { | 1943 bool event_cancelled) { |
| 1946 RenderWidget::didHandleGestureEvent(event, event_cancelled); | 1944 RenderWidget::didHandleGestureEvent(event, event_cancelled); |
| 1947 | 1945 |
| 1948 if (event.type != blink::WebGestureEvent::GestureTap) | 1946 if (event.type != blink::WebGestureEvent::GestureTap) |
| 1949 return; | 1947 return; |
| 1950 | 1948 |
| (...skipping 2112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4063 std::vector<gfx::Size> sizes; | 4061 std::vector<gfx::Size> sizes; |
| 4064 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4062 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4065 if (!url.isEmpty()) | 4063 if (!url.isEmpty()) |
| 4066 urls.push_back( | 4064 urls.push_back( |
| 4067 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4065 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4068 } | 4066 } |
| 4069 SendUpdateFaviconURL(urls); | 4067 SendUpdateFaviconURL(urls); |
| 4070 } | 4068 } |
| 4071 | 4069 |
| 4072 } // namespace content | 4070 } // namespace content |
| OLD | NEW |