Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/core/SkFlate.cpp

Issue 936583002: SK_NO_FLATE (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: no source Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gyp/common_conditions.gypi ('K') | « include/core/SkPostConfig.h ('k') | tests/FlateTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkFlate.cpp
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 2b4e36d7271ea99fe11e8ac2b302d5b8fed4f28a..ff11a11ca89eecdb01ab90aa1f178c5aae49bef0 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -11,7 +11,7 @@
#include "SkFlate.h"
#include "SkStream.h"
-#ifndef SK_HAS_ZLIB
+#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; }
@@ -26,11 +26,7 @@ bool SkFlate::HaveFlate() {
namespace {
-#ifdef SK_SYSTEM_ZLIB
-#include <zlib.h>
-#else
-#include SK_ZLIB_INCLUDE
-#endif
+#include "zlib.h"
// static
const size_t kBufferSize = 1024;
« gyp/common_conditions.gypi ('K') | « include/core/SkPostConfig.h ('k') | tests/FlateTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698