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

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

2 files changed, 7 insertions, 18 deletions

diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index ff11a11ca8..888af6b77c 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -11,18 +11,7 @@
 #include "SkFlate.h"
 #include "SkStream.h"
 
-#ifdef SK_NO_FLATE
-bool SkFlate::HaveFlate() { return false; }
-bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; }
-bool SkFlate::Deflate(const void*, size_t, SkWStream*) { return false; }
-bool SkFlate::Deflate(const SkData*, SkWStream*) { return false; }
-bool SkFlate::Inflate(SkStream*, SkWStream*) { return false; }
-#else
-
-// static
-bool SkFlate::HaveFlate() {
-    return true;
-}
+#ifndef SK_NO_FLATE
 
 namespace {
 
@@ -133,4 +122,5 @@ bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
     return doFlate(false, src, dst);
 }
 
-#endif
+#endif  // SK_NO_FLATE
+
diff --git a/src/core/SkFlate.h b/src/core/SkFlate.h
index e4c1417d91..69dac018de 100644
--- a/src/core/SkFlate.h
+++ b/src/core/SkFlate.h
@@ -12,6 +12,8 @@
 
 #include "SkTypes.h"
 
+#ifndef Sk_NO_FLATE
+
 class SkData;
 class SkWStream;
 class SkStream;
@@ -21,10 +23,6 @@ class SkStream;
 */
 class SkFlate {
 public:
-    /** Indicates if the flate algorithm is available.
-     */
-    static bool HaveFlate();
-
     /**
      *  Use the flate compression algorithm to compress the data in src,
      *  putting the result into dst.  Returns false if an error occurs.
@@ -49,4 +47,5 @@ public:
     static bool Inflate(SkStream* src, SkWStream* dst);
 };
 
-#endif
+#endif  // SK_NO_FLATE
+#endif  // SkFlate_DEFINED