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

Side by Side Diff: third_party/WebKit/Source/platform/network/HTTPHeaderMap.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 "platform/network/HTTPHeaderMap.h" 31 #include "platform/network/HTTPHeaderMap.h"
32 32
33 #include "wtf/PtrUtil.h"
34 #include <memory>
35
33 namespace blink { 36 namespace blink {
34 37
35 HTTPHeaderMap::HTTPHeaderMap() 38 HTTPHeaderMap::HTTPHeaderMap()
36 { 39 {
37 } 40 }
38 41
39 HTTPHeaderMap::~HTTPHeaderMap() 42 HTTPHeaderMap::~HTTPHeaderMap()
40 { 43 {
41 } 44 }
42 45
43 PassOwnPtr<CrossThreadHTTPHeaderMapData> HTTPHeaderMap::copyData() const 46 std::unique_ptr<CrossThreadHTTPHeaderMapData> HTTPHeaderMap::copyData() const
44 { 47 {
45 OwnPtr<CrossThreadHTTPHeaderMapData> data = adoptPtr(new CrossThreadHTTPHead erMapData()); 48 std::unique_ptr<CrossThreadHTTPHeaderMapData> data = wrapUnique(new CrossThr eadHTTPHeaderMapData());
46 data->reserveInitialCapacity(size()); 49 data->reserveInitialCapacity(size());
47 50
48 HTTPHeaderMap::const_iterator endIt = end(); 51 HTTPHeaderMap::const_iterator endIt = end();
49 for (HTTPHeaderMap::const_iterator it = begin(); it != endIt; ++it) 52 for (HTTPHeaderMap::const_iterator it = begin(); it != endIt; ++it)
50 data->uncheckedAppend(std::make_pair(it->key.getString().isolatedCopy(), it->value.getString().isolatedCopy())); 53 data->uncheckedAppend(std::make_pair(it->key.getString().isolatedCopy(), it->value.getString().isolatedCopy()));
51 54
52 return data; 55 return data;
53 } 56 }
54 57
55 void HTTPHeaderMap::adopt(PassOwnPtr<CrossThreadHTTPHeaderMapData> data) 58 void HTTPHeaderMap::adopt(std::unique_ptr<CrossThreadHTTPHeaderMapData> data)
56 { 59 {
57 clear(); 60 clear();
58 size_t dataSize = data->size(); 61 size_t dataSize = data->size();
59 for (size_t index = 0; index < dataSize; ++index) { 62 for (size_t index = 0; index < dataSize; ++index) {
60 std::pair<String, String>& header = (*data)[index]; 63 std::pair<String, String>& header = (*data)[index];
61 set(AtomicString(header.first), AtomicString(header.second)); 64 set(AtomicString(header.first), AtomicString(header.second));
62 } 65 }
63 } 66 }
64 67
65 } // namespace blink 68 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698