exo: Allow updating cc::Surface viewport and crop state independently.

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/resources/transferable_resource.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/gfx/geometry/rect.h"
 
 namespace base {
 namespace trace_event {
@@ skipping 203 matching lines @@
   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_;
 
+  bool changed_viewport_or_crop_ = false;
+
   // The buffer that will become the content of surface when Commit() is called.
   base::WeakPtr<Buffer> pending_buffer_;
 
   cc::SurfaceManager* surface_manager_;
 
   scoped_refptr<SurfaceFactoryOwner> factory_owner_;
 
   // The Surface Id currently attached to the window.
   cc::SurfaceId surface_id_;
 
   // The next resource id the buffer will be attached to.
-  int next_resource_id_ = 0;
+  int next_resource_id_ = 1;
 
   // The damage region to schedule paint for when Commit() is called.
   SkRegion pending_damage_;
 
   // These lists contains the callbacks to notify the client when it is a good
   // time to start producing a new frame. These callbacks move to
   // |frame_callbacks_| when Commit() is called. Later they are moved to
   // |active_frame_callbacks_| when the effect of the Commit() is reflected in
   // the compositor's active layer tree. The callbacks fire once we're notified
   // that the compositor started drawing that active layer tree.
@@ skipping 31 matching lines @@
 
   // 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 last resource that was sent to a surface.
+  cc::TransferableResource current_resource_;
+
   // 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_;
 
   // This is set when the compositing starts and passed to active frame
   // callbacks when compositing successfully ends.
   base::TimeTicks last_compositing_start_time_;
@@ skipping 18 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_