Chromium Code Reviews| 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_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 573 use_image_texture_target_ = GL_TEXTURE_2D; | 573 use_image_texture_target_ = GL_TEXTURE_2D; |
| 574 if (command_line.HasSwitch(switches::kUseImageTextureTarget)) { | 574 if (command_line.HasSwitch(switches::kUseImageTextureTarget)) { |
| 575 std::string target_string = | 575 std::string target_string = |
| 576 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); | 576 command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); |
| 577 const unsigned targets[] = { | 577 const unsigned targets[] = { |
| 578 GL_TEXTURE_RECTANGLE_ARB, | 578 GL_TEXTURE_RECTANGLE_ARB, |
| 579 GL_TEXTURE_EXTERNAL_OES | 579 GL_TEXTURE_EXTERNAL_OES |
| 580 }; | 580 }; |
| 581 for (auto target : targets) { | 581 for (auto target : targets) { |
| 582 if (target_string == gpu::gles2::GLES2Util::GetStringEnum(target)) | 582 if (target_string == gpu::gles2::GLES2Util::GetStringEnum(target)) |
| 583 use_image_texture_target_ = target; | 583 use_image_texture_target_ = target; |
|
reveman
2015/02/27 17:34:15
Btw, we need to make sure LayerTreeSettings::use_i
| |
| 584 } | 584 } |
| 585 } | 585 } |
| 586 | 586 |
| 587 if (command_line.HasSwitch(switches::kDisableLCDText)) { | 587 if (command_line.HasSwitch(switches::kDisableLCDText)) { |
| 588 is_lcd_text_enabled_ = false; | 588 is_lcd_text_enabled_ = false; |
| 589 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { | 589 } else if (command_line.HasSwitch(switches::kEnableLCDText)) { |
| 590 is_lcd_text_enabled_ = true; | 590 is_lcd_text_enabled_ = true; |
| 591 } else { | 591 } else { |
| 592 #if defined(OS_ANDROID) | 592 #if defined(OS_ANDROID) |
| 593 is_lcd_text_enabled_ = false; | 593 is_lcd_text_enabled_ = false; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 662 bool parsed_num_raster_threads = | 662 bool parsed_num_raster_threads = |
| 663 base::StringToInt(string_value, &num_raster_threads); | 663 base::StringToInt(string_value, &num_raster_threads); |
| 664 DCHECK(parsed_num_raster_threads) << string_value; | 664 DCHECK(parsed_num_raster_threads) << string_value; |
| 665 DCHECK_GT(num_raster_threads, 0); | 665 DCHECK_GT(num_raster_threads, 0); |
| 666 | 666 |
| 667 // Force maximum 1 thread for threaded GPU rasterization. | 667 // Force maximum 1 thread for threaded GPU rasterization. |
| 668 // TODO(vmiura): crbug.com/459760 Support existence of multiple raster | 668 // TODO(vmiura): crbug.com/459760 Support existence of multiple raster |
| 669 // threads in GPU raster mode. | 669 // threads in GPU raster mode. |
| 670 if (is_threaded_gpu_rasterization_enabled_) | 670 if (is_threaded_gpu_rasterization_enabled_) |
| 671 num_raster_threads = 1; | 671 num_raster_threads = 1; |
| 672 cc::TileTaskWorkerPool::SetNumWorkerThreads(num_raster_threads); | 672 |
| 673 if (!command_line.HasSwitch(switches::kSingleProcess)) | |
|
reveman
2015/02/27 17:34:15
We need to call SetNumWorkerThreads in the browser
| |
| 674 cc::TileTaskWorkerPool::SetNumWorkerThreads(num_raster_threads); | |
| 673 | 675 |
| 674 #if defined(OS_ANDROID) || defined(OS_LINUX) | 676 #if defined(OS_ANDROID) || defined(OS_LINUX) |
| 675 if (!command_line.HasSwitch( | 677 if (!command_line.HasSwitch( |
| 676 switches::kUseNormalPriorityForTileTaskWorkerThreads)) { | 678 switches::kUseNormalPriorityForTileTaskWorkerThreads)) { |
| 677 cc::TileTaskWorkerPool::SetWorkerThreadPriority( | 679 cc::TileTaskWorkerPool::SetWorkerThreadPriority( |
| 678 base::kThreadPriority_Background); | 680 base::kThreadPriority_Background); |
| 679 } | 681 } |
| 680 #endif | 682 #endif |
| 681 } | 683 } |
| 682 | 684 |
| (...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1827 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 1829 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 1828 mojo::ServiceProviderPtr exposed_services) | 1830 mojo::ServiceProviderPtr exposed_services) |
| 1829 : services(services.Pass()), | 1831 : services(services.Pass()), |
| 1830 exposed_services(exposed_services.Pass()) { | 1832 exposed_services(exposed_services.Pass()) { |
| 1831 } | 1833 } |
| 1832 | 1834 |
| 1833 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { | 1835 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() { |
| 1834 } | 1836 } |
| 1835 | 1837 |
| 1836 } // namespace content | 1838 } // namespace content |
| OLD | NEW |