Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

trunk/src/content/browser/renderer_host/image_transport_factory.cc

 // Copyright (c) 2012 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/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 492 matching lines @@
       if (base::StringToInt(string_value, &int_value))
         capabilities_.max_frames_pending = int_value;
       else
         LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending;
     }
     DetachFromThread();
   }
 
   virtual ~BrowserCompositorOutputSurface() {
     DCHECK(CalledOnValidThread());
-    if (!HasClient())
+    if (!client_)
       return;
     output_surface_proxy_->RemoveSurface(surface_id_);
   }
 
   virtual bool BindToClient(
       cc::OutputSurfaceClient* client) OVERRIDE {
     DCHECK(CalledOnValidThread());
 
     if (!OutputSurface::BindToClient(client))
       return false;
 
     output_surface_proxy_->AddSurface(this, surface_id_);
     return true;
   }
 
   void OnUpdateVSyncParameters(
       base::TimeTicks timebase, base::TimeDelta interval) {
     DCHECK(CalledOnValidThread());
-    DCHECK(HasClient());
-    OnVSyncParametersChanged(timebase, interval);
+    DCHECK(client_);
+    client_->OnVSyncParametersChanged(timebase, interval);
     compositor_message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&ui::Compositor::OnUpdateVSyncParameters,
                    compositor_, timebase, interval));
   }
 
   virtual void Reshape(gfx::Size size, float scale_factor) OVERRIDE {
     OutputSurface::Reshape(size, scale_factor);
     if (reflector_.get())
       reflector_->OnReshape(size);
@@ skipping 520 matching lines @@
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content