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

Side by Side Diff: content/child/blob_storage/blob_consolidation.cc

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 years, 1 month 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "content/child/blob_storage/blob_consolidation.h"
6
7 #include <algorithm>
5 #include <string> 8 #include <string>
6 9
7 #include "content/child/blob_storage/blob_consolidation.h"
8
9 using storage::DataElement; 10 using storage::DataElement;
10 using blink::WebThreadSafeData; 11 using blink::WebThreadSafeData;
11 12
12 namespace content { 13 namespace content {
13 14
14 using ReadStatus = BlobConsolidation::ReadStatus; 15 using ReadStatus = BlobConsolidation::ReadStatus;
15 16
16 BlobConsolidation::ConsolidatedItem::ConsolidatedItem() 17 BlobConsolidation::ConsolidatedItem::ConsolidatedItem()
17 : type(DataElement::TYPE_UNKNOWN), 18 : type(DataElement::TYPE_UNKNOWN),
18 offset(0), 19 offset(0),
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 consolidated_size - memory_read); 151 consolidated_size - memory_read);
151 memcpy(static_cast<char*>(memory_out) + memory_read, 152 memcpy(static_cast<char*>(memory_out) + memory_read,
152 item.data[mid].data() + offset_from_mid, read_size); 153 item.data[mid].data() + offset_from_mid, read_size);
153 offset_from_mid = 0; 154 offset_from_mid = 0;
154 memory_read += read_size; 155 memory_read += read_size;
155 } 156 }
156 return ReadStatus::OK; 157 return ReadStatus::OK;
157 } 158 }
158 159
159 } // namespace content 160 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/speech/speech_recognition_manager_impl.h ('k') | content/common/ax_content_node_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698