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 (colorCorrection) {
+    WebVector<char> profile;
+    getScreenColorProfile(&profile);  // Returns a color spin color profile.
+    decoder->setTargetColorProfile(profile);

[Simon Hosie, 2016/11/15 01:50:00]

So far as I could see `profile` doesn't need to live beyond this point.  Hope I
didn't miss anything.  Seems to work.

[scroggo_chromium, 2016/11/15 14:54:42]

Agreed. setTargetColorProfile will store an object that this profile  represents
[1].

This method is static, though, so you can call
ImageDecoder::setTargetColorProfile() once at the beginning of main().

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/platform/image...

[Simon Hosie, 2016/11/16 01:36:33]

Done.

+  }
 
   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 66 matching lines @@
     if (*end != '\0') {
       fprintf(stderr,
               "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.

[scroggo_chromium, 2016/11/15 14:54:42]

This comment appears to no longer apply. When this code was first added (here
[1]), we called blink::initializeWithoutV8. That method no longer exists,
though. It looks like Platform::initialize() is minimal though [2].

[1]
https://chromium.googlesource.com/chromium/src/+/b54402e4c1766963e82c35393e9c...
[2]
https://cs.chromium.org/chromium/src/third_party/WebKit/public/platform/Platf...

[Simon Hosie, 2016/11/16 01:36:32]

Done.

 
-  class WebPlatform : public blink::Platform {
-   public:
-    void screenColorProfile(WebVector<char>* profile) override {
-      getScreenColorProfile(profile);  // Returns a color spin color profile.
-    }
-  };
+  class WebPlatform : public blink::Platform {};

[scroggo_chromium, 2016/11/15 14:54:42]

Without overriding anything, I don't think you need this class anymore. Can you
just do:

Platform::initialize(new Platform());

?

Edit - now I see - Platform's constructor is protected, so you cannot new
Platform(). Maybe add a comment explaining why it's necessary?

[Simon Hosie, 2016/11/16 01:36:32]

Done.

 
   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;
 }