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

Side by Side Diff: Source/modules/websockets/WebSocketDeflater.cpp

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 unified diff | Download patch
« no previous file with comments | « Source/modules/websockets/WebSocketDeflateFramer.cpp ('k') | Source/wtf/Platform.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "WebSocketDeflater.h" 32 #include "WebSocketDeflater.h"
33 33
34 #if USE(ZLIB)
35
36 #include "Logging.h" 34 #include "Logging.h"
37 #include <wtf/FastMalloc.h> 35 #include <wtf/FastMalloc.h>
38 #include <wtf/HashMap.h> 36 #include <wtf/HashMap.h>
39 #include <wtf/StdLibExtras.h> 37 #include <wtf/StdLibExtras.h>
40 #include <wtf/StringExtras.h> 38 #include <wtf/StringExtras.h>
41 #include <wtf/text/StringHash.h> 39 #include <wtf/text/StringHash.h>
42 #include <wtf/text/WTFString.h> 40 #include <wtf/text/WTFString.h>
43 #include <zlib.h> 41 #include <zlib.h>
44 42
45 namespace WebCore { 43 namespace WebCore {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 return true; 207 return true;
210 } 208 }
211 209
212 void WebSocketInflater::reset() 210 void WebSocketInflater::reset()
213 { 211 {
214 m_buffer.clear(); 212 m_buffer.clear();
215 } 213 }
216 214
217 } // namespace WebCore 215 } // namespace WebCore
218 216
219 #endif // USE(ZLIB)
OLDNEW
« no previous file with comments | « Source/modules/websockets/WebSocketDeflateFramer.cpp ('k') | Source/wtf/Platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698