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

Unified Diff: Source/modules/websockets/WebSocketDeflateFramer.h

Issue 14247036: Remove USE(ZLIB) guard. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 8 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
Index: Source/modules/websockets/WebSocketDeflateFramer.h
diff --git a/Source/modules/websockets/WebSocketDeflateFramer.h b/Source/modules/websockets/WebSocketDeflateFramer.h
index 9baf24933b7b796dc513c2f8082f4ad7f3940737..148fc9be7a8e9cb374d1012d2dc2594b0cd71c1f 100644
--- a/Source/modules/websockets/WebSocketDeflateFramer.h
+++ b/Source/modules/websockets/WebSocketDeflateFramer.h
@@ -31,9 +31,7 @@
#ifndef WebSocketDeflateFramer_h
#define WebSocketDeflateFramer_h
-#if USE(ZLIB)
#include "WebSocketDeflater.h"
-#endif
#include "WebSocketExtensionProcessor.h"
#include "WebSocketFrame.h"
#include <wtf/OwnPtr.h>
@@ -95,7 +93,6 @@ public:
PassOwnPtr<WebSocketExtensionProcessor> createExtensionProcessor();
- bool canDeflate() const;
bool enabled() const { return m_enabled; }
PassOwnPtr<DeflateResultHolder> deflate(WebSocketFrame&);
@@ -105,16 +102,12 @@ public:
void didFail();
-#if USE(ZLIB)
void enableDeflate(int windowBits, WebSocketDeflater::ContextTakeOverMode);
-#endif
private:
bool m_enabled;
-#if USE(ZLIB)
OwnPtr<WebSocketDeflater> m_deflater;
OwnPtr<WebSocketInflater> m_inflater;
-#endif
};
}
« no previous file with comments | « Source/modules/websockets/MainThreadWebSocketChannel.cpp ('k') | Source/modules/websockets/WebSocketDeflateFramer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698