cc: Partial tile update for one-copy raster.

cc/raster/one_copy_tile_task_worker_pool.h

 // 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.
 
 #ifndef CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 #define CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
@@ skipping 21 matching lines @@
                                             public TileTaskClient {
  public:
   ~OneCopyTileTaskWorkerPool() override;
 
   static scoped_ptr<TileTaskWorkerPool> Create(
       base::SequencedTaskRunner* task_runner,
       TaskGraphRunner* task_graph_runner,
       ContextProvider* context_provider,
       ResourceProvider* resource_provider,
       ResourcePool* resource_pool,
-      size_t max_bytes_per_copy_operation);
+      size_t max_bytes_per_copy_operation,
+      bool have_persistent_gpu_memory_buffers);
 
   // Overridden from TileTaskWorkerPool:
   TileTaskRunner* AsTileTaskRunner() override;
 
   // Overridden from TileTaskRunner:
   void SetClient(TileTaskRunnerClient* client) override;
   void Shutdown() override;
   void ScheduleTasks(TileTaskQueue* queue) override;
   void CheckForCompletedTasks() override;
   ResourceFormat GetResourceFormat() override;
 
   // Overridden from TileTaskClient:
   scoped_ptr<RasterBuffer> AcquireBufferForRaster(
-      const Resource* resource) override;
+      const Resource* resource,
+      uint64_t new_content_id,
+      uint64_t previous_content_id) override;
   void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override;
 
-  // Playback raster source and schedule copy of |src| resource to |dst|
-  // resource. Returns a non-zero sequence number for this copy operation.
+  // Playback raster source and schedule copy of |raster_resource| resource to
+  // |data|'s resource. Returns a non-zero sequence number for this copy

[reveman, 2015/05/29 14:50:27]

nit: update comment, |data| -> X

[danakj, 2015/05/29 17:16:07]

Done.

+  // operation.
   CopySequenceNumber PlaybackAndScheduleCopyOnWorkerThread(
-      scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock,
-      const Resource* src,
-      const Resource* dst,
+      bool reusing_raster_resource,
+      scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer>
+          raster_resource_write_lock,
+      const Resource* raster_resource,
+      const Resource* upload_resource,

[reveman, 2015/05/29 14:50:27]

nit: kill 'upload_' prefix. 'resource' alone is good imo or maybe dst_resource
or output_resource if you don't like that.

[danakj, 2015/05/29 17:16:07]

ok output_resource everywhere.

       const RasterSource* raster_source,
-      const gfx::Rect& rect,
+      const gfx::Rect& raster_full_rect,
+      const gfx::Rect& raster_dirty_rect,
       float scale);
 
   // Issues copy operations until |sequence| has been processed. This will
   // return immediately if |sequence| has already been processed.
   void AdvanceLastIssuedCopyTo(CopySequenceNumber sequence);
 
+  bool have_persistent_gpu_memory_buffers() const {
+    return have_persistent_gpu_memory_buffers_;
+  }
+
  protected:
   OneCopyTileTaskWorkerPool(base::SequencedTaskRunner* task_runner,
                             TaskGraphRunner* task_graph_runner,
                             ContextProvider* context_provider,
                             ResourceProvider* resource_provider,
                             ResourcePool* resource_pool,
-                            size_t max_bytes_per_copy_operation);
+                            size_t max_bytes_per_copy_operation,
+                            bool have_persistent_gpu_memory_buffers);
 
  private:
   struct CopyOperation {
     typedef ScopedPtrDeque<CopyOperation> Deque;
 
-    CopyOperation(
-        scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock,
-        const Resource* src,
-        const Resource* dst,
-        const gfx::Rect& rect);
+    CopyOperation(scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer>
+                      raster_resource_write_lock,
+                  const Resource* src,
+                  const Resource* dst,
+                  const gfx::Rect& rect);
     ~CopyOperation();
 
-    scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> write_lock;
+    scoped_ptr<ResourceProvider::ScopedWriteLockGpuMemoryBuffer> src_write_lock;

[reveman, 2015/05/29 14:50:27]

nit: raster_resource_write_lock like the ctor?

[danakj, 2015/05/29 17:16:06]

meant to leave CopyOperation as src/dst, fixed the ctor.

     const Resource* src;
     const Resource* dst;
     const gfx::Rect rect;
   };
 
   void OnTaskSetFinished(TaskSet task_set);
   void AdvanceLastFlushedCopyTo(CopySequenceNumber sequence);
   void IssueCopyOperations(int64 count);
   void ScheduleCheckForCompletedCopyOperationsWithLockAcquired(
       bool wait_if_needed);
   void CheckForCompletedCopyOperations(bool wait_if_needed);
   scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue()
       const;
   void StagingStateAsValueInto(
       base::trace_event::TracedValue* staging_state) const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   TaskGraphRunner* task_graph_runner_;
   const NamespaceToken namespace_token_;
   TileTaskRunnerClient* client_;
   ContextProvider* context_provider_;
   ResourceProvider* resource_provider_;
   ResourcePool* resource_pool_;
   const size_t max_bytes_per_copy_operation_;
+  const bool have_persistent_gpu_memory_buffers_;
   TaskSetCollection tasks_pending_;
   scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets];
   CopySequenceNumber last_issued_copy_operation_;
   CopySequenceNumber last_flushed_copy_operation_;
 
   // Task graph used when scheduling tasks and vector used to gather
   // completed tasks.
   TaskGraph graph_;
   Task::Vector completed_tasks_;
 
@@ skipping 12 matching lines @@
   // canceled when ScheduleTasks() is called.
   base::WeakPtrFactory<OneCopyTileTaskWorkerPool>
       task_set_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OneCopyTileTaskWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_ONE_COPY_TILE_TASK_WORKER_POOL_H_