[jumbo] avoid g_next_id collision in cc

We can avoid the jumbo build error mentioned below, by replacing these (translation
unit) global g_next_id variables with static class variables:

./../../cc/paint/raw_memory_transfer_cache_entry.cc:13:28: error: redefinition of 'g_next_id'
base::AtomicSequenceNumber g_next_id;
                           ^
./../../cc/paint/image_transfer_cache_entry.cc:15:28: note: previous definition is here
base::AtomicSequenceNumber g_next_id;

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I320f03d6147ca0d2e29ad75573735e9860c4ee99
Reviewed-on: https://chromium-review.googlesource.com/823032
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523616}

cc/paint/image_transfer_cache_entry.cc

@@ -4,21 +4,17 @@
 
 #include "cc/paint/image_transfer_cache_entry.h"
 
-#include "base/atomic_sequence_num.h"
 #include "base/logging.h"
 #include "base/numerics/checked_math.h"
 #include "cc/paint/paint_op_reader.h"
 #include "cc/paint/paint_op_writer.h"
 
 namespace cc {
-namespace {
-base::AtomicSequenceNumber g_next_id;
-}
 
 ClientImageTransferCacheEntry::ClientImageTransferCacheEntry(
     const SkPixmap* pixmap,
     const SkColorSpace* target_color_space)
-    : id_(g_next_id.GetNext()), pixmap_(pixmap) {
+    : id_(s_next_id_.GetNext()), pixmap_(pixmap) {
   // Compute and cache the size of the data.
   // We write the following:
   // - Image color type (uint32_t)
@@ -38,6 +34,9 @@ ClientImageTransferCacheEntry::ClientImageTransferCacheEntry(
 }
 ClientImageTransferCacheEntry::~ClientImageTransferCacheEntry() = default;
 
+// static
+base::AtomicSequenceNumber ClientImageTransferCacheEntry::s_next_id_;
+
 size_t ClientImageTransferCacheEntry::SerializedSize() const {
   return size_;
 }

cc/paint/image_transfer_cache_entry.h

@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/atomic_sequence_num.h"
 #include "base/containers/span.h"
 #include "cc/paint/transfer_cache_entry.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ -34,6 +35,7 @@ class CC_PAINT_EXPORT ClientImageTransferCacheEntry
   uint32_t id_;
   const SkPixmap* const pixmap_;
   size_t size_ = 0;
+  static base::AtomicSequenceNumber s_next_id_;
 };
 
 class CC_PAINT_EXPORT ServiceImageTransferCacheEntry

cc/paint/raw_memory_transfer_cache_entry.cc

@@ -6,19 +6,17 @@
 
 #include <string.h>
 
-#include "base/atomic_sequence_num.h"
-
 namespace cc {
-namespace {
-base::AtomicSequenceNumber g_next_id;
-}
 
 ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
     std::vector<uint8_t> data)
-    : id_(g_next_id.GetNext()), data_(std::move(data)) {}
+    : id_(s_next_id_.GetNext()), data_(std::move(data)) {}
 ClientRawMemoryTransferCacheEntry::~ClientRawMemoryTransferCacheEntry() =
     default;
 
+// static
+base::AtomicSequenceNumber ClientRawMemoryTransferCacheEntry::s_next_id_;
+
 size_t ClientRawMemoryTransferCacheEntry::SerializedSize() const {
   return data_.size();
 }

cc/paint/raw_memory_transfer_cache_entry.h

@@ -5,9 +5,11 @@
 #ifndef CC_PAINT_RAW_MEMORY_TRANSFER_CACHE_ENTRY_H_
 #define CC_PAINT_RAW_MEMORY_TRANSFER_CACHE_ENTRY_H_
 
+#include "cc/paint/transfer_cache_entry.h"
+
 #include <vector>
 
-#include "cc/paint/transfer_cache_entry.h"
+#include "base/atomic_sequence_num.h"
 
 namespace cc {
 
@@ -26,6 +28,7 @@ class CC_PAINT_EXPORT ClientRawMemoryTransferCacheEntry
  private:
   uint32_t id_;
   std::vector<uint8_t> data_;
+  static base::AtomicSequenceNumber s_next_id_;
 };
 
 class CC_PAINT_EXPORT ServiceRawMemoryTransferCacheEntry