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

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

Issue 2688193002: Mojo framework for AndroidOverlay. (Closed)
Patch Set: fixed mojo manifest bug introduced by rebase Created 3 years, 9 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 | « no previous file | content/browser/gpu/gpu_process_host_ui_shim.h » ('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/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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 registry->AddInterface( 345 registry->AddInterface(
346 base::Bind( 346 base::Bind(
347 &memory_instrumentation::CoordinatorImpl::BindCoordinatorRequest, 347 &memory_instrumentation::CoordinatorImpl::BindCoordinatorRequest,
348 base::Unretained( 348 base::Unretained(
349 memory_instrumentation::CoordinatorImpl::GetInstance())), 349 memory_instrumentation::CoordinatorImpl::GetInstance())),
350 content::BrowserThread::GetTaskRunnerForThread( 350 content::BrowserThread::GetTaskRunnerForThread(
351 content::BrowserThread::UI)); 351 content::BrowserThread::UI));
352 352
353 GetContentClient()->browser()->ExposeInterfacesToGpuProcess(registry, 353 GetContentClient()->browser()->ExposeInterfacesToGpuProcess(registry,
354 host_); 354 host_);
355
356 #if defined(OS_ANDROID)
357 GpuProcessHostUIShim::RegisterUIThreadMojoInterfaces(registry);
358 #endif
359
355 return true; 360 return true;
356 } 361 }
357 362
358 GpuProcessHost* host_; 363 GpuProcessHost* host_;
359 364
360 DISALLOW_COPY_AND_ASSIGN(ConnectionFilterImpl); 365 DISALLOW_COPY_AND_ASSIGN(ConnectionFilterImpl);
361 }; 366 };
362 367
363 // static 368 // static
364 bool GpuProcessHost::ValidateHost(GpuProcessHost* host) { 369 bool GpuProcessHost::ValidateHost(GpuProcessHost* host) {
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 GetShaderCacheFactorySingleton()->Get(client_id); 1240 GetShaderCacheFactorySingleton()->Get(client_id);
1236 if (!cache.get()) 1241 if (!cache.get())
1237 return; 1242 return;
1238 1243
1239 cache->set_shader_loaded_callback(base::Bind(&HostLoadedShader, host_id_)); 1244 cache->set_shader_loaded_callback(base::Bind(&HostLoadedShader, host_id_));
1240 1245
1241 client_id_to_shader_cache_[client_id] = cache; 1246 client_id_to_shader_cache_[client_id] = cache;
1242 } 1247 }
1243 1248
1244 } // namespace content 1249 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/gpu_process_host_ui_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698