exo: Handle cross-fade animations properly.

components/exo/surface.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_EXO_SURFACE_H_
 #define COMPONENTS_EXO_SURFACE_H_
 
 #include <list>
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/compositor_observer.h"
+#include "ui/compositor/layer_owner_delegate.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
 }
 
 namespace cc {
 class SurfaceFactory;
@@ skipping 40 matching lines @@
       release_callbacks_;
   std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   Surface* surface_;
 };
 
 // This class represents a rectangular area that is displayed on the screen.
 // It has a location, size and pixel contents.
 class Surface : public aura::Window,
                 public aura::WindowObserver,
+                public ui::LayerOwnerDelegate,
                 public ui::CompositorObserver {
  public:
   Surface();
   ~Surface() override;
 
   // Type-checking downcast routine.
   static Surface* AsSurface(const aura::Window* window);
 
   // Sets whether to put the contents in a SurfaceLayer or a TextureLayer.
   static void SetUseSurfaceLayer(bool use_surface_layer);
@@ skipping 101 matching lines @@
 
   bool HasPendingDamageForTesting(const gfx::Rect& damage) const {
     return pending_damage_.contains(gfx::RectToSkIRect(damage));
   }
 
   // Overridden from aura::WindowObserver:
   void OnWindowAddedToRootWindow(aura::Window* window) override;
   void OnWindowRemovingFromRootWindow(aura::Window* window,
                                       aura::Window* new_root) override;
 
+  // Overridden from ui::LayerOwnerDelegate:
+  void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override;
+
   // Overridden from ui::CompositorObserver:
   void OnCompositingDidCommit(ui::Compositor* compositor) override;
   void OnCompositingStarted(ui::Compositor* compositor,
                             base::TimeTicks start_time) override;
   void OnCompositingEnded(ui::Compositor* compositor) override;
   void OnCompositingAborted(ui::Compositor* compositor) override;
   void OnCompositingLockStateChanged(ui::Compositor* compositor) override {}
   void OnCompositingShuttingDown(ui::Compositor* compositor) override;
 
   void WillDraw(cc::SurfaceId surface_id);
 
  private:
   bool needs_commit_surface_hierarchy() const {
     return needs_commit_surface_hierarchy_;
   }
 
   // Commit the current attached buffer to a TextureLayer.
-  void CommitLayerContents();
+  void CommitTextureContents();
 
   // Commit the current attached buffer to a SurfaceLayer.
   void CommitSurfaceContents();
 
+  // Set TextureLayer contents to the current buffer.
+  void SetTextureLayerContents(ui::Layer* layer);
+
+  // Set SurfaceLayer contents to the current buffer.
+  void SetSurfaceLayerContents(ui::Layer* layer);
+
   // This returns true when the surface has some contents assigned to it.
   bool has_contents() const { return !!current_buffer_; }
 
   // This is true if the buffer contents should be put in a SurfaceLayer
   // rather than a TextureLayer.
   static bool use_surface_layer_;
 
   // This is true when Attach() has been called and new contents should take
   // effect next time Commit() is called.
   bool has_pending_contents_;
@@ skipping 39 matching lines @@
   using SubSurfaceEntry = std::pair<Surface*, gfx::Point>;
   using SubSurfaceEntryList = std::list<SubSurfaceEntry>;
   SubSurfaceEntryList pending_sub_surfaces_;
 
   // The viewport to take effect when Commit() is called.
   gfx::Size pending_viewport_;
 
   // The crop rectangle to take effect when Commit() is called.
   gfx::RectF pending_crop_;
 
+  // The active crop rectangle.
+  gfx::RectF crop_;
+
   // The secure output visibility state to take effect when Commit() is called.
   bool pending_only_visible_on_secure_output_;
 
+  // The active secure output visibility state.
+  bool only_visible_on_secure_output_;
+
   // The blend mode state to take effect when Commit() is called.
   SkXfermode::Mode pending_blend_mode_;
 
   // The alpha state to take effect when Commit() is called.
   float pending_alpha_;
 
+  // The active alpha state.
+  float alpha_;
+
   // The buffer that is currently set as content of surface.
   base::WeakPtr<Buffer> current_buffer_;
 
   // The active input region used for hit testing.
   SkRegion input_region_;
 
   // This is true if a call to Commit() as been made but
   // CommitSurfaceHierarchy() has not yet been called.
   bool needs_commit_surface_hierarchy_;
 
@@ skipping 21 matching lines @@
 
   // Surface observer list. Surface does not own the observers.
   base::ObserverList<SurfaceObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_SURFACE_H_