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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 1950723002: Remove WebGraphicsContext3D reason from the CauseForGpuLaunch enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: launch-reasons: fix-software Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/gpu/gpu_ipc_browsertests.cc » ('j') | content/renderer/render_widget.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 8351b177489be46ea2d25a365880a417eddabfdf..db1591fe5a2a4dfaf00cff55183b94639a5e5e11 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -294,12 +294,11 @@ void GpuProcessTransportFactory::CreateOutputSurface(
const bool create_gpu_output_surface =
ShouldCreateGpuOutputSurface(compositor.get());
if (create_gpu_output_surface && !use_vulkan) {
- CauseForGpuLaunch cause =
- CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
- cause, base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
- callback_factory_.GetWeakPtr(), compositor,
- create_gpu_output_surface, 0));
+ CAUSE_FOR_GPU_LAUNCH_SHARED_WORKER_THREAD_CONTEXT,
+ base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
+ callback_factory_.GetWeakPtr(), compositor,
+ create_gpu_output_surface, 0));
} else {
EstablishedGpuChannel(compositor, create_gpu_output_surface, 0);
}
@@ -409,12 +408,11 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
if (!created_gpu_browser_compositor) {
// Try again.
- CauseForGpuLaunch cause =
- CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
- cause, base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
- callback_factory_.GetWeakPtr(), compositor,
- create_gpu_output_surface, num_attempts + 1));
+ CAUSE_FOR_GPU_LAUNCH_SHARED_WORKER_THREAD_CONTEXT,
+ base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
+ callback_factory_.GetWeakPtr(), compositor,
+ create_gpu_output_surface, num_attempts + 1));
return;
}
}
@@ -696,10 +694,9 @@ GpuProcessTransportFactory::SharedMainThreadContextProvider() {
if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor())
return nullptr;
- CauseForGpuLaunch cause =
- CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(
- BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause));
+ BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(
+ CAUSE_FOR_GPU_LAUNCH_BROWSER_SHARED_MAIN_THREAD_CONTEXT));
if (!gpu_channel_host)
return nullptr;
« no previous file with comments | « no previous file | content/browser/gpu/gpu_ipc_browsertests.cc » ('j') | content/renderer/render_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698