Introducing SurfaceReferenceFactory

cc/layers/surface_layer.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/surface_layer.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/surface_layer_impl.h"
 #include "cc/output/swap_promise.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_sequence_generator.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/swap_promise_manager.h"
 
 namespace cc {
 
 class SatisfySwapPromise : public SwapPromise {
  public:
   SatisfySwapPromise(SurfaceSequence sequence,
                      const SurfaceLayer::SatisfyCallback& satisfy_callback)
@@ skipping 21 matching lines @@
 
 scoped_refptr<SurfaceLayer> SurfaceLayer::Create(
     const SatisfyCallback& satisfy_callback,
     const RequireCallback& require_callback) {
   return make_scoped_refptr(
       new SurfaceLayer(satisfy_callback, require_callback));
 }
 
 SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback,
                            const RequireCallback& require_callback)
-    : surface_scale_(1.f),
-      satisfy_callback_(satisfy_callback),
+    : satisfy_callback_(satisfy_callback),
       require_callback_(require_callback) {}
 
 SurfaceLayer::~SurfaceLayer() {
   DCHECK(!layer_tree_host());
   DCHECK(!destroy_sequence_.is_valid());
 }
 
-void SurfaceLayer::SetSurfaceId(const SurfaceId& surface_id,
-                                float scale,
-                                const gfx::Size& size) {
+void SurfaceLayer::SetSurfaceInfo(SurfaceInfo surface_info) {
   SatisfyDestroySequence();
-  surface_id_ = surface_id;
-  surface_size_ = size;
-  surface_scale_ = scale;
+
+  surface_info_ = surface_info;
   CreateNewDestroySequence();
 
   UpdateDrawsContent(HasDrawableContent());
   SetNeedsPushProperties();
 }
 
 std::unique_ptr<LayerImpl> SurfaceLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return SurfaceLayerImpl::Create(tree_impl, id());
 }
 
 bool SurfaceLayer::HasDrawableContent() const {
-  return surface_id_.is_valid() && Layer::HasDrawableContent();
+  return surface_info_.id().is_valid() && Layer::HasDrawableContent();
 }
 
 void SurfaceLayer::SetLayerTreeHost(LayerTreeHost* host) {
   if (layer_tree_host() == host) {
     Layer::SetLayerTreeHost(host);
     return;
   }
 
   SatisfyDestroySequence();
   Layer::SetLayerTreeHost(host);
   CreateNewDestroySequence();
 }
 
 void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
   TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo");
   SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
 
-  layer_impl->SetSurfaceId(surface_id_);
-  layer_impl->SetSurfaceSize(surface_size_);
-  layer_impl->SetSurfaceScale(surface_scale_);
+  layer_impl->SetSurfaceInfo(surface_info_);
 }
 
 void SurfaceLayer::CreateNewDestroySequence() {
   DCHECK(!destroy_sequence_.is_valid());
   if (layer_tree_host()) {
     destroy_sequence_ = layer_tree_host()
                             ->GetSurfaceSequenceGenerator()
                             ->CreateSurfaceSequence();
-    require_callback_.Run(surface_id_, destroy_sequence_);
+    require_callback_.Run(surface_info_.id(), destroy_sequence_);
   }
 }
 
 void SurfaceLayer::SatisfyDestroySequence() {
   if (!layer_tree_host())
     return;
   DCHECK(destroy_sequence_.is_valid());
   std::unique_ptr<SatisfySwapPromise> satisfy(
       new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
   layer_tree_host()->GetSwapPromiseManager()->QueueSwapPromise(
       std::move(satisfy));
   destroy_sequence_ = SurfaceSequence();
 }
 
 }  // namespace cc