zlib/pdf: remove HaveFlate(), depend on preprocessor defines

src/pdf/SkPDFImage.cpp

 /*
  * 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 "SkPDFImage.h"
 
 #include "SkBitmap.h"
@@ skipping 612 matching lines @@
             }
         }
         // Fallback method
         if (!fStreamValid) {
             SkAutoTDelete<SkStream> stream(
                     extract_image_data(fBitmap, fSrcRect, fIsAlpha, NULL));
             this->setData(stream);
             fStreamValid = true;
         }
         return INHERITED::populate(catalog);
-    } else if (getState() == kNoCompression_State &&
-            !skip_compression(catalog) &&
-            (SkFlate::HaveFlate() || fEncoder)) {
+    }
+#ifndef SK_NO_FLATE
+    else if (getState() == kNoCompression_State && !skip_compression(catalog)) {
+#else  // SK_NO_FLATE
+    else if (getState() == kNoCompression_State &&
+             !skip_compression(catalog) &&
+             fEncoder) {
+#endif  // SK_NO_FLATE
         // Compression has not been requested when the stream was first created,
         // but the new catalog wants it compressed.
         if (!getSubstitute()) {
             SkPDFStream* substitute = SkNEW_ARGS(SkPDFImage, (*this));
             setSubstitute(substitute);
             catalog->setSubstitute(this, substitute);
         }
         return false;
     }
     return true;
@@ skipping 81 matching lines @@
     if (SkIRect::MakeWH(bitmap.width(), bitmap.height()) == subset) {
         SkAutoTUnref<SkData> encodedData(ref_encoded_data(bitmap));
         if (is_jfif_jpeg(encodedData)) {
             return SkNEW_ARGS(PDFJPEGImage,
                               (encodedData, bitmap.width(), bitmap.height()));
         }
     }
 #endif
     return SkPDFImage::CreateImage(bitmap, subset, encoder);
 }