Unified OutputSurface::SwapBuffers.

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 56 matching lines @@
         did_try_initialize_renderer_(false),
         on_can_draw_state_changed_called_(false),
         has_pending_tree_(false),
         did_request_commit_(false),
         did_request_redraw_(false),
         did_upload_visible_tile_(false),
         reduce_memory_result_(true) {
     media::InitializeMediaLibraryForTesting();
   }
 
-  virtual void OverrideSettings(LayerTreeSettings* settings) {}
-
   virtual void SetUp() OVERRIDE {
     LayerTreeSettings settings;
     settings.minimum_occlusion_tracking_size = gfx::Size();
-    OverrideSettings(&settings);
 
     host_impl_ = LayerTreeHostImpl::Create(settings,
                                            this,
                                            &proxy_,
                                            &stats_instrumentation_);
     host_impl_->InitializeRenderer(CreateOutputSurface());
     host_impl_->SetViewportSize(gfx::Size(10, 10));
   }
 
   virtual void TearDown() OVERRIDE {}
@@ skipping 5648 matching lines @@
     host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
     host_impl_->DidDrawAllLayers(frame);
   }
 }
 
 class CompositorFrameMetadataTest : public LayerTreeHostImplTest {
  public:
   CompositorFrameMetadataTest()
       : swap_buffers_complete_(0) {}
 
-  virtual void OverrideSettings(LayerTreeSettings* settings) OVERRIDE {
-    settings->compositor_frame_message = true;
-  }
   virtual void OnSwapBuffersCompleteOnImplThread() OVERRIDE {
     swap_buffers_complete_++;
   }
 
   int swap_buffers_complete_;
 };
 
 TEST_F(CompositorFrameMetadataTest, CompositorFrameAckCountsAsSwapComplete) {
   SetupRootLayerImpl(FakeLayerWithQuads::Create(host_impl_->active_tree(), 1));
   {
     LayerTreeHostImpl::FrameData frame;
     EXPECT_TRUE(host_impl_->PrepareToDraw(&frame, gfx::Rect()));
     host_impl_->DrawLayers(&frame, base::TimeTicks());
     host_impl_->DidDrawAllLayers(frame);
   }
   CompositorFrameAck ack;
-  host_impl_->OnSendFrameToParentCompositorAck(ack);
+  host_impl_->OnSwapBuffersComplete(&ack);
   EXPECT_EQ(swap_buffers_complete_, 1);
 }
 
 class CountingSoftwareDevice : public SoftwareOutputDevice {
  public:
   CountingSoftwareDevice() : frames_began_(0), frames_ended_(0) {}
 
   virtual SkCanvas* BeginPaint(gfx::Rect damage_rect) OVERRIDE {
     ++frames_began_;
     return SoftwareOutputDevice::BeginPaint(damage_rect);
@@ skipping 92 matching lines @@
   EXPECT_FALSE(did_try_initialize_renderer_);
   host_impl_->DeferredInitialize(scoped_refptr<ContextProvider>());
   EXPECT_TRUE(did_try_initialize_renderer_);
 
   // Defer intialized GL draw.
   DrawFrame();
 }
 
 }  // namespace
 }  // namespace cc