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

Side by Side Diff: components/translate/content/renderer/data_file_renderer_cld_data_provider.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 4 years, 11 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // NOT DEAD CODE! 5 // NOT DEAD CODE!
6 // This code isn't dead, even if it isn't currently being used. Please refer to: 6 // This code isn't dead, even if it isn't currently being used. Please refer to:
7 // https://www.chromium.org/developers/how-tos/compact-language-detector-cld-dat a-source-configuration 7 // https://www.chromium.org/developers/how-tos/compact-language-detector-cld-dat a-source-configuration
8 8
9 #include "data_file_renderer_cld_data_provider.h" 9 #include "components/translate/content/renderer/data_file_renderer_cld_data_prov ider.h"
10
11 #include <utility>
10 12
11 #include "base/files/file.h" 13 #include "base/files/file.h"
12 #include "base/files/memory_mapped_file.h" 14 #include "base/files/memory_mapped_file.h"
13 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
14 #include "base/logging.h" 16 #include "base/logging.h"
15 #include "components/translate/content/common/data_file_cld_data_provider_messag es.h" 17 #include "components/translate/content/common/data_file_cld_data_provider_messag es.h"
16 #include "content/public/renderer/render_frame_observer.h" 18 #include "content/public/renderer/render_frame_observer.h"
17 #include "ipc/ipc_message.h" 19 #include "ipc/ipc_message.h"
18 #include "ipc/ipc_message_macros.h" 20 #include "ipc/ipc_message_macros.h"
19 #include "ipc/ipc_platform_file.h" 21 #include "ipc/ipc_platform_file.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 if (IsCldDataAvailable()) 87 if (IsCldDataAvailable())
86 return; 88 return;
87 89
88 if (!file.IsValid()) { 90 if (!file.IsValid()) {
89 LOG(ERROR) << "Can't find the CLD data file."; 91 LOG(ERROR) << "Can't find the CLD data file.";
90 return; 92 return;
91 } 93 }
92 94
93 // mmap the file 95 // mmap the file
94 g_cld_mmap.Get().value = new base::MemoryMappedFile(); 96 g_cld_mmap.Get().value = new base::MemoryMappedFile();
95 bool initialized = g_cld_mmap.Get().value->Initialize(file.Pass()); 97 bool initialized = g_cld_mmap.Get().value->Initialize(std::move(file));
96 if (!initialized) { 98 if (!initialized) {
97 LOG(ERROR) << "mmap initialization failed"; 99 LOG(ERROR) << "mmap initialization failed";
98 delete g_cld_mmap.Get().value; 100 delete g_cld_mmap.Get().value;
99 g_cld_mmap.Get().value = NULL; 101 g_cld_mmap.Get().value = NULL;
100 return; 102 return;
101 } 103 }
102 104
103 // Sanity checks 105 // Sanity checks
104 uint64_t max_int32 = std::numeric_limits<int32_t>::max(); 106 uint64_t max_int32 = std::numeric_limits<int32_t>::max();
105 if (data_length + data_offset > g_cld_mmap.Get().value->length() || 107 if (data_length + data_offset > g_cld_mmap.Get().value->length() ||
106 data_length > max_int32) { // max signed 32 bit integer 108 data_length > max_int32) { // max signed 32 bit integer
107 LOG(ERROR) << "Illegal mmap config: data_offset=" << data_offset 109 LOG(ERROR) << "Illegal mmap config: data_offset=" << data_offset
108 << ", data_length=" << data_length 110 << ", data_length=" << data_length
109 << ", mmap->length()=" << g_cld_mmap.Get().value->length(); 111 << ", mmap->length()=" << g_cld_mmap.Get().value->length();
110 delete g_cld_mmap.Get().value; 112 delete g_cld_mmap.Get().value;
111 g_cld_mmap.Get().value = NULL; 113 g_cld_mmap.Get().value = NULL;
112 return; 114 return;
113 } 115 }
114 116
115 // Initialize the CLD subsystem... and it's all done! 117 // Initialize the CLD subsystem... and it's all done!
116 const uint8_t* data_ptr = g_cld_mmap.Get().value->data() + data_offset; 118 const uint8_t* data_ptr = g_cld_mmap.Get().value->data() + data_offset;
117 CLD2::loadDataFromRawAddress(data_ptr, data_length); 119 CLD2::loadDataFromRawAddress(data_ptr, data_length);
118 DCHECK(CLD2::isDataLoaded()) << "Failed to load CLD data from mmap"; 120 DCHECK(CLD2::isDataLoaded()) << "Failed to load CLD data from mmap";
119 if (!cld_available_callback_.is_null()) { 121 if (!cld_available_callback_.is_null()) {
120 cld_available_callback_.Run(); 122 cld_available_callback_.Run();
121 } 123 }
122 } 124 }
123 125
124 } // namespace translate 126 } // namespace translate
OLDNEW
« no previous file with comments | « components/test_runner/web_test_interfaces.cc ('k') | components/translate/core/browser/translate_ui_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698