Remove bool return for Renderer SwapBuffers

This is always true.

Review URL: https://chromiumcodereview.appspot.com/14107012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197260 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 10 insertions, 15 deletions

diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index 95749c0..98dc2a0 100644
--- a/cc/output/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.cc
@@ -157,8 +157,7 @@ void DelegatingRenderer::DrawFrame(
   output_surface_->SendFrameToParentCompositor(&out_frame);
 }
 
-bool DelegatingRenderer::SwapBuffers(const LatencyInfo& latency_info) {
-  return true;
+void DelegatingRenderer::SwapBuffers(const LatencyInfo& latency_info) {
 }
 
 void DelegatingRenderer::GetFramebufferPixels(void* pixels, gfx::Rect rect) {
diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h
index 7842893..e65cf66 100644
--- a/cc/output/delegating_renderer.h
+++ b/cc/output/delegating_renderer.h
@@ -30,7 +30,7 @@ class CC_EXPORT DelegatingRenderer :
 
   virtual void Finish() OVERRIDE {}
 
-  virtual bool SwapBuffers(const LatencyInfo& latency_info) OVERRIDE;
+  virtual void SwapBuffers(const LatencyInfo& latency_info) OVERRIDE;
 
   virtual void GetFramebufferPixels(void* pixels, gfx::Rect rect) OVERRIDE;
 
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index adfcf47..c767bd1 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -1876,7 +1876,7 @@ void GLRenderer::Finish() {
   context_->finish();
 }
 
-bool GLRenderer::SwapBuffers(const LatencyInfo& latency_info) {
+void GLRenderer::SwapBuffers(const LatencyInfo& latency_info) {
   DCHECK(visible_);
   DCHECK(!is_backbuffer_discarded_);
 
@@ -1907,8 +1907,6 @@ bool GLRenderer::SwapBuffers(const LatencyInfo& latency_info) {
     static_cast<SimpleSwapFence*>(last_swap_fence_.get())->SetHasPassed();
   last_swap_fence_ = resource_provider_->GetReadLockFence();
   resource_provider_->SetReadLockFence(new SimpleSwapFence());
-
-  return true;
 }
 
 void GLRenderer::onMemoryAllocationChanged(
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index b05d02b..7047aac 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -56,7 +56,7 @@ class CC_EXPORT GLRenderer
 
   virtual void DoNoOp() OVERRIDE;
   // Puts backbuffer onscreen.
-  virtual bool SwapBuffers(const LatencyInfo& latency_info) OVERRIDE;
+  virtual void SwapBuffers(const LatencyInfo& latency_info) OVERRIDE;
 
   virtual void GetFramebufferPixels(void* pixels, gfx::Rect rect) OVERRIDE;
 
diff --git a/cc/output/renderer.h b/cc/output/renderer.h
index fbd93fa..047a3de 100644
--- a/cc/output/renderer.h
+++ b/cc/output/renderer.h
@@ -64,7 +64,7 @@ class CC_EXPORT Renderer {
   virtual void DoNoOp() {}
 
   // Puts backbuffer onscreen.
-  virtual bool SwapBuffers(const LatencyInfo& latency_info) = 0;
+  virtual void SwapBuffers(const LatencyInfo& latency_info) = 0;
 
   virtual void GetFramebufferPixels(void* pixels, gfx::Rect rect) = 0;
 
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index fd4b5a6..0b61ffe 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -115,10 +115,9 @@ void SoftwareRenderer::FinishDrawingFrame(DrawingFrame* frame) {
   }
 }
 
-bool SoftwareRenderer::SwapBuffers(const LatencyInfo& latency_info) {
+void SoftwareRenderer::SwapBuffers(const LatencyInfo& latency_info) {
   if (Settings().compositor_frame_message)
     output_surface_->SendFrameToParentCompositor(&compositor_frame_);
-  return true;
 }
 
 void SoftwareRenderer::ReceiveCompositorFrameAck(
diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h
index 90e6ed2..9ee2777 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -33,7 +33,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   virtual const RendererCapabilities& Capabilities() const OVERRIDE;
   virtual void ViewportChanged() OVERRIDE;
   virtual void Finish() OVERRIDE;
-  virtual bool SwapBuffers(const LatencyInfo& latency_info) OVERRIDE;
+  virtual void SwapBuffers(const LatencyInfo& latency_info) OVERRIDE;
   virtual void GetFramebufferPixels(void* pixels, gfx::Rect rect) OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
   virtual void SendManagedMemoryStats(
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index e559c81..a3cf0d3 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1149,10 +1149,9 @@ const RendererCapabilities& LayerTreeHostImpl::GetRendererCapabilities() const {
 bool LayerTreeHostImpl::SwapBuffers(const LayerTreeHostImpl::FrameData& frame) {
   if (frame.has_no_damage)
     return false;
-  bool result = renderer_->SwapBuffers(frame.latency_info);
-  if (result)
-    active_tree_->ClearLatencyInfo();
-  return result;
+  renderer_->SwapBuffers(frame.latency_info);
+  active_tree_->ClearLatencyInfo();
+  return true;
 }
 
 void LayerTreeHostImpl::EnableVSyncNotification(bool enable) {