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

experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp

Index: experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
index d9b3c01201e314efe6a64b0981df11d2a5e6a2a7..adf9f712482e3c882409c9f9cfa1f7de5670ec24 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
@@ -22,12 +22,11 @@
 SkPdfNativeObject SkPdfNativeObject::kNull = SkPdfNativeObject::makeNull();
 
 bool SkPdfNativeObject::applyFlateDecodeFilter() {
-    if (!SkFlate::HaveFlate()) {
-        SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kNoFlateLibrary_SkPdfIssue,
-                    "forgot to link with flate library?", NULL, NULL);
-        return false;
-    }
-
+#ifdef SK_NO_FLATE

[mtklein, 2015/02/17 22:15:15]

Just remove this?  The code will fail to compile if SkFlate::Inflate isn't
defined.

[hal.canary, 2015/02/17 22:35:44]

Done.

+    SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kNoFlateLibrary_SkPdfIssue,
+                "forgot to link with flate library?", NULL, NULL);
+    return false;
+#else  // !SK_NO_FLATE
     const unsigned char* old = fStr.fBuffer;
     bool deleteOld = isStreamOwned();
 
@@ -49,6 +48,7 @@ bool SkPdfNativeObject::applyFlateDecodeFilter() {
         SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kBadStream_SkPdfIssue, "inflate failed", this, NULL);
         return false;
     }
+#endif  // !SK_NO_FLATE
 }
 
 bool SkPdfNativeObject::applyDCTDecodeFilter() {