| 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 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1074 // default value if not). | 1074 // default value if not). |
| 1075 settings->setAccelerated2dCanvasMSAASampleCount( | 1075 settings->setAccelerated2dCanvasMSAASampleCount( |
| 1076 prefs.accelerated_2d_canvas_msaa_sample_count); | 1076 prefs.accelerated_2d_canvas_msaa_sample_count); |
| 1077 | 1077 |
| 1078 // Enable deferred filter rendering if requested on the command line. | 1078 // Enable deferred filter rendering if requested on the command line. |
| 1079 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); | 1079 settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); |
| 1080 | 1080 |
| 1081 // Enable container culling if requested on the command line. | 1081 // Enable container culling if requested on the command line. |
| 1082 settings->setContainerCullingEnabled(prefs.container_culling_enabled); | 1082 settings->setContainerCullingEnabled(prefs.container_culling_enabled); |
| 1083 | 1083 |
| 1084 // Enable gesture tap highlight if requested on the command line. | |
| 1085 settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled); | |
| 1086 | |
| 1087 // Enabling accelerated layers from the command line enabled accelerated | 1084 // Enabling accelerated layers from the command line enabled accelerated |
| 1088 // Video. | 1085 // Video. |
| 1089 settings->setAcceleratedCompositingForVideoEnabled( | 1086 settings->setAcceleratedCompositingForVideoEnabled( |
| 1090 prefs.accelerated_compositing_for_video_enabled); | 1087 prefs.accelerated_compositing_for_video_enabled); |
| 1091 | 1088 |
| 1092 // WebGL and accelerated 2D canvas are always gpu composited. | 1089 // WebGL and accelerated 2D canvas are always gpu composited. |
| 1093 settings->setAcceleratedCompositingForCanvasEnabled( | 1090 settings->setAcceleratedCompositingForCanvasEnabled( |
| 1094 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); | 1091 prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled); |
| 1095 | 1092 |
| 1096 settings->setAsynchronousSpellCheckingEnabled( | 1093 settings->setAsynchronousSpellCheckingEnabled( |
| (...skipping 3208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4305 std::vector<gfx::Size> sizes; | 4302 std::vector<gfx::Size> sizes; |
| 4306 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4303 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4307 if (!url.isEmpty()) | 4304 if (!url.isEmpty()) |
| 4308 urls.push_back( | 4305 urls.push_back( |
| 4309 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4306 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4310 } | 4307 } |
| 4311 SendUpdateFaviconURL(urls); | 4308 SendUpdateFaviconURL(urls); |
| 4312 } | 4309 } |
| 4313 | 4310 |
| 4314 } // namespace content | 4311 } // namespace content |
| OLD | NEW |