SkPDF: Move SkFlate into src/pdf (part 1/3) [reland]

Rename to SkDeflate so Chromium builders continue to work

Next, we change remove SkFlate from Chromium build files, then we can delete SkFlate.

Review URL: https://codereview.chromium.org/1285913002

12 files changed, 308 insertions, 310 deletions

diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 1e69d9164e..c294986c79 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -20,7 +20,7 @@
       'variables': { 'skia_pdf_use_sfntly%': 1, },
       'dependencies': [
         'skia_lib.gyp:skia_lib',
-        'skflate.gyp:skflate',
+        'zlib.gyp:zlib',
       ],
       'includes': [
         'pdf.gypi',
diff --git a/gyp/pdf.gypi b/gyp/pdf.gypi
index 0c9cb0695d..f114fa7f9f 100644
--- a/gyp/pdf.gypi
+++ b/gyp/pdf.gypi
@@ -12,6 +12,8 @@
 {
     'sources': [
         '<(skia_src_path)/doc/SkDocument_PDF.cpp',
+        '<(skia_src_path)/pdf/SkDeflate.cpp',
+        '<(skia_src_path)/pdf/SkDeflate.h',
         '<(skia_src_path)/pdf/SkJpegInfo.cpp',
         '<(skia_src_path)/pdf/SkJpegInfo.h',
         '<(skia_src_path)/pdf/SkPDFBitmap.cpp',
diff --git a/gyp/skflate.gyp b/gyp/skflate.gyp
deleted file mode 100644
index d3193a3a4a..0000000000
--- a/gyp/skflate.gyp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Target for including SkFlate.
-{
-  'targets': [
-    {
-      'target_name': 'skflate',
-      'type': 'static_library',
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-        'zlib.gyp:zlib',
-      ],
-      'sources': [ '../src/core/SkFlate.cpp' ],
-    },
-  ],
-}
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 1d764e8400..9c9f5fcbc6 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -5,221 +5,3 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-
-#include "SkData.h"
-#include "SkFlate.h"
-#include "SkStream.h"
-
-namespace {
-
-#ifdef ZLIB_INCLUDE
-    #include ZLIB_INCLUDE
-#else
-    #include "zlib.h"
-#endif
-
-// static
-const size_t kBufferSize = 1024;
-
-// Different zlib implementations use different T.
-// We've seen size_t and unsigned.
-template <typename T> void* skia_alloc_func(void*, T items, T size) {
-    return sk_calloc_throw(SkToSizeT(items) * SkToSizeT(size));
-}
-
-static void skia_free_func(void*, void* address) { sk_free(address); }
-
-bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
-    uint8_t inputBuffer[kBufferSize];
-    uint8_t outputBuffer[kBufferSize];
-    z_stream flateData;
-    flateData.zalloc = &skia_alloc_func;
-    flateData.zfree = &skia_free_func;
-    flateData.opaque = NULL;
-    flateData.next_in = NULL;
-    flateData.avail_in = 0;
-    flateData.next_out = outputBuffer;
-    flateData.avail_out = kBufferSize;
-    int rc;
-    if (compress)
-        rc = deflateInit(&flateData, Z_DEFAULT_COMPRESSION);
-    else
-        rc = inflateInit(&flateData);
-    if (rc != Z_OK)
-        return false;
-
-    uint8_t* input = (uint8_t*)src->getMemoryBase();
-    size_t inputLength = src->getLength();
-    if (input == NULL || inputLength == 0) {
-        input = NULL;
-        flateData.next_in = inputBuffer;
-        flateData.avail_in = 0;
-    } else {
-        flateData.next_in = input;
-        flateData.avail_in = SkToUInt(inputLength);
-    }
-
-    rc = Z_OK;
-    while (true) {
-        if (flateData.avail_out < kBufferSize) {
-            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out)) {
-                rc = Z_BUF_ERROR;
-                break;
-            }
-            flateData.next_out = outputBuffer;
-            flateData.avail_out = kBufferSize;
-        }
-        if (rc != Z_OK)
-            break;
-        if (flateData.avail_in == 0) {
-            if (input != NULL)
-                break;
-            size_t read = src->read(&inputBuffer, kBufferSize);
-            if (read == 0)
-                break;
-            flateData.next_in = inputBuffer;
-            flateData.avail_in = SkToUInt(read);
-        }
-        if (compress)
-            rc = deflate(&flateData, Z_NO_FLUSH);
-        else
-            rc = inflate(&flateData, Z_NO_FLUSH);
-    }
-    while (rc == Z_OK) {
-        if (compress)
-            rc = deflate(&flateData, Z_FINISH);
-        else
-            rc = inflate(&flateData, Z_FINISH);
-        if (flateData.avail_out < kBufferSize) {
-            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out))
-                return false;
-            flateData.next_out = outputBuffer;
-            flateData.avail_out = kBufferSize;
-        }
-    }
-
-    if (compress)
-        deflateEnd(&flateData);
-    else
-        inflateEnd(&flateData);
-    if (rc == Z_STREAM_END)
-        return true;
-    return false;
-}
-
-}
-
-// static
-bool SkFlate::Deflate(SkStream* src, SkWStream* dst) {
-    return doFlate(true, src, dst);
-}
-
-bool SkFlate::Deflate(const void* ptr, size_t len, SkWStream* dst) {
-    SkMemoryStream stream(ptr, len);
-    return doFlate(true, &stream, dst);
-}
-
-bool SkFlate::Deflate(const SkData* data, SkWStream* dst) {
-    if (data) {
-        SkMemoryStream stream(data->data(), data->size());
-        return doFlate(true, &stream, dst);
-    }
-    return false;
-}
-
-// static
-bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
-    return doFlate(false, src, dst);
-}
-
-
-#define SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE 4096
-#define SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE 4224  // 4096 + 128, usually big
-                                                  // enough to always do a
-                                                  // single loop.
-
-// called by both write() and finalize()
-static void do_deflate(int flush,
-                       z_stream* zStream,
-                       SkWStream* out,
-                       unsigned char* inBuffer,
-                       size_t inBufferSize) {
-    zStream->next_in = inBuffer;
-    zStream->avail_in = SkToInt(inBufferSize);
-    unsigned char outBuffer[SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE];
-    SkDEBUGCODE(int returnValue;)
-    do {
-        zStream->next_out = outBuffer;
-        zStream->avail_out = sizeof(outBuffer);
-        SkDEBUGCODE(returnValue =) deflate(zStream, flush);
-        SkASSERT(!zStream->msg);
-
-        out->write(outBuffer, sizeof(outBuffer) - zStream->avail_out);
-    } while (zStream->avail_in || !zStream->avail_out);
-    SkASSERT(flush == Z_FINISH
-                 ? returnValue == Z_STREAM_END
-                 : returnValue == Z_OK);
-}
-
-// Hide all zlib impl details.
-struct SkDeflateWStream::Impl {
-    SkWStream* fOut;
-    unsigned char fInBuffer[SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE];
-    size_t fInBufferIndex;
-    z_stream fZStream;
-};
-
-SkDeflateWStream::SkDeflateWStream(SkWStream* out)
-    : fImpl(SkNEW(SkDeflateWStream::Impl)) {
-    fImpl->fOut = out;
-    fImpl->fInBufferIndex = 0;
-    if (!fImpl->fOut) {
-        return;
-    }
-    fImpl->fZStream.zalloc = &skia_alloc_func;
-    fImpl->fZStream.zfree = &skia_free_func;
-    fImpl->fZStream.opaque = NULL;
-    SkDEBUGCODE(int r =) deflateInit(&fImpl->fZStream, Z_DEFAULT_COMPRESSION);
-    SkASSERT(Z_OK == r);
-}
-
-SkDeflateWStream::~SkDeflateWStream() { this->finalize(); }
-
-void SkDeflateWStream::finalize() {
-    if (!fImpl->fOut) {
-        return;
-    }
-    do_deflate(Z_FINISH, &fImpl->fZStream, fImpl->fOut, fImpl->fInBuffer,
-               fImpl->fInBufferIndex);
-    (void)deflateEnd(&fImpl->fZStream);
-    fImpl->fOut = NULL;
-}
-
-bool SkDeflateWStream::write(const void* void_buffer, size_t len) {
-    if (!fImpl->fOut) {
-        return false;
-    }
-    const char* buffer = (const char*)void_buffer;
-    while (len > 0) {
-        size_t tocopy =
-                SkTMin(len, sizeof(fImpl->fInBuffer) - fImpl->fInBufferIndex);
-        memcpy(fImpl->fInBuffer + fImpl->fInBufferIndex, buffer, tocopy);
-        len -= tocopy;
-        buffer += tocopy;
-        fImpl->fInBufferIndex += tocopy;
-        SkASSERT(fImpl->fInBufferIndex <= sizeof(fImpl->fInBuffer));
-
-        // if the buffer isn't filled, don't call into zlib yet.
-        if (sizeof(fImpl->fInBuffer) == fImpl->fInBufferIndex) {
-            do_deflate(Z_NO_FLUSH, &fImpl->fZStream, fImpl->fOut,
-                       fImpl->fInBuffer, fImpl->fInBufferIndex);
-            fImpl->fInBufferIndex = 0;
-        }
-    }
-    return true;
-}
-
-size_t SkDeflateWStream::bytesWritten() const {
-    return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
-}
diff --git a/src/core/SkFlate.h b/src/core/SkFlate.h
index 0104c4514d..9c9f5fcbc6 100644
--- a/src/core/SkFlate.h
+++ b/src/core/SkFlate.h
@@ -5,71 +5,3 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-
-#ifndef SkFlate_DEFINED
-#define SkFlate_DEFINED
-
-#include "SkTypes.h"
-
-#include "SkStream.h"
-class SkData;
-
-/** \class SkFlate
-    A class to provide access to the flate compression algorithm.
-*/
-class SkFlate {
-public:
-    /**
-     *  Use the flate compression algorithm to compress the data in src,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(SkStream* src, SkWStream* dst);
-
-    /**
-     *  Use the flate compression algorithm to compress the data in src,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(const void* src, size_t len, SkWStream* dst);
-
-    /**
-     *  Use the flate compression algorithm to compress the data,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(const SkData*, SkWStream* dst);
-
-    /** Use the flate compression algorithm to decompress the data in src,
-        putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Inflate(SkStream* src, SkWStream* dst);
-};
-
-/**
-  * Wrap a stream in this class to compress the information written to
-  * this stream using the Deflate algorithm.  Uses Zlib's
-  * Z_DEFAULT_COMPRESSION level.
-  *
-  * See http://en.wikipedia.org/wiki/DEFLATE
-  */
-class SkDeflateWStream : public SkWStream {
-public:
-    /** Does not take ownership of the stream. */
-    SkDeflateWStream(SkWStream*);
-
-    /** The destructor calls finalize(). */
-    ~SkDeflateWStream();
-
-    /** Write the end of the compressed stream.  All subsequent calls to
-        write() will fail. Subsequent calls to finalize() do nothing. */
-    void finalize();
-
-    // The SkWStream interface:
-    bool write(const void*, size_t) override;
-    size_t bytesWritten() const override;
-
-private:
-    struct Impl;
-    SkAutoTDelete<Impl> fImpl;
-};
-
-#endif  // SkFlate_DEFINED
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
new file mode 100644
index 0000000000..0953ef27fb
--- /dev/null
+++ b/src/pdf/SkDeflate.cpp
@@ -0,0 +1,225 @@
+
+/*
+ * Copyright 2010 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "SkData.h"
+#include "SkDeflate.h"
+#include "SkStream.h"
+
+namespace {
+
+#ifdef ZLIB_INCLUDE
+    #include ZLIB_INCLUDE
+#else
+    #include "zlib.h"
+#endif
+
+// static
+const size_t kBufferSize = 1024;
+
+// Different zlib implementations use different T.
+// We've seen size_t and unsigned.
+template <typename T> void* skia_alloc_func(void*, T items, T size) {
+    return sk_calloc_throw(SkToSizeT(items) * SkToSizeT(size));
+}
+
+static void skia_free_func(void*, void* address) { sk_free(address); }
+
+bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
+    uint8_t inputBuffer[kBufferSize];
+    uint8_t outputBuffer[kBufferSize];
+    z_stream flateData;
+    flateData.zalloc = &skia_alloc_func;
+    flateData.zfree = &skia_free_func;
+    flateData.opaque = NULL;
+    flateData.next_in = NULL;
+    flateData.avail_in = 0;
+    flateData.next_out = outputBuffer;
+    flateData.avail_out = kBufferSize;
+    int rc;
+    if (compress)
+        rc = deflateInit(&flateData, Z_DEFAULT_COMPRESSION);
+    else
+        rc = inflateInit(&flateData);
+    if (rc != Z_OK)
+        return false;
+
+    uint8_t* input = (uint8_t*)src->getMemoryBase();
+    size_t inputLength = src->getLength();
+    if (input == NULL || inputLength == 0) {
+        input = NULL;
+        flateData.next_in = inputBuffer;
+        flateData.avail_in = 0;
+    } else {
+        flateData.next_in = input;
+        flateData.avail_in = SkToUInt(inputLength);
+    }
+
+    rc = Z_OK;
+    while (true) {
+        if (flateData.avail_out < kBufferSize) {
+            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out)) {
+                rc = Z_BUF_ERROR;
+                break;
+            }
+            flateData.next_out = outputBuffer;
+            flateData.avail_out = kBufferSize;
+        }
+        if (rc != Z_OK)
+            break;
+        if (flateData.avail_in == 0) {
+            if (input != NULL)
+                break;
+            size_t read = src->read(&inputBuffer, kBufferSize);
+            if (read == 0)
+                break;
+            flateData.next_in = inputBuffer;
+            flateData.avail_in = SkToUInt(read);
+        }
+        if (compress)
+            rc = deflate(&flateData, Z_NO_FLUSH);
+        else
+            rc = inflate(&flateData, Z_NO_FLUSH);
+    }
+    while (rc == Z_OK) {
+        if (compress)
+            rc = deflate(&flateData, Z_FINISH);
+        else
+            rc = inflate(&flateData, Z_FINISH);
+        if (flateData.avail_out < kBufferSize) {
+            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out))
+                return false;
+            flateData.next_out = outputBuffer;
+            flateData.avail_out = kBufferSize;
+        }
+    }
+
+    if (compress)
+        deflateEnd(&flateData);
+    else
+        inflateEnd(&flateData);
+    if (rc == Z_STREAM_END)
+        return true;
+    return false;
+}
+
+}
+
+// static
+bool SkFlate::Deflate(SkStream* src, SkWStream* dst) {
+    return doFlate(true, src, dst);
+}
+
+bool SkFlate::Deflate(const void* ptr, size_t len, SkWStream* dst) {
+    SkMemoryStream stream(ptr, len);
+    return doFlate(true, &stream, dst);
+}
+
+bool SkFlate::Deflate(const SkData* data, SkWStream* dst) {
+    if (data) {
+        SkMemoryStream stream(data->data(), data->size());
+        return doFlate(true, &stream, dst);
+    }
+    return false;
+}
+
+// static
+bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
+    return doFlate(false, src, dst);
+}
+
+
+#define SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE 4096
+#define SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE 4224  // 4096 + 128, usually big
+                                                  // enough to always do a
+                                                  // single loop.
+
+// called by both write() and finalize()
+static void do_deflate(int flush,
+                       z_stream* zStream,
+                       SkWStream* out,
+                       unsigned char* inBuffer,
+                       size_t inBufferSize) {
+    zStream->next_in = inBuffer;
+    zStream->avail_in = SkToInt(inBufferSize);
+    unsigned char outBuffer[SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE];
+    SkDEBUGCODE(int returnValue;)
+    do {
+        zStream->next_out = outBuffer;
+        zStream->avail_out = sizeof(outBuffer);
+        SkDEBUGCODE(returnValue =) deflate(zStream, flush);
+        SkASSERT(!zStream->msg);
+
+        out->write(outBuffer, sizeof(outBuffer) - zStream->avail_out);
+    } while (zStream->avail_in || !zStream->avail_out);
+    SkASSERT(flush == Z_FINISH
+                 ? returnValue == Z_STREAM_END
+                 : returnValue == Z_OK);
+}
+
+// Hide all zlib impl details.
+struct SkDeflateWStream::Impl {
+    SkWStream* fOut;
+    unsigned char fInBuffer[SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE];
+    size_t fInBufferIndex;
+    z_stream fZStream;
+};
+
+SkDeflateWStream::SkDeflateWStream(SkWStream* out)
+    : fImpl(SkNEW(SkDeflateWStream::Impl)) {
+    fImpl->fOut = out;
+    fImpl->fInBufferIndex = 0;
+    if (!fImpl->fOut) {
+        return;
+    }
+    fImpl->fZStream.zalloc = &skia_alloc_func;
+    fImpl->fZStream.zfree = &skia_free_func;
+    fImpl->fZStream.opaque = NULL;
+    SkDEBUGCODE(int r =) deflateInit(&fImpl->fZStream, Z_DEFAULT_COMPRESSION);
+    SkASSERT(Z_OK == r);
+}
+
+SkDeflateWStream::~SkDeflateWStream() { this->finalize(); }
+
+void SkDeflateWStream::finalize() {
+    if (!fImpl->fOut) {
+        return;
+    }
+    do_deflate(Z_FINISH, &fImpl->fZStream, fImpl->fOut, fImpl->fInBuffer,
+               fImpl->fInBufferIndex);
+    (void)deflateEnd(&fImpl->fZStream);
+    fImpl->fOut = NULL;
+}
+
+bool SkDeflateWStream::write(const void* void_buffer, size_t len) {
+    if (!fImpl->fOut) {
+        return false;
+    }
+    const char* buffer = (const char*)void_buffer;
+    while (len > 0) {
+        size_t tocopy =
+                SkTMin(len, sizeof(fImpl->fInBuffer) - fImpl->fInBufferIndex);
+        memcpy(fImpl->fInBuffer + fImpl->fInBufferIndex, buffer, tocopy);
+        len -= tocopy;
+        buffer += tocopy;
+        fImpl->fInBufferIndex += tocopy;
+        SkASSERT(fImpl->fInBufferIndex <= sizeof(fImpl->fInBuffer));
+
+        // if the buffer isn't filled, don't call into zlib yet.
+        if (sizeof(fImpl->fInBuffer) == fImpl->fInBufferIndex) {
+            do_deflate(Z_NO_FLUSH, &fImpl->fZStream, fImpl->fOut,
+                       fImpl->fInBuffer, fImpl->fInBufferIndex);
+            fImpl->fInBufferIndex = 0;
+        }
+    }
+    return true;
+}
+
+size_t SkDeflateWStream::bytesWritten() const {
+    return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
+}
diff --git a/src/pdf/SkDeflate.h b/src/pdf/SkDeflate.h
new file mode 100644
index 0000000000..0104c4514d
--- /dev/null
+++ b/src/pdf/SkDeflate.h
@@ -0,0 +1,75 @@
+
+/*
+ * Copyright 2010 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef SkFlate_DEFINED
+#define SkFlate_DEFINED
+
+#include "SkTypes.h"
+
+#include "SkStream.h"
+class SkData;
+
+/** \class SkFlate
+    A class to provide access to the flate compression algorithm.
+*/
+class SkFlate {
+public:
+    /**
+     *  Use the flate compression algorithm to compress the data in src,
+     *  putting the result into dst.  Returns false if an error occurs.
+     */
+    static bool Deflate(SkStream* src, SkWStream* dst);
+
+    /**
+     *  Use the flate compression algorithm to compress the data in src,
+     *  putting the result into dst.  Returns false if an error occurs.
+     */
+    static bool Deflate(const void* src, size_t len, SkWStream* dst);
+
+    /**
+     *  Use the flate compression algorithm to compress the data,
+     *  putting the result into dst.  Returns false if an error occurs.
+     */
+    static bool Deflate(const SkData*, SkWStream* dst);
+
+    /** Use the flate compression algorithm to decompress the data in src,
+        putting the result into dst.  Returns false if an error occurs.
+     */
+    static bool Inflate(SkStream* src, SkWStream* dst);
+};
+
+/**
+  * Wrap a stream in this class to compress the information written to
+  * this stream using the Deflate algorithm.  Uses Zlib's
+  * Z_DEFAULT_COMPRESSION level.
+  *
+  * See http://en.wikipedia.org/wiki/DEFLATE
+  */
+class SkDeflateWStream : public SkWStream {
+public:
+    /** Does not take ownership of the stream. */
+    SkDeflateWStream(SkWStream*);
+
+    /** The destructor calls finalize(). */
+    ~SkDeflateWStream();
+
+    /** Write the end of the compressed stream.  All subsequent calls to
+        write() will fail. Subsequent calls to finalize() do nothing. */
+    void finalize();
+
+    // The SkWStream interface:
+    bool write(const void*, size_t) override;
+    size_t bytesWritten() const override;
+
+private:
+    struct Impl;
+    SkAutoTDelete<Impl> fImpl;
+};
+
+#endif  // SkFlate_DEFINED
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index 4e044a2b21..f1a053f0aa 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -7,7 +7,7 @@
 
 #include "SkColorPriv.h"
 #include "SkData.h"
-#include "SkFlate.h"
+#include "SkDeflate.h"
 #include "SkImageGenerator.h"
 #include "SkJpegInfo.h"
 #include "SkPDFBitmap.h"
diff --git a/src/pdf/SkPDFStream.cpp b/src/pdf/SkPDFStream.cpp
index f77c85fc94..e709357e60 100644
--- a/src/pdf/SkPDFStream.cpp
+++ b/src/pdf/SkPDFStream.cpp
@@ -8,7 +8,7 @@
 
 
 #include "SkData.h"
-#include "SkFlate.h"
+#include "SkDeflate.h"
 #include "SkPDFStream.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
diff --git a/tests/PDFDeflateWStreamTest.cpp b/tests/PDFDeflateWStreamTest.cpp
index b22574671b..bc0defc5fe 100644
--- a/tests/PDFDeflateWStreamTest.cpp
+++ b/tests/PDFDeflateWStreamTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkFlate.h"
+#include "SkDeflate.h"
 #include "SkRandom.h"
 #include "Test.h"
 
diff --git a/tests/PDFFlateTest.cpp b/tests/PDFFlateTest.cpp
index 40efe1a5d8..64dc4e2586 100644
--- a/tests/PDFFlateTest.cpp
+++ b/tests/PDFFlateTest.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SkData.h"
-#include "SkFlate.h"
+#include "SkDeflate.h"
 #include "SkStream.h"
 #include "Test.h"
 
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 013d58657b..b0b776527f 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -9,7 +9,7 @@
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDocument.h"
-#include "SkFlate.h"
+#include "SkDeflate.h"
 #include "SkImageEncoder.h"
 #include "SkMatrix.h"
 #include "SkPDFCanon.h"