WIP: Surface Synchronization System

ui/compositor/layer.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 "ui/compositor/layer.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 164 matching lines @@
 
   // Filters.
   clone->SetLayerSaturation(layer_saturation_);
   clone->SetLayerBrightness(GetTargetBrightness());
   clone->SetLayerGrayscale(GetTargetGrayscale());
   clone->SetLayerInverted(layer_inverted_);
   if (alpha_shape_)
     clone->SetAlphaShape(base::MakeUnique<SkRegion>(*alpha_shape_));
 
   // cc::Layer state.
-  if (surface_layer_ && surface_layer_->surface_info().id().is_valid()) {
-    clone->SetShowSurface(surface_layer_->surface_info(),
+  if (surface_layer_ &&
+      surface_layer_->primary_surface_info().id().is_valid()) {
+    clone->SetShowSurface(surface_layer_->primary_surface_info(),
                           surface_layer_->surface_reference_factory());
   } else if (type_ == LAYER_SOLID_COLOR) {
     clone->SetColor(GetTargetColor());
   }
   return clone;
 }
 
 std::unique_ptr<Layer> Layer::Mirror() {
   auto mirror = Clone();
   mirrors_.emplace_back(base::MakeUnique<LayerMirror>(this, mirror.get()));
@@ skipping 452 matching lines @@
 }
 
 bool Layer::TextureFlipped() const {
   DCHECK(texture_layer_.get());
   return texture_layer_->flipped();
 }
 
 void Layer::SetShowSurface(
     const cc::SurfaceInfo& surface_info,
     scoped_refptr<cc::SurfaceReferenceFactory> ref_factory) {
-  DCHECK(type_ == LAYER_TEXTURED || type_ == LAYER_SOLID_COLOR);
+  DCHECK(type_ == LAYER_TEXTURED || type_ == LAYER_SOLID_COLOR ||
+         type_ == LAYER_SURFACE);
 
-  scoped_refptr<cc::SurfaceLayer> new_layer =
-      cc::SurfaceLayer::Create(ref_factory);
-  new_layer->SetSurfaceInfo(surface_info);
-  SwitchToLayer(new_layer);
-  surface_layer_ = new_layer;
+  if (!surface_layer_) {
+    scoped_refptr<cc::SurfaceLayer> new_layer =
+        cc::SurfaceLayer::Create(ref_factory);
+    SwitchToLayer(new_layer);
+    surface_layer_ = new_layer;
+  }
+  surface_layer_->SwapSurfaceInfo(surface_info);
 
   frame_size_in_dip_ = gfx::ConvertSizeToDIP(surface_info.device_scale_factor(),
                                              surface_info.size_in_pixels());
   RecomputeDrawsContentAndUVRect();
 
   for (const auto& mirror : mirrors_) {
     mirror->dest()->SetShowSurface(surface_info, ref_factory);
   }
 }
 
@@ skipping 409 matching lines @@
 cc::Layer* Layer::GetCcLayer() const {
   return cc_layer_;
 }
 
 LayerThreadedAnimationDelegate* Layer::GetThreadedAnimationDelegate() {
   DCHECK(animator_);
   return animator_.get();
 }
 
 void Layer::CreateCcLayer() {
-  if (type_ == LAYER_SOLID_COLOR) {
+  if (type_ == LAYER_SOLID_COLOR || type_ == LAYER_SURFACE) {
     solid_color_layer_ = cc::SolidColorLayer::Create();
     cc_layer_ = solid_color_layer_.get();
   } else if (type_ == LAYER_NINE_PATCH) {
     nine_patch_layer_ = cc::NinePatchLayer::Create();
     cc_layer_ = nine_patch_layer_.get();
   } else {
     content_layer_ = cc::PictureLayer::Create(this);
     cc_layer_ = content_layer_.get();
   }
   cc_layer_->SetTransformOrigin(gfx::Point3F());
@@ skipping 60 matching lines @@
   const auto it = std::find_if(mirrors_.begin(), mirrors_.end(),
       [mirror](const std::unique_ptr<LayerMirror>& mirror_ptr) {
         return mirror_ptr.get() == mirror;
       });
 
   DCHECK(it != mirrors_.end());
   mirrors_.erase(it);
 }
 
 }  // namespace ui