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

Unified 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: addressed piman comments Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index bb881cbbd0bdf2581d61e758bd9e8c9974b8a082..3f6618ca964120967b207168c85f98f385b9d113 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -762,7 +762,7 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
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);
@@ -1503,6 +1503,19 @@ void RenderViewImpl::SendUpdateState(HistoryEntry* entry) {
routing_id_, page_id_, HistoryEntryToPageState(entry)));
}
+void RenderViewImpl::ApplyWebPreferencesInternal(
+ const WebPreferences& prefs,
+ blink::WebView* web_view,
+ CompositorDependencies* compositor_deps) {
+ ApplyWebPreferences(prefs, web_view);
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ DCHECK(compositor_deps);
+ bool is_elastic_overscroll_enabled =
+ compositor_deps->IsElasticOverscrollEnabled();
+ 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
@@ -2646,7 +2659,7 @@ void RenderViewImpl::OnDragSourceSystemDragEnded() {
void RenderViewImpl::OnUpdateWebPreferences(const WebPreferences& prefs) {
webkit_preferences_ = prefs;
- ApplyWebPreferences(webkit_preferences_, webview());
+ ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_);
}
void RenderViewImpl::OnEnumerateDirectoryResponse(

Powered by Google App Engine
This is Rietveld 408576698