WIP: Implement APNG

third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoderTest.cpp

 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2016 Google Inc. All rights reserved.

[scroggo_chromium, 2016/10/04 14:50:16]

I think you want a simpler copyright header:

// Copyright 2016 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.

(From https://www.chromium.org/blink/coding-style#TOC-License)

[joostouwerling, 2016/10/11 16:31:06]

Acknowledged.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "platform/image-decoders/png/PNGImageDecoder.h"
+
+#include "platform/RuntimeEnabledFeatures.h"
+#include "platform/SharedBuffer.h"
+#include "platform/image-decoders/ImageDecoderTestHelpers.h"
 #include "public/platform/WebData.h"
-
-#include "platform/SharedBuffer.h"
+#include "public/platform/WebSize.h"

[scroggo_chromium, 2016/10/04 14:50:16]

I don't think you need this (or WebData.h). Make sure you need the rest. I think
you can drop a few more, too.

[joostouwerling, 2016/10/11 16:31:06]

Acknowledged.

+#include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/PtrUtil.h"
+#include "wtf/Vector.h"
+#include "wtf/dtoa/utils.h"
+#include <memory>
 
 namespace blink {
 
-void WebData::reset()
+namespace {
+
+std::unique_ptr<ImageDecoder> createDecoder(ImageDecoder::AlphaOption alphaOption)
 {
-    m_private.reset();
+    return wrapUnique(new PNGImageDecoder(alphaOption,
+                                          ImageDecoder::GammaAndColorProfileApplied,
+                                          ImageDecoder::noDecodedImageByteLimit));
 }
 
-void WebData::assign(const WebData& other)
+std::unique_ptr<ImageDecoder> createDecoder()
 {
-    m_private = other.m_private;
+    return createDecoder(ImageDecoder::AlphaNotPremultiplied);
 }
 
-void WebData::assign(const char* data, size_t size)
+void testFrameCount(const char* pngFile, size_t expectedFrameCount)
 {
-    m_private = SharedBuffer::create(data, size);
+    auto decoder = createDecoder();
+
+    auto data = readFile(pngFile);
+    ASSERT_TRUE(data.get());
+    decoder->setData(data.get(), true);
+
+    EXPECT_EQ(expectedFrameCount, decoder->frameCount());
 }
 
-size_t WebData::size() const
+} // Anonymous namespace
+
+TEST(AnimatedPNGTests, FrameCountTest)
 {
-    if (m_private.isNull())
-        return 0;
-    return m_private->size();
+    testFrameCount("/LayoutTests/fast/images/resources/png-animated-idat-part-of-animation.png", 20);
+    testFrameCount("/LayoutTests/fast/images/resources/png-animated-idat-not-part-of-animation.png", 1);
 }
 
-const char* WebData::data() const
+TEST(StaticPNGTests, FrameCountTest)
 {
-    if (m_private.isNull())
-        return 0;
-    return m_private->data();
+    testFrameCount("/LayoutTests/fast/images/resources/png-simple.png", 1);
 }
 
-WebData::WebData(PassRefPtr<SharedBuffer> buffer)
-    : m_private(buffer)
-{
-}
-
-WebData& WebData::operator=(PassRefPtr<SharedBuffer> buffer)
-{
-    m_private = buffer;
-    return *this;
-}
-
-WebData::operator PassRefPtr<SharedBuffer>() const
-{
-    return PassRefPtr<SharedBuffer>(m_private.get());
-}
-
-} // namespace blink
+}; // namespace blink