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

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 2726263003: cc::ResourcePool - Re-use larger resources for smaller requests (Closed)
Patch Set: fix compile Created 3 years, 7 months 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/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor.cc » ('j') | 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/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 command_line.AppendSwitchASCII(switches::kHostResolverRules, 205 command_line.AppendSwitchASCII(switches::kHostResolverRules,
206 "MAP *.test 127.0.0.1"); 206 "MAP *.test 127.0.0.1");
207 207
208 command_line.AppendSwitch(switches::kEnablePartialRaster); 208 command_line.AppendSwitch(switches::kEnablePartialRaster);
209 209
210 if (!command_line.HasSwitch(switches::kForceGpuRasterization) && 210 if (!command_line.HasSwitch(switches::kForceGpuRasterization) &&
211 !command_line.HasSwitch(switches::kEnableGpuRasterization)) { 211 !command_line.HasSwitch(switches::kEnableGpuRasterization)) {
212 command_line.AppendSwitch(switches::kDisableGpuRasterization); 212 command_line.AppendSwitch(switches::kDisableGpuRasterization);
213 } 213 }
214 214
215 command_line.AppendSwitch(cc::switches::kDisallowNonExactResourceReuse);
216
215 // Unless/until WebM files are added to the media layout tests, we need to 217 // Unless/until WebM files are added to the media layout tests, we need to
216 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 218 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
217 #if !defined(OS_ANDROID) 219 #if !defined(OS_ANDROID)
218 media::RemoveProprietaryMediaTypesAndCodecsForTests(); 220 media::RemoveProprietaryMediaTypesAndCodecsForTests();
219 #endif 221 #endif
220 222
221 if (!BlinkTestPlatformInitialize()) { 223 if (!BlinkTestPlatformInitialize()) {
222 *exit_code = 1; 224 *exit_code = 1;
223 return true; 225 return true;
224 } 226 }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 371
370 return renderer_client_.get(); 372 return renderer_client_.get();
371 } 373 }
372 374
373 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 375 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
374 utility_client_.reset(new ShellContentUtilityClient); 376 utility_client_.reset(new ShellContentUtilityClient);
375 return utility_client_.get(); 377 return utility_client_.get();
376 } 378 }
377 379
378 } // namespace content 380 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698