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

Side by Side Diff: net/flip/flip_framer.cc

Issue 469018: Fix build with use_system_zlib=1 (Closed)
Patch Set: Created 11 years 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 | « build/linux/system.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/scoped_ptr.h" 5 #include "base/scoped_ptr.h"
6 #include "base/stats_counters.h" 6 #include "base/stats_counters.h"
7 7
8 #include "flip_framer.h" // cross-google3 directory naming. 8 #include "flip_framer.h" // cross-google3 directory naming.
9 #include "flip_frame_builder.h" 9 #include "flip_frame_builder.h"
10 #include "flip_bitmasks.h" 10 #include "flip_bitmasks.h"
11 11
12 #if defined(USE_SYSTEM_ZLIB)
13 #include <zlib.h>
14 #else
12 #include "third_party/zlib/zlib.h" 15 #include "third_party/zlib/zlib.h"
16 #endif
13 17
14 namespace flip { 18 namespace flip {
15 19
16 // The initial size of the control frame buffer; this is used internally 20 // The initial size of the control frame buffer; this is used internally
17 // as we parse through control frames. 21 // as we parse through control frames.
18 static const size_t kControlFrameBufferInitialSize = 32 * 1024; 22 static const size_t kControlFrameBufferInitialSize = 32 * 1024;
19 // The maximum size of the control frame buffer that we support. 23 // The maximum size of the control frame buffer that we support.
20 // TODO(mbelshe): We should make this stream-based so there are no limits. 24 // TODO(mbelshe): We should make this stream-based so there are no limits.
21 static const size_t kControlFrameBufferMaxSize = 64 * 1024; 25 static const size_t kControlFrameBufferMaxSize = 64 * 1024;
22 26
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 void FlipFramer::set_enable_compression(bool value) { 767 void FlipFramer::set_enable_compression(bool value) {
764 enable_compression_ = value; 768 enable_compression_ = value;
765 } 769 }
766 770
767 void FlipFramer::set_enable_compression_default(bool value) { 771 void FlipFramer::set_enable_compression_default(bool value) {
768 compression_default_ = value; 772 compression_default_ = value;
769 } 773 }
770 774
771 } // namespace flip 775 } // namespace flip
772 776
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698