| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 405645159f0bb2ea4767dcc764bf1b193bd12f66..9677b54dc71b64b7d1706ac0a2f350ce24c01e4f 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -417,6 +417,20 @@ void CreateEmbeddedWorkerSetup(
|
| new EmbeddedWorkerSetupImpl(request.Pass());
|
| }
|
|
|
| +void StringToUintVector(const std::string& str, std::vector<unsigned>* vector) {
|
| + DCHECK(vector->empty());
|
| + std::vector<std::string> pieces;
|
| + base::SplitString(str, ',', &pieces);
|
| + DCHECK_EQ(pieces.size(),
|
| + static_cast<size_t>(gfx::GpuMemoryBuffer::FORMAT_LAST + 1));
|
| + for (size_t i = 0; i < pieces.size(); ++i) {
|
| + unsigned number = 0;
|
| + bool succeed = base::StringToUint(pieces[i], &number);
|
| + DCHECK(succeed);
|
| + vector->push_back(number);
|
| + }
|
| +}
|
| +
|
| } // namespace
|
|
|
| class RasterWorkerPool : public base::SequencedTaskRunner,
|
| @@ -765,9 +779,7 @@ void RenderThreadImpl::Init() {
|
|
|
| std::string image_texture_target_string =
|
| command_line.GetSwitchValueASCII(switches::kContentImageTextureTarget);
|
| - bool parsed_image_texture_target = base::StringToUint(
|
| - image_texture_target_string, &use_image_texture_target_);
|
| - DCHECK(parsed_image_texture_target);
|
| + StringToUintVector(image_texture_target_string, &use_image_texture_targets_);
|
|
|
| if (command_line.HasSwitch(switches::kDisableLCDText)) {
|
| is_lcd_text_enabled_ = false;
|
| @@ -1572,8 +1584,8 @@ bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
| return is_elastic_overscroll_enabled_;
|
| }
|
|
|
| -uint32 RenderThreadImpl::GetImageTextureTarget() {
|
| - return use_image_texture_target_;
|
| +std::vector<unsigned> RenderThreadImpl::GetImageTextureTargets() {
|
| + return use_image_texture_targets_;
|
| }
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner>
|
|
|