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

Unified Diff: content/browser/gpu/browser_gpu_channel_host_factory.cc

Issue 440203002: Merge 283085 "Added more detailed result codes for CreateViewCom..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.h ('k') | content/browser/gpu/gpu_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.h ('k') | content/browser/gpu/gpu_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698