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

Side by Side Diff: net/http/http_version.h

Issue 527883002: Modified to resolve TODO in parseversion in http_response_headers.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modified to include overflow logic and other comments Created 6 years, 3 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 | « net/http/http_response_headers_unittest.cc ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #ifndef NET_HTTP_HTTP_VERSION_H_ 5 #ifndef NET_HTTP_HTTP_VERSION_H_
6 #define NET_HTTP_HTTP_VERSION_H_ 6 #define NET_HTTP_HTTP_VERSION_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 namespace net { 10 namespace net {
11 11
12 // Wrapper for an HTTP (major,minor) version pair. 12 // Wrapper for an HTTP (major,minor) version pair.
13 class HttpVersion { 13 class HttpVersion {
14 public: 14 public:
15 // Default constructor (major=0, minor=0). 15 // Default constructor (major=0, minor=0).
16 HttpVersion() : value_(0) { } 16 HttpVersion() : value_(0) { }
17 17
18 // Build from unsigned major/minor pair. 18 // Build from unsigned major/minor pair.
19 HttpVersion(uint16 major, uint16 minor) : value_(major << 16 | minor) { } 19 HttpVersion(uint32 major, uint32 minor) {
20 value_ = major;
21 value_ <<= 32;
22 value_ |= minor;
23 }
20 24
21 // Major version number. 25 // Major version number.
22 uint16 major_value() const { 26 uint32 major_value() const { return value_ >> 32; }
23 return value_ >> 16;
24 }
25 27
26 // Minor version number. 28 // Minor version number.
27 uint16 minor_value() const { 29 uint32 minor_value() const { return value_ & 0xffffffff; }
28 return value_ & 0xffff;
29 }
30 30
31 // Overloaded operators: 31 // Overloaded operators:
32 32
33 bool operator==(const HttpVersion& v) const { 33 bool operator==(const HttpVersion& v) const {
34 return value_ == v.value_; 34 return value_ == v.value_;
35 } 35 }
36 bool operator!=(const HttpVersion& v) const { 36 bool operator!=(const HttpVersion& v) const {
37 return value_ != v.value_; 37 return value_ != v.value_;
38 } 38 }
39 bool operator>(const HttpVersion& v) const { 39 bool operator>(const HttpVersion& v) const {
40 return value_ > v.value_; 40 return value_ > v.value_;
41 } 41 }
42 bool operator>=(const HttpVersion& v) const { 42 bool operator>=(const HttpVersion& v) const {
43 return value_ >= v.value_; 43 return value_ >= v.value_;
44 } 44 }
45 bool operator<(const HttpVersion& v) const { 45 bool operator<(const HttpVersion& v) const {
46 return value_ < v.value_; 46 return value_ < v.value_;
47 } 47 }
48 bool operator<=(const HttpVersion& v) const { 48 bool operator<=(const HttpVersion& v) const {
49 return value_ <= v.value_; 49 return value_ <= v.value_;
50 } 50 }
51 51
52 private: 52 private:
53 uint32 value_; // Packed as <major>:<minor> 53 uint64 value_; // Packed as <major>:<minor>
54 }; 54 };
55 55
56 } // namespace net 56 } // namespace net
57 57
58 #endif // NET_HTTP_HTTP_VERSION_H_ 58 #endif // NET_HTTP_HTTP_VERSION_H_
OLDNEW
« no previous file with comments | « net/http/http_response_headers_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698