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

src/pdf/SkPDFStream.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkData.h"
@@ skipping 65 matching lines @@
         fDataStream.reset(SkNEW(SkMemoryStream));
     }
 }
 
 size_t SkPDFStream::dataSize() const {
     SkASSERT(fDataStream->hasLength());
     return fDataStream->getLength();
 }
 
 bool SkPDFStream::populate(SkPDFCatalog* catalog) {
+#ifdef SK_NO_FLATE
     if (fState == kUnused_State) {
-        if (!skip_compression(catalog) && SkFlate::HaveFlate()) {
+        fState = kNoCompression_State;
+        insertInt("Length", this->dataSize());
+    }
+    return true;
+
+#else  // !SK_NO_FLATE
+
+    if (fState == kUnused_State) {
+        fState = kNoCompression_State;
+        if (!skip_compression(catalog)) {
             SkDynamicMemoryWStream compressedData;
 
             SkAssertResult(
                     SkFlate::Deflate(fDataStream.get(), &compressedData));
             SkAssertResult(fDataStream->rewind());
             if (compressedData.getOffset() < this->dataSize()) {
                 SkAutoTDelete<SkStream> compressed(
                         compressedData.detachAsStream());
                 this->setData(compressed.get());
                 insertName("Filter", "FlateDecode");
             }
             fState = kCompressed_State;
         } else {
             fState = kNoCompression_State;
         }
         insertInt("Length", this->dataSize());
-    } else if (fState == kNoCompression_State && !skip_compression(catalog) &&
-               SkFlate::HaveFlate()) {
+    }
+    else if (fState == kNoCompression_State && !skip_compression(catalog)) {
         if (!fSubstitute.get()) {
             fSubstitute.reset(new SkPDFStream(*this));
             catalog->setSubstitute(this, fSubstitute.get());
         }
         return false;
     }
     return true;
+#endif  // SK_NO_FLATE
 }