Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(698)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1102743002: OverscrollGlow for mainThread-{CHROMIUM CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2006 matching lines...) Expand 10 before | Expand all | Expand 10 after
2017 // TODO(estade): hit test the event against focused node to make sure 2017 // TODO(estade): hit test the event against focused node to make sure
2018 // the tap actually hit the focused node. 2018 // the tap actually hit the focused node.
2019 blink::WebTextInputType text_input_type = 2019 blink::WebTextInputType text_input_type =
2020 GetWebView()->textInputInfo().type; 2020 GetWebView()->textInputInfo().type;
2021 2021
2022 Send(new ViewHostMsg_FocusedNodeTouched( 2022 Send(new ViewHostMsg_FocusedNodeTouched(
2023 routing_id(), text_input_type != blink::WebTextInputTypeNone)); 2023 routing_id(), text_input_type != blink::WebTextInputTypeNone));
2024 #endif 2024 #endif
2025 } 2025 }
2026 2026
2027 void RenderViewImpl::didOverScrollOnMainThread(
2028 const float& unusedDeltaX,
2029 const float& unusedDeltaY,
2030 const float& accumaltedRootOverScrollX,
2031 const float& accumaltedRootOverScrollY,
2032 const float& positionX,
2033 const float& positionY,
2034 const float& velocityX,
2035 const float& velocityY) {
2036 RenderWidget::didOverScrollOnMainThread(
2037 unusedDeltaX, unusedDeltaY, accumaltedRootOverScrollX,
2038 accumaltedRootOverScrollY, positionX, positionY, velocityX, velocityY);
2039 }
2040
2027 void RenderViewImpl::initializeLayerTreeView() { 2041 void RenderViewImpl::initializeLayerTreeView() {
2028 RenderWidget::initializeLayerTreeView(); 2042 RenderWidget::initializeLayerTreeView();
2029 RenderWidgetCompositor* rwc = compositor(); 2043 RenderWidgetCompositor* rwc = compositor();
2030 if (!rwc) 2044 if (!rwc)
2031 return; 2045 return;
2032 // TODO(dgozman): do this not for main frame, but for local frame roots. 2046 // TODO(dgozman): do this not for main frame, but for local frame roots.
2033 if (blink::WebDevToolsAgent* devToolsAgent = GetWebDevToolsAgent(webview())) 2047 if (blink::WebDevToolsAgent* devToolsAgent = GetWebDevToolsAgent(webview()))
2034 devToolsAgent->setLayerTreeId(rwc->GetLayerTreeId()); 2048 devToolsAgent->setLayerTreeId(rwc->GetLayerTreeId());
2035 2049
2036 bool use_threaded_event_handling = true; 2050 bool use_threaded_event_handling = true;
(...skipping 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after
3770 std::vector<gfx::Size> sizes; 3784 std::vector<gfx::Size> sizes;
3771 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3785 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3772 if (!url.isEmpty()) 3786 if (!url.isEmpty())
3773 urls.push_back( 3787 urls.push_back(
3774 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3788 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3775 } 3789 }
3776 SendUpdateFaviconURL(urls); 3790 SendUpdateFaviconURL(urls);
3777 } 3791 }
3778 3792
3779 } // namespace content 3793 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698