| OLD | NEW |
| 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 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 settings->setPinchOverlayScrollbarThickness( | 1106 settings->setPinchOverlayScrollbarThickness( |
| 1107 prefs.pinch_overlay_scrollbar_thickness); | 1107 prefs.pinch_overlay_scrollbar_thickness); |
| 1108 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1108 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1109 | 1109 |
| 1110 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1110 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
| 1111 | 1111 |
| 1112 #if defined(OS_MACOSX) | 1112 #if defined(OS_MACOSX) |
| 1113 settings->setDoubleTapToZoomEnabled(true); | 1113 settings->setDoubleTapToZoomEnabled(true); |
| 1114 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1114 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
| 1115 #endif | 1115 #endif |
| 1116 |
| 1117 settings->setWheelGesturesEnabled(UseGestureBasedWheelScrolling()); |
| 1116 } | 1118 } |
| 1117 | 1119 |
| 1118 /*static*/ | 1120 /*static*/ |
| 1119 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, | 1121 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, |
| 1120 const ViewMsg_New_Params& params, | 1122 const ViewMsg_New_Params& params, |
| 1121 bool was_created_by_renderer) { | 1123 bool was_created_by_renderer) { |
| 1122 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1124 DCHECK(params.view_id != MSG_ROUTING_NONE); |
| 1123 RenderViewImpl* render_view = NULL; | 1125 RenderViewImpl* render_view = NULL; |
| 1124 if (g_create_render_view_impl) | 1126 if (g_create_render_view_impl) |
| 1125 render_view = g_create_render_view_impl(compositor_deps, params); | 1127 render_view = g_create_render_view_impl(compositor_deps, params); |
| (...skipping 2313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3439 if (IsUseZoomForDSFEnabled()) { | 3441 if (IsUseZoomForDSFEnabled()) { |
| 3440 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3442 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
| 3441 } else { | 3443 } else { |
| 3442 webview()->setDeviceScaleFactor(device_scale_factor_); | 3444 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 3443 } | 3445 } |
| 3444 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3446 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 3445 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3447 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 3446 } | 3448 } |
| 3447 | 3449 |
| 3448 } // namespace content | 3450 } // namespace content |
| OLD | NEW |