cc: Fix data race in cc::TaskState::IsFinished.

cc/raster/raster_buffer_provider_perftest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 103 matching lines @@
   RASTER_BUFFER_PROVIDER_TYPE_ZERO_COPY,
   RASTER_BUFFER_PROVIDER_TYPE_ONE_COPY,
   RASTER_BUFFER_PROVIDER_TYPE_GPU,
   RASTER_BUFFER_PROVIDER_TYPE_BITMAP
 };
 
 static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
-class PerfImageDecodeTaskImpl : public TileTask {
+class PerfTileTask : public TileTask {
  public:
-  PerfImageDecodeTaskImpl() : TileTask(true) {}
+  PerfTileTask() : TileTask(true) {}
+  explicit PerfTileTask(TileTask::Vector* dependencies)
+      : TileTask(true, dependencies) {}
+
+  void Reset() {
+    did_complete_ = false;
+    state().Reset();
+  }
+
+  void Cancel() {
+    if (!state().IsCanceled())
+      state().DidCancel();
+
+    did_complete_ = true;
+  }
+
+ protected:
+  ~PerfTileTask() override {}
+};
+
+class PerfImageDecodeTaskImpl : public PerfTileTask {
+ public:
+  PerfImageDecodeTaskImpl() {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {}
 
   // Overridden from TileTask:
   void OnTaskCompleted() override {}
 
  protected:
   ~PerfImageDecodeTaskImpl() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PerfImageDecodeTaskImpl);
 };
 
 class PerfRasterBufferProviderHelper {
  public:
   virtual std::unique_ptr<RasterBuffer> AcquireBufferForRaster(
       const Resource* resource,
       uint64_t resource_content_id,
       uint64_t previous_content_id) = 0;
   virtual void ReleaseBufferForRaster(std::unique_ptr<RasterBuffer> buffer) = 0;
 };
 
-class PerfRasterTaskImpl : public TileTask {
+class PerfRasterTaskImpl : public PerfTileTask {
  public:
   PerfRasterTaskImpl(PerfRasterBufferProviderHelper* helper,
                      std::unique_ptr<ScopedResource> resource,
                      std::unique_ptr<RasterBuffer> raster_buffer,
                      TileTask::Vector* dependencies)
-      : TileTask(true, dependencies),
+      : PerfTileTask(dependencies),
         helper_(helper),
         resource_(std::move(resource)),
         raster_buffer_(std::move(raster_buffer)) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {}
 
   // Overridden from TileTask:
   void OnTaskCompleted() override {
     if (helper_)
@@ skipping 52 matching lines @@
       TileTask::Vector dependencies = image_decode_tasks;
       raster_tasks->push_back(
           new PerfRasterTaskImpl(helper, std::move(resource),
                                  std::move(raster_buffer), &dependencies));
     }
   }
 
   void ResetRasterTasks(const RasterTaskVector& raster_tasks) {
     for (auto& raster_task : raster_tasks) {
       for (auto& decode_task : raster_task->dependencies())
-        decode_task->state().Reset();
+        static_cast<PerfTileTask*>(decode_task.get())->Reset();
 
-      raster_task->state().Reset();
+      static_cast<PerfTileTask*>(raster_task.get())->Reset();
     }
   }
 
   void CancelRasterTasks(const RasterTaskVector& raster_tasks) {
     for (auto& raster_task : raster_tasks) {
-      for (auto& decode_task : raster_task->dependencies()) {
-        if (!decode_task->state().IsCanceled())
-          decode_task->state().DidCancel();
-      }
+      for (auto& decode_task : raster_task->dependencies())
+        static_cast<PerfTileTask*>(decode_task.get())->Cancel();
 
-      if (!raster_task->state().IsCanceled())
-        raster_task->state().DidCancel();
+      static_cast<PerfTileTask*>(raster_task.get())->Cancel();
     }
   }
 
   void BuildTileTaskGraph(TaskGraph* graph,
                           const RasterTaskVector& raster_tasks) {
     uint16_t priority = 0;
 
     for (auto& raster_task : raster_tasks) {
       priority++;
 
@@ skipping 307 matching lines @@
   RunBuildTileTaskGraphTest("1_0", 1, 0);
   RunBuildTileTaskGraphTest("32_0", 32, 0);
   RunBuildTileTaskGraphTest("1_1", 1, 1);
   RunBuildTileTaskGraphTest("32_1", 32, 1);
   RunBuildTileTaskGraphTest("1_4", 1, 4);
   RunBuildTileTaskGraphTest("32_4", 32, 4);
 }
 
 }  // namespace
 }  // namespace cc