Add timeout to swap fence

gpu/ipc/service/image_transport_surface_overlay_mac.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/ipc/service/image_transport_surface_overlay_mac.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <IOSurface/IOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
@@ skipping 165 matching lines @@
     if (previous_frame_fence_) {
       TRACE_EVENT0("gpu", "ImageTransportSurfaceOverlayMac::ClientWait");
 
       // Ensure we are using the context with which the fence was created.
       gl::ScopedCGLSetCurrentContext scoped_set_current(fence_context_obj_);
 
       // While we could call GLFence::ClientWait, this performs a busy wait on
       // Mac, leading to high CPU usage. Instead we poll with a 1ms delay. This
       // should have minimal impact, as we will only hit this path when we are
       // more than one frame (16ms) behind.
-      while (!previous_frame_fence_->HasCompleted()) {
+      //
+      // Note that on some platforms (10.9), fences appear to sometimes get
+      // lost and will never pass. Add a 32ms timout to prevent these
+      // situations from causing a GPU process hang. crbug.com/618075
+      int timeout_msec = 32;
+      while (!previous_frame_fence_->HasCompleted() && timeout_msec > 0) {
+        --timeout_msec;
         base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1));
       }
+      if (!previous_frame_fence_->HasCompleted()) {
+        // We timed out waiting for the above fence, just issue a glFinish.
+        glFinish();
+      }
     }
 
     // Create a fence for the current frame's work and save the context.
     previous_frame_fence_.reset(gl::GLFence::Create());
     fence_context_obj_.reset(CGLGetCurrentContext(),
                              base::scoped_policy::RETAIN);
 
     // A glFlush is necessary to ensure correct content appears.
     glFlush();
 
@@ skipping 156 matching lines @@
   gl_renderer_id_ = context_renderer_id & kCGLRendererIDMatchingMask;
 
   // Post a task holding a reference to the new GL context. The reason for
   // this is to avoid creating-then-destroying the context for every image
   // transport surface that is observing the GPU switch.
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&IOSurfaceContextNoOp, context_on_new_gpu));
 }
 
 }  // namespace gpu