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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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::File file) { | 87 bool DataPack::LoadFromFile(base::File file) { |
| 88 return LoadFromFileRegion(file.Pass(), |
| 89 base::MemoryMappedFile::Region::kWholeFile); |
| 90 } |
| 91 |
| 92 bool DataPack::LoadFromFileRegion( |
| 93 base::File file, |
| 94 const base::MemoryMappedFile::Region& region) { |
88 mmap_.reset(new base::MemoryMappedFile); | 95 mmap_.reset(new base::MemoryMappedFile); |
89 if (!mmap_->Initialize(file.Pass())) { | 96 if (!mmap_->Initialize(file.Pass(), region)) { |
90 DLOG(ERROR) << "Failed to mmap datapack"; | 97 DLOG(ERROR) << "Failed to mmap datapack"; |
91 UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED_FROM_FILE, | 98 UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED_FROM_FILE, |
92 LOAD_ERRORS_COUNT); | 99 LOAD_ERRORS_COUNT); |
93 mmap_.reset(); | 100 mmap_.reset(); |
94 return false; | 101 return false; |
95 } | 102 } |
96 return LoadImpl(); | 103 return LoadImpl(); |
97 } | 104 } |
98 | 105 |
99 bool DataPack::LoadImpl() { | 106 bool DataPack::LoadImpl() { |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 return false; | 316 return false; |
310 } | 317 } |
311 } | 318 } |
312 | 319 |
313 base::CloseFile(file); | 320 base::CloseFile(file); |
314 | 321 |
315 return true; | 322 return true; |
316 } | 323 } |
317 | 324 |
318 } // namespace ui | 325 } // namespace ui |
OLD | NEW |