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 720 matching lines @@
     return;
 
   // Don't send state updates for kSwappedOutURL.
   if (entry->root().urlString() == WebString::fromUTF8(kSwappedOutURL))
     return;
 
   Send(new ViewHostMsg_UpdateState(
       routing_id_, page_id_, HistoryEntryToPageState(entry)));
 }
 
+void RenderViewImpl::ApplyWebPreferencesInternal(
+    const WebPreferences& prefs,
+    WebView* web_view,
+    CompositorDependencies* compositor_deps) {
+  ApplyWebPreferences(prefs, web_view);
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  bool is_elastic_overscroll_enabled =
+      compositor_deps ? compositor_deps->IsElasticOverscrollEnabled() : false;

[piman, 2015/07/01 20:30:46]

DCHECK(compositor_deps) instead. When called from a RenderViewImpl, it should
always be there.

[MuVen, 2015/07/02 13:52:47]

Done.

+  web_view->settings()->setReportWheelOverscroll(is_elastic_overscroll_enabled);
+#endif
+}
+
 bool RenderViewImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
   // Before WebKit asks us to show an alert (etc.), it takes care of doing the
   // equivalent of WebView::willEnterModalLoop.  In the case of showModalDialog
   // it is particularly important that we do not call willEnterModalLoop as
   // that would defer resource loads for the dialog itself.
   if (RenderThreadImpl::current())  // Will be NULL during unit tests.
     RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   return Send(message);
@@ skipping 1123 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);

[piman, 2015/07/01 20:30:46]

compositor_deps_ instead of NULL.

[MuVen, 2015/07/02 13:52:47]

Done.

[MuVen, 2015/07/02 18:11:20]

Missed in the patch 11. Addressed this comment in patch 12.

 }
 
 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