Revert of Add stable id to PaintImage.

third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 145 matching lines @@
 
 TEST_F(DeferredImageDecoderTest, drawIntoPaintRecord) {
   lazy_decoder_->SetData(data_, true);
   sk_sp<SkImage> image = lazy_decoder_->CreateFrameAtIndex(0);
   ASSERT_TRUE(image);
   EXPECT_EQ(1, image->width());
   EXPECT_EQ(1, image->height());
 
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(PaintImage(PaintImage::GetNextId(), std::move(image)),
-                         0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, decode_request_count_);
 
   canvas_->drawPicture(record);
   EXPECT_EQ(0, decode_request_count_);
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), bitmap_.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, drawIntoPaintRecordProgressive) {
   RefPtr<SharedBuffer> partial_data =
       SharedBuffer::Create(data_->Data(), data_->size() - 10);
 
   // Received only half the file.
   lazy_decoder_->SetData(partial_data, false);
   sk_sp<SkImage> image = lazy_decoder_->CreateFrameAtIndex(0);
   ASSERT_TRUE(image);
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  PaintImage::Id stable_id = PaintImage::GetNextId();
   temp_canvas->drawImage(
-      PaintImage(stable_id, std::move(image), PaintImage::AnimationType::STATIC,
+      PaintImage(std::move(image), PaintImage::AnimationType::STATIC,
                  PaintImage::CompletionState::PARTIALLY_DONE),
       0, 0);
   canvas_->drawPicture(recorder.finishRecordingAsPicture());
 
   // Fully received the file and draw the PaintRecord again.
   lazy_decoder_->SetData(data_, true);
   image = lazy_decoder_->CreateFrameAtIndex(0);
   ASSERT_TRUE(image);
   temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(PaintImage(stable_id, std::move(image)), 0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   canvas_->drawPicture(recorder.finishRecordingAsPicture());
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), bitmap_.getColor(0, 0));
 }
 
 static void RasterizeMain(PaintCanvas* canvas, sk_sp<PaintRecord> record) {
   canvas->drawPicture(record);
 }
 
 TEST_F(DeferredImageDecoderTest, decodeOnOtherThread) {
   lazy_decoder_->SetData(data_, true);
   sk_sp<SkImage> image = lazy_decoder_->CreateFrameAtIndex(0);
   ASSERT_TRUE(image);
   EXPECT_EQ(1, image->width());
   EXPECT_EQ(1, image->height());
 
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(PaintImage(PaintImage::GetNextId(), std::move(image)),
-                         0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, decode_request_count_);
 
   // Create a thread to rasterize PaintRecord.
   std::unique_ptr<WebThread> thread =
       Platform::Current()->CreateThread("RasterThread");
   thread->GetWebTaskRunner()->PostTask(
       BLINK_FROM_HERE,
       CrossThreadBind(&RasterizeMain, CrossThreadUnretained(canvas_.get()),
                       record));
@@ skipping 73 matching lines @@
   sk_sp<SkImage> image = lazy_decoder_->CreateFrameAtIndex(0);
   ASSERT_TRUE(image);
   EXPECT_EQ(decoded_size_.Width(), image->width());
   EXPECT_EQ(decoded_size_.Height(), image->height());
 
   UseMockImageDecoderFactory();
 
   // The following code should not fail any assert.
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(PaintImage(PaintImage::GetNextId(), std::move(image)),
-                         0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, decode_request_count_);
   canvas_->drawPicture(record);
   EXPECT_EQ(1, decode_request_count_);
 }
 
 TEST_F(DeferredImageDecoderTest, smallerFrameCount) {
   frame_count_ = 1;
   lazy_decoder_->SetData(data_, false);
   EXPECT_EQ(frame_count_, lazy_decoder_->FrameCount());
@@ skipping 64 matching lines @@
       SharedBuffer::Create(data_->Data(), data_->size());
   EXPECT_EQ(original_data->size(), data_->size());
   lazy_decoder_->SetData(original_data, false);
   RefPtr<SharedBuffer> new_data = lazy_decoder_->Data();
   EXPECT_EQ(original_data->size(), new_data->size());
   EXPECT_EQ(0, std::memcmp(original_data->Data(), new_data->Data(),
                            new_data->size()));
 }
 
 }  // namespace blink