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

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

Issue 795203002: Revert "Revert of Delete the enable/disable layer squashing flags and settings. (patchset #1 id:1 o… (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 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 // Disable GL multisampling if requested on command line. 992 // Disable GL multisampling if requested on command line.
993 settings->setOpenGLMultisamplingEnabled(prefs.gl_multisampling_enabled); 993 settings->setOpenGLMultisamplingEnabled(prefs.gl_multisampling_enabled);
994 994
995 // Enable WebGL errors to the JS console if requested. 995 // Enable WebGL errors to the JS console if requested.
996 settings->setWebGLErrorsToConsoleEnabled( 996 settings->setWebGLErrorsToConsoleEnabled(
997 prefs.webgl_errors_to_console_enabled); 997 prefs.webgl_errors_to_console_enabled);
998 998
999 // Uses the mock theme engine for scrollbars. 999 // Uses the mock theme engine for scrollbars.
1000 settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled); 1000 settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled);
1001 1001
1002 settings->setLayerSquashingEnabled(prefs.layer_squashing_enabled);
1003
1004 // Enable gpu-accelerated 2d canvas if requested on the command line. 1002 // Enable gpu-accelerated 2d canvas if requested on the command line.
1005 settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled); 1003 settings->setAccelerated2dCanvasEnabled(prefs.accelerated_2d_canvas_enabled);
1006 1004
1007 settings->setMinimumAccelerated2dCanvasSize( 1005 settings->setMinimumAccelerated2dCanvasSize(
1008 prefs.minimum_accelerated_2d_canvas_size); 1006 prefs.minimum_accelerated_2d_canvas_size);
1009 1007
1010 // Disable antialiasing for 2d canvas if requested on the command line. 1008 // Disable antialiasing for 2d canvas if requested on the command line.
1011 settings->setAntialiased2dCanvasEnabled( 1009 settings->setAntialiased2dCanvasEnabled(
1012 !prefs.antialiased_2d_canvas_disabled); 1010 !prefs.antialiased_2d_canvas_disabled);
1013 1011
(...skipping 3114 matching lines...) Expand 10 before | Expand all | Expand 10 after
4128 std::vector<gfx::Size> sizes; 4126 std::vector<gfx::Size> sizes;
4129 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4127 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4130 if (!url.isEmpty()) 4128 if (!url.isEmpty())
4131 urls.push_back( 4129 urls.push_back(
4132 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4130 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4133 } 4131 }
4134 SendUpdateFaviconURL(urls); 4132 SendUpdateFaviconURL(urls);
4135 } 4133 }
4136 4134
4137 } // namespace content 4135 } // 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