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 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1106 settings->setViewportMetaZeroValuesQuirk( | 1106 settings->setViewportMetaZeroValuesQuirk( |
1107 prefs.viewport_meta_zero_values_quirk); | 1107 prefs.viewport_meta_zero_values_quirk); |
1108 settings->setClobberUserAgentInitialScaleQuirk( | 1108 settings->setClobberUserAgentInitialScaleQuirk( |
1109 prefs.clobber_user_agent_initial_scale_quirk); | 1109 prefs.clobber_user_agent_initial_scale_quirk); |
1110 settings->setIgnoreMainFrameOverflowHiddenQuirk( | 1110 settings->setIgnoreMainFrameOverflowHiddenQuirk( |
1111 prefs.ignore_main_frame_overflow_hidden_quirk); | 1111 prefs.ignore_main_frame_overflow_hidden_quirk); |
1112 settings->setReportScreenSizeInPhysicalPixelsQuirk( | 1112 settings->setReportScreenSizeInPhysicalPixelsQuirk( |
1113 prefs.report_screen_size_in_physical_pixels_quirk); | 1113 prefs.report_screen_size_in_physical_pixels_quirk); |
1114 settings->setShouldReuseGlobalForUnownedMainFrame( | 1114 settings->setShouldReuseGlobalForUnownedMainFrame( |
1115 prefs.resue_global_for_unowned_main_frame); | 1115 prefs.resue_global_for_unowned_main_frame); |
| 1116 settings->setProgressBarCompletion( |
| 1117 static_cast<WebSettings::ProgressBarCompletion>( |
| 1118 prefs.progress_bar_completion)); |
1116 settings->setPreferHiddenVolumeControls(true); | 1119 settings->setPreferHiddenVolumeControls(true); |
1117 settings->setShrinksViewportContentToFit(true); | 1120 settings->setShrinksViewportContentToFit(true); |
1118 #endif | 1121 #endif |
1119 | 1122 |
1120 settings->setAutoplayExperimentMode( | 1123 settings->setAutoplayExperimentMode( |
1121 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode)); | 1124 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode)); |
1122 | 1125 |
1123 settings->setViewportEnabled(prefs.viewport_enabled); | 1126 settings->setViewportEnabled(prefs.viewport_enabled); |
1124 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); | 1127 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); |
1125 settings->setViewportStyle( | 1128 settings->setViewportStyle( |
(...skipping 2324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3450 if (IsUseZoomForDSFEnabled()) { | 3453 if (IsUseZoomForDSFEnabled()) { |
3451 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3454 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
3452 } else { | 3455 } else { |
3453 webview()->setDeviceScaleFactor(device_scale_factor_); | 3456 webview()->setDeviceScaleFactor(device_scale_factor_); |
3454 } | 3457 } |
3455 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3458 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
3456 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3459 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
3457 } | 3460 } |
3458 | 3461 |
3459 } // namespace content | 3462 } // namespace content |
OLD | NEW |