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

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

Issue 1203693003: Setting Accurate ScrollResult from Blink for Elastic Scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased to latest Created 5 years, 5 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
« no previous file with comments | « no previous file | content/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 WebNetworkStateNotifier::setWebConnectionType( 1127 WebNetworkStateNotifier::setWebConnectionType(
1128 NetConnectionTypeToWebConnectionType(prefs.connection_type)); 1128 NetConnectionTypeToWebConnectionType(prefs.connection_type));
1129 1129
1130 settings->setPinchOverlayScrollbarThickness( 1130 settings->setPinchOverlayScrollbarThickness(
1131 prefs.pinch_overlay_scrollbar_thickness); 1131 prefs.pinch_overlay_scrollbar_thickness);
1132 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 1132 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
1133 1133
1134 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); 1134 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
1135 1135
1136 #if defined(OS_MACOSX) 1136 #if defined(OS_MACOSX)
1137 #if !defined(OS_IOS)
1138 bool is_elastic_overscroll_enabled =
1139 RenderViewImpl::FromWebView(web_view)
1140 ? RenderViewImpl::FromWebView(web_view)->IsElasticOverscrollEnabled()
piman 2015/06/30 21:30:00 RenderViewImpl will disappear in the future (out-o
MuVen 2015/07/01 13:23:21 Done. PTAL.
1141 : false;
1142 settings->setReportWheelOverscroll(is_elastic_overscroll_enabled);
1143 #endif
1137 settings->setDoubleTapToZoomEnabled(true); 1144 settings->setDoubleTapToZoomEnabled(true);
1138 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); 1145 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor);
1139 #endif 1146 #endif
1140 } 1147 }
1141 1148
1142 /*static*/ 1149 /*static*/
1143 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, 1150 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params,
1144 CompositorDependencies* compositor_deps, 1151 CompositorDependencies* compositor_deps,
1145 bool was_created_by_renderer) { 1152 bool was_created_by_renderer) {
1146 DCHECK(params.view_id != MSG_ROUTING_NONE); 1153 DCHECK(params.view_id != MSG_ROUTING_NONE);
(...skipping 2649 matching lines...) Expand 10 before | Expand all | Expand 10 after
3796 std::vector<gfx::Size> sizes; 3803 std::vector<gfx::Size> sizes;
3797 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3804 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3798 if (!url.isEmpty()) 3805 if (!url.isEmpty())
3799 urls.push_back( 3806 urls.push_back(
3800 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3807 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3801 } 3808 }
3802 SendUpdateFaviconURL(urls); 3809 SendUpdateFaviconURL(urls);
3803 } 3810 }
3804 3811
3805 } // namespace content 3812 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698