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

Side by Side Diff: content/browser/gpu/gpu_process_host.cc

Issue 2226403002: Remove Channel token from InProcessChildThreadParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moar-channels
Patch Set: . Created 4 years, 4 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
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/browser/gpu/gpu_process_host.h" 5 #include "content/browser/gpu/gpu_process_host.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 552
553 process_->GetHost()->CreateChannelMojo(); 553 process_->GetHost()->CreateChannelMojo();
554 554
555 gpu::GpuPreferences gpu_preferences = GetGpuPreferencesFromCommandLine(); 555 gpu::GpuPreferences gpu_preferences = GetGpuPreferencesFromCommandLine();
556 if (in_process_) { 556 if (in_process_) {
557 DCHECK_CURRENTLY_ON(BrowserThread::IO); 557 DCHECK_CURRENTLY_ON(BrowserThread::IO);
558 DCHECK(g_gpu_main_thread_factory); 558 DCHECK(g_gpu_main_thread_factory);
559 in_process_gpu_thread_.reset(g_gpu_main_thread_factory( 559 in_process_gpu_thread_.reset(g_gpu_main_thread_factory(
560 InProcessChildThreadParams( 560 InProcessChildThreadParams(
561 std::string(), base::ThreadTaskRunnerHandle::Get(), 561 std::string(), base::ThreadTaskRunnerHandle::Get(),
562 std::string(),
563 process_->child_connection()->service_token()), 562 process_->child_connection()->service_token()),
564 gpu_preferences)); 563 gpu_preferences));
565 base::Thread::Options options; 564 base::Thread::Options options;
566 #if defined(OS_WIN) 565 #if defined(OS_WIN)
567 // WGL needs to create its own window and pump messages on it. 566 // WGL needs to create its own window and pump messages on it.
568 options.message_loop_type = base::MessageLoop::TYPE_UI; 567 options.message_loop_type = base::MessageLoop::TYPE_UI;
569 #endif 568 #endif
570 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 569 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
571 options.priority = base::ThreadPriority::DISPLAY; 570 options.priority = base::ThreadPriority::DISPLAY;
572 #endif 571 #endif
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1158 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1160 ClientIdToShaderCacheMap::iterator iter = 1159 ClientIdToShaderCacheMap::iterator iter =
1161 client_id_to_shader_cache_.find(client_id); 1160 client_id_to_shader_cache_.find(client_id);
1162 // If the cache doesn't exist then this is an off the record profile. 1161 // If the cache doesn't exist then this is an off the record profile.
1163 if (iter == client_id_to_shader_cache_.end()) 1162 if (iter == client_id_to_shader_cache_.end())
1164 return; 1163 return;
1165 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1164 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1166 } 1165 }
1167 1166
1168 } // namespace content 1167 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/mojo/mojo_child_connection.h » ('j') | content/renderer/render_thread_impl_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698