Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/layers/texture_layer_impl_unittest.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 "cc/layers/texture_layer_impl.h"
 
 #include <stddef.h>
 
+#include "cc/output/compositor_frame_sink.h"
 #include "cc/output/context_provider.h"
-#include "cc/output/output_surface.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/test/layer_test_common.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 void IgnoreCallback(const gpu::SyncToken& sync_token,
@@ skipping 26 matching lines @@
   EXPECT_EQ(Region().ToString(), layer->VisibleOpaqueRegion().ToString());
 }
 
 TEST(TextureLayerImplTest, Occlusion) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
 
   gpu::Mailbox mailbox;
-  impl.output_surface()->context_provider()->ContextGL()->GenMailboxCHROMIUM(
-      mailbox.name);
+  impl.compositor_frame_sink()
+      ->context_provider()
+      ->ContextGL()
+      ->GenMailboxCHROMIUM(mailbox.name);
   TextureMailbox texture_mailbox(
       mailbox,
       gpu::SyncToken(gpu::CommandBufferNamespace::GPU_IO, 0x123,
                      gpu::CommandBufferId::FromUnsafeValue(0x234), 0x456),
       GL_TEXTURE_2D);
 
   TextureLayerImpl* texture_layer_impl =
       impl.AddChildToRoot<TextureLayerImpl>();
   texture_layer_impl->SetBounds(layer_size);
   texture_layer_impl->SetDrawsContent(true);
@@ skipping 36 matching lines @@
   }
 }
 
 TEST(TextureLayerImplTest, OutputIsSecure) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
 
   gpu::Mailbox mailbox;
-  impl.output_surface()->context_provider()->ContextGL()->GenMailboxCHROMIUM(
-      mailbox.name);
+  impl.compositor_frame_sink()
+      ->context_provider()
+      ->ContextGL()
+      ->GenMailboxCHROMIUM(mailbox.name);
   TextureMailbox texture_mailbox(
       mailbox,
       gpu::SyncToken(gpu::CommandBufferNamespace::GPU_IO, 0x123,
                      gpu::CommandBufferId::FromUnsafeValue(0x234), 0x456),
       GL_TEXTURE_2D, layer_size, false, true);
 
   TextureLayerImpl* texture_layer_impl =
       impl.AddChildToRoot<TextureLayerImpl>();
   texture_layer_impl->SetBounds(layer_size);
   texture_layer_impl->SetDrawsContent(true);
@@ skipping 11 matching lines @@
     ASSERT_EQ(DrawQuad::Material::TEXTURE_CONTENT,
               impl.quad_list().front()->material);
     const TextureDrawQuad* quad =
         TextureDrawQuad::MaterialCast(impl.quad_list().front());
     EXPECT_TRUE(quad->secure_output_only);
   }
 }
 
 }  // namespace
 }  // namespace cc