Setting Accurate ScrollResult from Blink for Elastic Scroll.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 744 matching lines @@
 
   webview()->setDeviceScaleFactor(device_scale_factor_);
   webview()->setDisplayMode(display_mode_);
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
   webview()->settings()->setThreadedScrollingEnabled(
       !command_line.HasSwitch(switches::kDisableThreadedScrolling));
   webview()->settings()->setRootLayerScrolls(
       command_line.HasSwitch(switches::kRootLayerScrolls));
 
-  ApplyWebPreferences(webkit_preferences_, webview());
+  ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_);
 
   if (switches::IsTouchDragDropEnabled())
     webview()->settings()->setTouchDragDropEnabled(true);
 
   if (switches::IsTouchEditingEnabled())
     webview()->settings()->setTouchEditingEnabled(true);
 
   WebSettings::SelectionStrategyType selection_strategy =
       WebSettings::SelectionStrategyType::Character;
   const std::string selection_strategy_str =
@@ skipping 124 matching lines @@
 /*static*/
 void RenderView::ForEach(RenderViewVisitor* visitor) {
   ViewMap* views = g_view_map.Pointer();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it) {
     if (!visitor->Visit(it->second))
       return;
   }
 }
 
 /*static*/
-void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
-                                     WebView* web_view) {
+void RenderView::ApplyWebPreferencesInternal(
+    const WebPreferences& prefs,
+    WebView* web_view,
+    CompositorDependencies* compositor_deps) {
   WebSettings* settings = web_view->settings();
   ApplyFontsFromMap(prefs.standard_font_family_map,
                     SetStandardFontFamilyWrapper, settings);
   ApplyFontsFromMap(prefs.fixed_font_family_map,
                     SetFixedFontFamilyWrapper, settings);
   ApplyFontsFromMap(prefs.serif_font_family_map,
                     SetSerifFontFamilyWrapper, settings);
   ApplyFontsFromMap(prefs.sans_serif_font_family_map,
                     SetSansSerifFontFamilyWrapper, settings);
   ApplyFontsFromMap(prefs.cursive_font_family_map,
@@ skipping 205 matching lines @@
   WebNetworkStateNotifier::setWebConnectionType(
       NetConnectionTypeToWebConnectionType(prefs.connection_type));
 
   settings->setPinchOverlayScrollbarThickness(
       prefs.pinch_overlay_scrollbar_thickness);
   settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
 
   settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
 
 #if defined(OS_MACOSX)
+#if !defined(OS_IOS)
+  bool is_elastic_overscroll_enabled =
+      compositor_deps ? compositor_deps->IsElasticOverscrollEnabled() : false;
+  settings->setReportWheelOverscroll(is_elastic_overscroll_enabled);
+#endif
   settings->setDoubleTapToZoomEnabled(true);
   web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor);
 #endif
 }
 
 /*static*/
 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params,
                                        CompositorDependencies* compositor_deps,
                                        bool was_created_by_renderer) {
   DCHECK(params.view_id != MSG_ROUTING_NONE);
@@ skipping 1492 matching lines @@
                                        WebDragOperation op) {
   webview()->dragSourceEndedAt(client_point, screen_point, op);
 }
 
 void RenderViewImpl::OnDragSourceSystemDragEnded() {
   webview()->dragSourceSystemDragEnded();
 }
 
 void RenderViewImpl::OnUpdateWebPreferences(const WebPreferences& prefs) {
   webkit_preferences_ = prefs;
-  ApplyWebPreferences(webkit_preferences_, webview());
+  ApplyWebPreferencesInternal(webkit_preferences_, webview(), NULL);
 }
 
 void RenderViewImpl::OnEnumerateDirectoryResponse(
     int id,
     const std::vector<base::FilePath>& paths) {
   if (!enumeration_completions_[id])
     return;
 
   WebVector<WebString> ws_file_names(paths.size());
   for (size_t i = 0; i < paths.size(); ++i)
@@ skipping 1136 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content