Don't call RegisterSurfaceIdNamespace with Surfaces disabled.

It's null and crashes. Review URL: https://codereview.chromium.org/1157163002 Cr-Commit-Position: refs/heads/master@{#331464}
marcosholgado · May 26, 2015 · b051a19 · b051a19
1 parent e480760
commit b051a19
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -453,7 +453,8 @@ scoped_ptr<cc::SurfaceIdAllocator>
 GpuProcessTransportFactory::CreateSurfaceIdAllocator() {
   scoped_ptr<cc::SurfaceIdAllocator> allocator =
       make_scoped_ptr(new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
-  allocator->RegisterSurfaceIdNamespace(GetSurfaceManager());
+  if (GetSurfaceManager())
+    allocator->RegisterSurfaceIdNamespace(GetSurfaceManager());
   return allocator;
 }