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..b3a21e33e3db916c598a003f784fc84e4ad0c08c 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,18 @@ void RenderViewImpl::SendUpdateState(HistoryEntry* entry) { |
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
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 |
@@ -2646,7 +2658,7 @@ void RenderViewImpl::OnDragSourceSystemDragEnded() { |
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
|
} |
void RenderViewImpl::OnEnumerateDirectoryResponse( |