Make ImageDecodeBench build once again

third_party/WebKit/Source/web/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 &&
 //      ./out/Release/image_decode_bench file [iterations]
 //
 // TODO(noel): Consider adding md5 checksum support to WTF. Use it to compute
 // the decoded image frame md5 and output that value.
 //
 // TODO(noel): Consider integrating this tool in Chrome telemetry for realz,
 // using the image corpii used to assess Blink image decode performance. Refer
 // to http://crbug.com/398235#c103 and http://crbug.com/258324#c5
 
+#include "base/command_line.h"
 #include "platform/SharedBuffer.h"
 #include "platform/image-decoders/ImageDecoder.h"
-#include "platform/testing/TestingPlatformSupport.h"
 #include "public/platform/Platform.h"
 #include "public/web/WebKit.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 
 #if defined(_WIN32)
-#if defined(WIN32_LEAN_AND_MEAN)
-#error Fix: WIN32_LEAN_AND_MEAN disables timeBeginPeriod/TimeEndPeriod.
-#endif

[Noel Gordon, 2016/05/02 12:34:55]

Yeap, that looks good.

 #include <mmsystem.h>
 #include <sys/stat.h>
 #include <time.h>
 #define stat(x,y) _stat(x,y)
 typedef struct _stat sttype;
 #else
 #include <sys/stat.h>
 #include <sys/time.h>
 typedef struct stat sttype;
 #endif
@@ skipping 231 matching lines @@
         int frameCount = decoder->frameCount();
         for (int i = 0; i < frameCount; ++i) {
             if (!decoder->frameBufferAtIndex(i))
                 return false;
         }
 
         return !decoder->failed();
     }
 
     RefPtr<SharedBuffer> packetData = SharedBuffer::create();
-    unsigned position = 0;
+    size_t position = 0;
     while (true) {
         const char* packet;
-        unsigned length = data->getSomeData(packet, position);
+        size_t length = data->getSomeData(packet, position);
 
         length = std::min(static_cast<size_t>(length), packetSize);

[Noel Gordon, 2016/05/02 12:34:55]

nit: static_cast<size_t>(length) -> length

         packetData->append(packet, length);
         position += length;
 
         bool allDataReceived = position == data->size();
         decoder->setData(packetData.get(), allDataReceived);
 
         int frameCount = decoder->frameCount();
         for (int i = 0; i < frameCount; ++i) {
             if (!decoder->frameBufferAtIndex(i))
                 break;
         }
 
         if (allDataReceived || decoder->failed())
             break;
     }
 
     return !decoder->failed();
 }
 
 int main(int argc, char* argv[])
 {
+    base::CommandLine::Init(argc, argv);

[Noel Gordon, 2016/05/02 12:34:55]

As you noted, this is the thing we need to fix (due to the presubmit warning you
mentioned).

     char* name = argv[0];
 
     // If the platform supports color correction, allow it to be controlled.
 
     bool applyColorCorrection = false;
 
 #if USE(QCMSLIB)
     if (argc >= 2 && strcmp(argv[1], "--color-correct") == 0)
         applyColorCorrection = (--argc, ++argv, true);
 
@@ skipping 28 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.
 
-    class WebPlatform : public TestingPlatformSupport {
+    class WebPlatform : public blink::Platform {
     public:
         void screenColorProfile(WebVector<char>* profile) override
         {
             getScreenColorProfile(profile); // Returns a whacked color profile.
         }
     };
 
     Platform::initialize(new WebPlatform());
 
     // Set image decoding Platform options.
 
-#if USE(QCMSLIB)
-    ImageDecoder::qcmsOutputDeviceProfile(); // Initialize screen colorProfile.
-#endif
-
     // Read entire file content to data.
 
     RefPtr<SharedBuffer> data = readFile(argv[1]);
     if (!data.get() || !data->size()) {
         fprintf(stderr, "Error reading image data from [%s]\n", argv[1]);
         exit(2);
     }
 
     // Consolidate the SharedBuffer data segments into one, contiguous block of memory.
     data->data();
 
+    // Throw out the first iteration for more consistent data.
+    if (!decodeImageData(data.get(), applyColorCorrection, packetSize)) {
+        fprintf(stderr, "Image decode failed [%s]\n", argv[1]);
+        exit(3);
+    }
+
     // Image decode bench for iterations.
 
     double totalTime = 0.0;
 
     for (size_t i = 0; i < iterations; ++i) {
         double startTime = getCurrentTime();
         bool decoded = decodeImageData(data.get(), applyColorCorrection, packetSize);
         double elapsedTime = getCurrentTime() - startTime;
         totalTime += elapsedTime;
         if (!decoded) {
             fprintf(stderr, "Image decode failed [%s]\n", argv[1]);
             exit(3);
         }
     }
 
     // Results to stdout.
 
     double averageTime = totalTime / static_cast<double>(iterations);
     printf("%f %f\n", totalTime, averageTime);
     return 0;
 }