Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 789163004: Revert of Delete the enable/disable layer squashing flags and settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 // Disable GL multisampling if requested on command line. 994 // Disable GL multisampling if requested on command line.
995 settings->setOpenGLMultisamplingEnabled(prefs.gl_multisampling_enabled); 995 settings->setOpenGLMultisamplingEnabled(prefs.gl_multisampling_enabled);
996 996
997 // Enable WebGL errors to the JS console if requested. 997 // Enable WebGL errors to the JS console if requested.
998 settings->setWebGLErrorsToConsoleEnabled( 998 settings->setWebGLErrorsToConsoleEnabled(
999 prefs.webgl_errors_to_console_enabled); 999 prefs.webgl_errors_to_console_enabled);
1000 1000
1001 // Uses the mock theme engine for scrollbars. 1001 // Uses the mock theme engine for scrollbars.
1002 settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled); 1002 settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled);
1003 1003
1004 settings->setLayerSquashingEnabled(prefs.layer_squashing_enabled);
1005
1004 // Enable gpu-accelerated 2d canvas if requested on the command line. 1006 // Enable gpu-accelerated 2d canvas if requested on the command line.
1005 settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled); 1007 settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled);
1006 1008
1007 settings->setMinimumAccelerated2dCanvasSize( 1009 settings->setMinimumAccelerated2dCanvasSize(
1008 prefs.minimum_accelerated_2d_canvas_size); 1010 prefs.minimum_accelerated_2d_canvas_size);
1009 1011
1010 // Disable antialiasing for 2d canvas if requested on the command line. 1012 // Disable antialiasing for 2d canvas if requested on the command line.
1011 settings->setAntialiased2dCanvasEnabled( 1013 settings->setAntialiased2dCanvasEnabled(
1012 !prefs.antialiased_2d_canvas_disabled); 1014 !prefs.antialiased_2d_canvas_disabled);
1013 1015
(...skipping 3192 matching lines...) Expand 10 before | Expand all | Expand 10 after
4206 std::vector<gfx::Size> sizes; 4208 std::vector<gfx::Size> sizes;
4207 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4209 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4208 if (!url.isEmpty()) 4210 if (!url.isEmpty())
4209 urls.push_back( 4211 urls.push_back(
4210 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4212 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4211 } 4213 }
4212 SendUpdateFaviconURL(urls); 4214 SendUpdateFaviconURL(urls);
4213 } 4215 }
4214 4216
4215 } // namespace content 4217 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698