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 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1050 // default value if not). | 1050 // default value if not). |
1051 settings->setAccelerated2dCanvasMSAASampleCount( | 1051 settings->setAccelerated2dCanvasMSAASampleCount( |
1052 prefs.accelerated_2d_canvas_msaa_sample_count); | 1052 prefs.accelerated_2d_canvas_msaa_sample_count); |
1053 | 1053 |
1054 // Enable deferred filter rendering if requested on the command line. | 1054 // Enable deferred filter rendering if requested on the command line. |
1055 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); | 1055 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); |
1056 | 1056 |
1057 // Enable container culling if requested on the command line. | 1057 // Enable container culling if requested on the command line. |
1058 settings->setContainerCullingEnabled(prefs.container_culling_enabled); | 1058 settings->setContainerCullingEnabled(prefs.container_culling_enabled); |
1059 | 1059 |
1060 // Enabling accelerated layers from the command line enabled accelerated | |
1061 // Video. | |
1062 settings->setAcceleratedCompositingForVideoEnabled( | |
1063 prefs.accelerated_compositing_for_video_enabled); | |
1064 | |
1065 // WebGL and accelerated 2D canvas are always gpu composited. | 1060 // WebGL and accelerated 2D canvas are always gpu composited. |
1066 settings->setAcceleratedCompositingForCanvasEnabled( | 1061 settings->setAcceleratedCompositingForCanvasEnabled( |
1067 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); | 1062 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); |
1068 | 1063 |
1069 settings->setAsynchronousSpellCheckingEnabled( | 1064 settings->setAsynchronousSpellCheckingEnabled( |
1070 prefs.asynchronous_spell_checking_enabled); | 1065 prefs.asynchronous_spell_checking_enabled); |
1071 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); | 1066 settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled); |
1072 | 1067 |
1073 for (WebInspectorPreferences::const_iterator it = | 1068 for (WebInspectorPreferences::const_iterator it = |
1074 prefs.inspector_settings.begin(); | 1069 prefs.inspector_settings.begin(); |
(...skipping 3217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4292 std::vector<gfx::Size> sizes; | 4287 std::vector<gfx::Size> sizes; |
4293 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4288 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4294 if (!url.isEmpty()) | 4289 if (!url.isEmpty()) |
4295 urls.push_back( | 4290 urls.push_back( |
4296 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4291 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4297 } | 4292 } |
4298 SendUpdateFaviconURL(urls); | 4293 SendUpdateFaviconURL(urls); |
4299 } | 4294 } |
4300 | 4295 |
4301 } // namespace content | 4296 } // namespace content |
OLD | NEW |