Remove GpuHostMsg_FrameDrawn and replace with client channel swap ack

content/browser/compositor/browser_compositor_output_surface.cc

 // Copyright 2014 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 "content/browser/compositor/browser_compositor_output_surface.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/compositor/reflector_impl.h"
@@ skipping 51 matching lines @@
     return false;
 
   output_surface_map_->AddWithID(this, surface_id_);
   if (reflector_.get())
     reflector_->OnSourceSurfaceReady(this);
   vsync_manager_->AddObserver(this);
   return true;
 }
 
 void BrowserCompositorOutputSurface::OnSwapBuffersComplete() {
+#if defined(OS_MACOSX)
   // On Mac, delay acknowledging the swap to the output surface client until
   // it has been drawn.
-#if !defined(OS_MACOSX)
+  NOTREACHED();
+#endif
   cc::OutputSurface::OnSwapBuffersComplete();
-#endif
 }
 
 void BrowserCompositorOutputSurface::OnUpdateVSyncParameters(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
   DCHECK(HasClient());
   CommitVSyncParameters(timebase, interval);
 }
 
 void BrowserCompositorOutputSurface::OnUpdateVSyncParametersFromGpu(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
   DCHECK(HasClient());
   vsync_manager_->UpdateVSyncParameters(timebase, interval);
 }
 
 void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {
   reflector_ = reflector;
 }
 
 #if defined(OS_MACOSX)
 void BrowserCompositorOutputSurface::OnSurfaceDisplayed() {
   cc::OutputSurface::OnSwapBuffersComplete();
 }
 #endif
 
 }  // namespace content