| Index: content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| index 165b62e4b97d5f1989076b206ea1d2617dc23f25..f96520c800efcf8cd456c71ad358757cbc5c843c 100644
|
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| @@ -27,12 +27,13 @@ BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
|
|
|
| struct BrowserGpuChannelHostFactory::CreateRequest {
|
| CreateRequest()
|
| - : event(true, false), gpu_host_id(0), route_id(MSG_ROUTING_NONE) {}
|
| + : event(true, false), gpu_host_id(0), route_id(MSG_ROUTING_NONE),
|
| + result(CREATE_COMMAND_BUFFER_FAILED) {}
|
| ~CreateRequest() {}
|
| base::WaitableEvent event;
|
| int gpu_host_id;
|
| int32 route_id;
|
| - bool succeeded;
|
| + CreateCommandBufferResult result;
|
| };
|
|
|
| class BrowserGpuChannelHostFactory::EstablishRequest
|
| @@ -268,12 +269,12 @@ void BrowserGpuChannelHostFactory::CreateViewCommandBufferOnIO(
|
|
|
| // static
|
| void BrowserGpuChannelHostFactory::CommandBufferCreatedOnIO(
|
| - CreateRequest* request, bool succeeded) {
|
| - request->succeeded = succeeded;
|
| + CreateRequest* request, CreateCommandBufferResult result) {
|
| + request->result = result;
|
| request->event.Signal();
|
| }
|
|
|
| -bool BrowserGpuChannelHostFactory::CreateViewCommandBuffer(
|
| +CreateCommandBufferResult BrowserGpuChannelHostFactory::CreateViewCommandBuffer(
|
| int32 surface_id,
|
| const GPUCreateCommandBufferConfig& init_params,
|
| int32 route_id) {
|
| @@ -293,7 +294,7 @@ bool BrowserGpuChannelHostFactory::CreateViewCommandBuffer(
|
| "BrowserGpuChannelHostFactory::CreateViewCommandBuffer");
|
| base::ThreadRestrictions::ScopedAllowWait allow_wait;
|
| request.event.Wait();
|
| - return request.succeeded;
|
| + return request.result;
|
| }
|
|
|
| void BrowserGpuChannelHostFactory::CreateImageOnIO(
|
|
|