| 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 3037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3048 } | 3048 } |
| 3049 #endif | 3049 #endif |
| 3050 | 3050 |
| 3051 RenderWidget::didActivateCompositor(input_handler_identifier); | 3051 RenderWidget::didActivateCompositor(input_handler_identifier); |
| 3052 } | 3052 } |
| 3053 | 3053 |
| 3054 void RenderViewImpl::didHandleGestureEvent( | 3054 void RenderViewImpl::didHandleGestureEvent( |
| 3055 const WebGestureEvent& event, | 3055 const WebGestureEvent& event, |
| 3056 bool event_cancelled) { | 3056 bool event_cancelled) { |
| 3057 RenderWidget::didHandleGestureEvent(event, event_cancelled); | 3057 RenderWidget::didHandleGestureEvent(event, event_cancelled); |
| 3058 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3058 |
| 3059 DidHandleGestureEvent(event)); | 3059 if (event.type != blink::WebGestureEvent::GestureTap) |
| 3060 return; |
| 3061 |
| 3062 blink::WebTextInputType text_input_type = |
| 3063 GetWebView()->textInputInfo().type; |
| 3064 |
| 3065 Send(new ViewHostMsg_FocusedNodeTouched( |
| 3066 routing_id(), text_input_type != blink::WebTextInputTypeNone)); |
| 3060 } | 3067 } |
| 3061 | 3068 |
| 3062 void RenderViewImpl::initializeLayerTreeView() { | 3069 void RenderViewImpl::initializeLayerTreeView() { |
| 3063 RenderWidget::initializeLayerTreeView(); | 3070 RenderWidget::initializeLayerTreeView(); |
| 3064 RenderWidgetCompositor* rwc = compositor(); | 3071 RenderWidgetCompositor* rwc = compositor(); |
| 3065 if (!rwc || !webview() || !webview()->devToolsAgent()) | 3072 if (!rwc || !webview() || !webview()->devToolsAgent()) |
| 3066 return; | 3073 return; |
| 3067 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); | 3074 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); |
| 3068 } | 3075 } |
| 3069 | 3076 |
| (...skipping 3531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6601 for (size_t i = 0; i < icon_urls.size(); i++) { | 6608 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6602 WebURL url = icon_urls[i].iconURL(); | 6609 WebURL url = icon_urls[i].iconURL(); |
| 6603 if (!url.isEmpty()) | 6610 if (!url.isEmpty()) |
| 6604 urls.push_back(FaviconURL(url, | 6611 urls.push_back(FaviconURL(url, |
| 6605 ToFaviconType(icon_urls[i].iconType()))); | 6612 ToFaviconType(icon_urls[i].iconType()))); |
| 6606 } | 6613 } |
| 6607 SendUpdateFaviconURL(urls); | 6614 SendUpdateFaviconURL(urls); |
| 6608 } | 6615 } |
| 6609 | 6616 |
| 6610 } // namespace content | 6617 } // namespace content |
| OLD | NEW |