| Index: content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| ===================================================================
|
| --- content/browser/gpu/browser_gpu_channel_host_factory.cc (revision 287582)
|
| +++ content/browser/gpu/browser_gpu_channel_host_factory.cc (working copy)
|
| @@ -27,12 +27,13 @@
|
|
|
| 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
|
| @@ -267,12 +268,12 @@
|
|
|
| // 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) {
|
| @@ -292,7 +293,7 @@
|
| "BrowserGpuChannelHostFactory::CreateViewCommandBuffer");
|
| base::ThreadRestrictions::ScopedAllowWait allow_wait;
|
| request.event.Wait();
|
| - return request.succeeded;
|
| + return request.result;
|
| }
|
|
|
| void BrowserGpuChannelHostFactory::CreateImageOnIO(
|
|
|