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 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2019 // TODO(estade): hit test the event against focused node to make sure | 2019 // TODO(estade): hit test the event against focused node to make sure |
2020 // the tap actually hit the focused node. | 2020 // the tap actually hit the focused node. |
2021 blink::WebTextInputType text_input_type = | 2021 blink::WebTextInputType text_input_type = |
2022 GetWebView()->textInputInfo().type; | 2022 GetWebView()->textInputInfo().type; |
2023 | 2023 |
2024 Send(new ViewHostMsg_FocusedNodeTouched( | 2024 Send(new ViewHostMsg_FocusedNodeTouched( |
2025 routing_id(), text_input_type != blink::WebTextInputTypeNone)); | 2025 routing_id(), text_input_type != blink::WebTextInputTypeNone)); |
2026 #endif | 2026 #endif |
2027 } | 2027 } |
2028 | 2028 |
| 2029 void RenderViewImpl::didOverscroll( |
| 2030 const blink::WebFloatSize& unusedDelta, |
| 2031 const blink::WebFloatSize& accumulatedRootOverScroll, |
| 2032 const blink::WebFloatPoint& position, |
| 2033 const blink::WebFloatSize& velocity) { |
| 2034 RenderWidget::didOverscroll( |
| 2035 gfx::Vector2dF(unusedDelta.width, unusedDelta.height), |
| 2036 gfx::Vector2dF(accumulatedRootOverScroll.width, |
| 2037 accumulatedRootOverScroll.height), |
| 2038 gfx::PointF(position.x, position.y), |
| 2039 gfx::Vector2dF(velocity.width, velocity.height)); |
| 2040 } |
| 2041 |
2029 void RenderViewImpl::initializeLayerTreeView() { | 2042 void RenderViewImpl::initializeLayerTreeView() { |
2030 RenderWidget::initializeLayerTreeView(); | 2043 RenderWidget::initializeLayerTreeView(); |
2031 RenderWidgetCompositor* rwc = compositor(); | 2044 RenderWidgetCompositor* rwc = compositor(); |
2032 if (!rwc) | 2045 if (!rwc) |
2033 return; | 2046 return; |
2034 | 2047 |
2035 bool use_threaded_event_handling = true; | 2048 bool use_threaded_event_handling = true; |
2036 #if defined(OS_MACOSX) && !defined(OS_IOS) | 2049 #if defined(OS_MACOSX) && !defined(OS_IOS) |
2037 // Disable threaded event handling if content is not handling the elastic | 2050 // Disable threaded event handling if content is not handling the elastic |
2038 // overscroll effect. This includes the cases where the elastic overscroll | 2051 // overscroll effect. This includes the cases where the elastic overscroll |
(...skipping 1728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3767 std::vector<gfx::Size> sizes; | 3780 std::vector<gfx::Size> sizes; |
3768 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3781 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3769 if (!url.isEmpty()) | 3782 if (!url.isEmpty()) |
3770 urls.push_back( | 3783 urls.push_back( |
3771 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3784 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3772 } | 3785 } |
3773 SendUpdateFaviconURL(urls); | 3786 SendUpdateFaviconURL(urls); |
3774 } | 3787 } |
3775 | 3788 |
3776 } // namespace content | 3789 } // namespace content |
OLD | NEW |