Fix jumbo build in cc/paint after r556968.

Also rename globals from "g_foo_" to "g_foo" since they are not member
variables.

Bug: 815022, 788075
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I5ecee5b3559572dc2f700ad8ae8eb784fc298456
Reviewed-on: https://chromium-review.googlesource.com/1050872
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557091}

cc/paint/paint_image.cc

@@ -15,8 +15,8 @@
 
 namespace cc {
 namespace {
-base::AtomicSequenceNumber g_next_id_;
-base::AtomicSequenceNumber g_next_content_id_;
+base::AtomicSequenceNumber g_next_image_id;
+base::AtomicSequenceNumber g_next_image_content_id;
 }  // namespace
 
 const PaintImage::Id PaintImage::kNonLazyStableId = -1;
@@ -74,12 +74,12 @@ PaintImage::DecodingMode PaintImage::GetConservative(DecodingMode one,
 
 // static
 PaintImage::Id PaintImage::GetNextId() {
-  return g_next_id_.GetNext();
+  return g_next_image_id.GetNext();
 }
 
 // static
 PaintImage::ContentId PaintImage::GetNextContentId() {
-  return g_next_content_id_.GetNext();
+  return g_next_image_content_id.GetNext();
 }
 
 const sk_sp<SkImage>& PaintImage::GetSkImage() const {

cc/paint/paint_shader.cc

@@ -12,7 +12,7 @@
 
 namespace cc {
 namespace {
-base::AtomicSequenceNumber g_next_id_;
+base::AtomicSequenceNumber g_next_shader_id;
 
 sk_sp<SkPicture> ToSkPicture(sk_sp<PaintRecord> record,
                              const SkRect& bounds,
@@ -155,7 +155,7 @@ sk_sp<PaintShader> PaintShader::MakePaintRecord(
   sk_sp<PaintShader> shader(new PaintShader(Type::kPaintRecord));
 
   shader->record_ = std::move(record);
-  shader->id_ = g_next_id_.GetNext();
+  shader->id_ = g_next_shader_id.GetNext();
   shader->tile_ = tile;
   shader->scaling_behavior_ = scaling_behavior;
   shader->SetMatrixAndTiling(local_matrix, tx, ty);