| 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 3079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3090 } | 3090 } |
| 3091 #endif | 3091 #endif |
| 3092 | 3092 |
| 3093 RenderWidget::didActivateCompositor(input_handler_identifier); | 3093 RenderWidget::didActivateCompositor(input_handler_identifier); |
| 3094 } | 3094 } |
| 3095 | 3095 |
| 3096 void RenderViewImpl::didHandleGestureEvent( | 3096 void RenderViewImpl::didHandleGestureEvent( |
| 3097 const WebGestureEvent& event, | 3097 const WebGestureEvent& event, |
| 3098 bool event_cancelled) { | 3098 bool event_cancelled) { |
| 3099 RenderWidget::didHandleGestureEvent(event, event_cancelled); | 3099 RenderWidget::didHandleGestureEvent(event, event_cancelled); |
| 3100 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3100 |
| 3101 DidHandleGestureEvent(event)); | 3101 if (event.type != blink::WebGestureEvent::GestureTap) |
| 3102 return; |
| 3103 |
| 3104 blink::WebTextInputType text_input_type = |
| 3105 GetWebView()->textInputInfo().type; |
| 3106 |
| 3107 Send(new ViewHostMsg_FocusedNodeTouched( |
| 3108 routing_id(), text_input_type != blink::WebTextInputTypeNone)); |
| 3102 } | 3109 } |
| 3103 | 3110 |
| 3104 void RenderViewImpl::initializeLayerTreeView() { | 3111 void RenderViewImpl::initializeLayerTreeView() { |
| 3105 RenderWidget::initializeLayerTreeView(); | 3112 RenderWidget::initializeLayerTreeView(); |
| 3106 RenderWidgetCompositor* rwc = compositor(); | 3113 RenderWidgetCompositor* rwc = compositor(); |
| 3107 if (!rwc || !webview() || !webview()->devToolsAgent()) | 3114 if (!rwc || !webview() || !webview()->devToolsAgent()) |
| 3108 return; | 3115 return; |
| 3109 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); | 3116 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); |
| 3110 } | 3117 } |
| 3111 | 3118 |
| (...skipping 3567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6679 for (size_t i = 0; i < icon_urls.size(); i++) { | 6686 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6680 WebURL url = icon_urls[i].iconURL(); | 6687 WebURL url = icon_urls[i].iconURL(); |
| 6681 if (!url.isEmpty()) | 6688 if (!url.isEmpty()) |
| 6682 urls.push_back(FaviconURL(url, | 6689 urls.push_back(FaviconURL(url, |
| 6683 ToFaviconType(icon_urls[i].iconType()))); | 6690 ToFaviconType(icon_urls[i].iconType()))); |
| 6684 } | 6691 } |
| 6685 SendUpdateFaviconURL(urls); | 6692 SendUpdateFaviconURL(urls); |
| 6686 } | 6693 } |
| 6687 | 6694 |
| 6688 } // namespace content | 6695 } // namespace content |
| OLD | NEW |