| 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 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 // universal access. Only test shell will enable this. | 937 // universal access. Only test shell will enable this. |
| 938 settings->setAllowUniversalAccessFromFileURLs( | 938 settings->setAllowUniversalAccessFromFileURLs( |
| 939 prefs.allow_universal_access_from_file_urls); | 939 prefs.allow_universal_access_from_file_urls); |
| 940 settings->setAllowFileAccessFromFileURLs( | 940 settings->setAllowFileAccessFromFileURLs( |
| 941 prefs.allow_file_access_from_file_urls); | 941 prefs.allow_file_access_from_file_urls); |
| 942 | 942 |
| 943 // Enable experimental WebGL support if requested on command line | 943 // Enable experimental WebGL support if requested on command line |
| 944 // and support is compiled in. | 944 // and support is compiled in. |
| 945 settings->setExperimentalWebGLEnabled(prefs.experimental_webgl_enabled); | 945 settings->setExperimentalWebGLEnabled(prefs.experimental_webgl_enabled); |
| 946 | 946 |
| 947 // Disable GL multisampling if requested on command line. | |
| 948 settings->setOpenGLMultisamplingEnabled(prefs.gl_multisampling_enabled); | |
| 949 | |
| 950 // Enable WebGL errors to the JS console if requested. | 947 // Enable WebGL errors to the JS console if requested. |
| 951 settings->setWebGLErrorsToConsoleEnabled( | 948 settings->setWebGLErrorsToConsoleEnabled( |
| 952 prefs.webgl_errors_to_console_enabled); | 949 prefs.webgl_errors_to_console_enabled); |
| 953 | 950 |
| 954 // Uses the mock theme engine for scrollbars. | 951 // Uses the mock theme engine for scrollbars. |
| 955 settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled); | 952 settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled); |
| 956 | 953 |
| 957 // Enable gpu-accelerated 2d canvas if requested on the command line. | 954 // Enable gpu-accelerated 2d canvas if requested on the command line. |
| 958 settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled); | 955 settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled); |
| 959 | 956 |
| (...skipping 2481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3441 if (IsUseZoomForDSFEnabled()) { | 3438 if (IsUseZoomForDSFEnabled()) { |
| 3442 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3439 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
| 3443 } else { | 3440 } else { |
| 3444 webview()->setDeviceScaleFactor(device_scale_factor_); | 3441 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 3445 } | 3442 } |
| 3446 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3443 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 3447 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3444 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 3448 } | 3445 } |
| 3449 | 3446 |
| 3450 } // namespace content | 3447 } // namespace content |
| OLD | NEW |