aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-03-31 08:22:01 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-31 08:22:01 -0700
commitaf9c85dee116fdc5f32029ac6a4fa7882c6b9a63 (patch)
treed8abf04d1dafbd7b5f0a2dde61c69acf8f5f7d5c /src/core
parent0340df5b3698aff1c9540fcdbc3dafd9d5ddb0b0 (diff)
SkPDF: remove SK_NO_FLATE & dead code in SkPDFStream
SkPDFStream copy constructor SkPDFStream Substitute mechanism SkPDFStream::setData(NULL); SkPDFStream SK_NO_FLATE logic BUG=skia:3585 TBR=bsalomon@google.com,reed@google.com Review URL: https://codereview.chromium.org/1041183002
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkFlate.cpp6
-rw-r--r--src/core/SkFlate.h3
2 files changed, 0 insertions, 9 deletions
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 09975c08f7..1d764e8400 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -11,8 +11,6 @@
#include "SkFlate.h"
#include "SkStream.h"
-#ifndef SK_NO_FLATE
-
namespace {
#ifdef ZLIB_INCLUDE
@@ -225,7 +223,3 @@ bool SkDeflateWStream::write(const void* void_buffer, size_t len) {
size_t SkDeflateWStream::bytesWritten() const {
return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
}
-
-
-#endif // SK_NO_FLATE
-
diff --git a/src/core/SkFlate.h b/src/core/SkFlate.h
index 35f18499ef..0104c4514d 100644
--- a/src/core/SkFlate.h
+++ b/src/core/SkFlate.h
@@ -12,8 +12,6 @@
#include "SkTypes.h"
-#ifndef Sk_NO_FLATE
-
#include "SkStream.h"
class SkData;
@@ -74,5 +72,4 @@ private:
SkAutoTDelete<Impl> fImpl;
};
-#endif // SK_NO_FLATE
#endif // SkFlate_DEFINED