Re-enable image_decode_bench target

third_party/WebKit/Source/platform/testing/ImageDecodeBench.cpp

 // Copyright 2015 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.
 
 // Provides a minimal wrapping of the Blink image decoders. Used to perform
 // a non-threaded, memory-to-memory image decode using micro second accuracy
 // clocks to measure image decode time. Optionally applies color correction
 // during image decoding on supported platforms (default off). Usage:
 //
 //   % ninja -C out/Release image_decode_bench &&
@@ skipping 240 matching lines @@
     exit(2);
   }
 
   fclose(fp);
   return SharedBuffer::create(buffer.get(), fileSize);
 }
 
 bool decodeImageData(SharedBuffer* data,
                      bool colorCorrection,
                      size_t packetSize) {
-  std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(
-      *data, ImageDecoder::AlphaPremultiplied,
-      colorCorrection ? ImageDecoder::GammaAndColorProfileApplied
-                      : ImageDecoder::GammaAndColorProfileIgnored);
+  std::unique_ptr<ImageDecoder> decoder =
+      ImageDecoder::create(data, true, ImageDecoder::AlphaPremultiplied,
+                           colorCorrection ? ImageDecoder::ColorSpaceApplied
+                                           : ImageDecoder::ColorSpaceIgnored);
 
   if (!packetSize) {
     bool allDataReceived = true;
     decoder->setData(data, allDataReceived);
 
     int frameCount = decoder->frameCount();
     for (int i = 0; i < frameCount; ++i) {
       if (!decoder->frameBufferAtIndex(i))
         return false;
     }
@@ skipping 68 matching lines @@
               "Third argument should be packet size. Default is "
               "0, meaning to decode the entire image in one packet. You "
               "supplied %s\n",
               argv[3]);
       exit(1);
     }
   }
 
   // Create a web platform without V8.
 
-  class WebPlatform : public blink::Platform {
-   public:
-    void screenColorProfile(WebVector<char>* profile) override {
-      getScreenColorProfile(profile);  // Returns a color spin color profile.

[scroggo_chromium, 2016/11/09 14:16:59]

msarett@, do you know the right way to set this now? I'm guessing we still want
to put in some sort of dummy profile.

[msarett1, 2016/11/09 15:01:58]

I'm not aware that this has changed.  The profile is still ICC data at this
point.

Why is this deleted?

[Simon Hosie, 2016/11/09 17:29:13]

The method it overrides was deleted in
https://chromium.googlesource.com/chromium/src/+/6fc2fd3b6c99c97632b7fe43bdbf...

I wasn't sure how to reconnect things properly.

[msarett1, 2016/11/09 18:18:28]

Ahh thanks!  It looks to me like now instead we can call static void
setTargetColorProfile(const WebVector<char>&); directly on the ImageDecoder.

-    }
-  };
+  class WebPlatform : public blink::Platform {};
 
   Platform::initialize(new WebPlatform());
 
   // Read entire file content to data, and consolidate the SharedBuffer data
   // segments into one, contiguous block of memory.
 
   RefPtr<SharedBuffer> data = readFile(argv[1]);
   if (!data.get() || !data->size()) {
     fprintf(stderr, "Error reading image data from [%s]\n", argv[1]);
     exit(2);
@@ skipping 23 matching lines @@
       exit(3);
     }
   }
 
   // Results to stdout.
 
   double averageTime = totalTime / static_cast<double>(iterations);
   printf("%f %f\n", totalTime, averageTime);
   return 0;
 }