OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/base/resource/data_pack.h" | 5 #include "ui/base/resource/data_pack.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 | 8 |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/files/memory_mapped_file.h" | 10 #include "base/files/memory_mapped_file.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 if (!mmap_->Initialize(path)) { | 77 if (!mmap_->Initialize(path)) { |
78 DLOG(ERROR) << "Failed to mmap datapack"; | 78 DLOG(ERROR) << "Failed to mmap datapack"; |
79 UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED, | 79 UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED, |
80 LOAD_ERRORS_COUNT); | 80 LOAD_ERRORS_COUNT); |
81 mmap_.reset(); | 81 mmap_.reset(); |
82 return false; | 82 return false; |
83 } | 83 } |
84 return LoadImpl(); | 84 return LoadImpl(); |
85 } | 85 } |
86 | 86 |
87 bool DataPack::LoadFromFile(base::PlatformFile file) { | 87 bool DataPack::LoadFromFile(base::File file) { |
88 mmap_.reset(new base::MemoryMappedFile); | 88 mmap_.reset(new base::MemoryMappedFile); |
89 if (!mmap_->Initialize(file)) { | 89 if (!mmap_->Initialize(file.Pass())) { |
cpu_(ooo_6.6-7.5)
2013/12/28 01:40:52
oh I had missed this .Pass()
| |
90 DLOG(ERROR) << "Failed to mmap datapack"; | 90 DLOG(ERROR) << "Failed to mmap datapack"; |
91 UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED_FROM_FILE, | 91 UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED_FROM_FILE, |
92 LOAD_ERRORS_COUNT); | 92 LOAD_ERRORS_COUNT); |
93 mmap_.reset(); | 93 mmap_.reset(); |
94 return false; | 94 return false; |
95 } | 95 } |
96 return LoadImpl(); | 96 return LoadImpl(); |
97 } | 97 } |
98 | 98 |
99 bool DataPack::LoadImpl() { | 99 bool DataPack::LoadImpl() { |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
297 return false; | 297 return false; |
298 } | 298 } |
299 } | 299 } |
300 | 300 |
301 base::CloseFile(file); | 301 base::CloseFile(file); |
302 | 302 |
303 return true; | 303 return true; |
304 } | 304 } |
305 | 305 |
306 } // namespace ui | 306 } // namespace ui |
OLD | NEW |