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

Side by Side Diff: base/android/apk_assets.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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 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 <jni.h> 5 #include <jni.h>
6 6
7 #include "base/android/apk_assets.h" 7 #include "base/android/apk_assets.h"
8 8
9 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "jni/ApkAssets_jni.h" 13 #include "jni/ApkAssets_jni.h"
14 14
15 namespace base { 15 namespace base {
16 namespace android { 16 namespace android {
17 17
18 int OpenApkAsset(const std::string& file_path, 18 int OpenApkAsset(const std::string& file_path,
19 base::MemoryMappedFile::Region* region) { 19 base::MemoryMappedFile::Region* region) {
20 // The AAssetManager API of the NDK is does not expose a method for accessing 20 // The AAssetManager API of the NDK is does not expose a method for accessing
21 // raw resources :(. 21 // raw resources :(.
22 JNIEnv* env = base::android::AttachCurrentThread(); 22 JNIEnv* env = base::android::AttachCurrentThread();
23 ScopedJavaLocalRef<jlongArray> jarr = Java_ApkAssets_open( 23 ScopedJavaLocalRef<jlongArray> jarr = Java_ApkAssets_open(
24 env, 24 env, base::android::GetApplicationContext(),
25 base::android::GetApplicationContext(), 25 base::android::ConvertUTF8ToJavaString(env, file_path));
26 base::android::ConvertUTF8ToJavaString(env, file_path).obj());
27 std::vector<jlong> results; 26 std::vector<jlong> results;
28 base::android::JavaLongArrayToLongVector(env, jarr.obj(), &results); 27 base::android::JavaLongArrayToLongVector(env, jarr.obj(), &results);
29 CHECK_EQ(3U, results.size()); 28 CHECK_EQ(3U, results.size());
30 int fd = static_cast<int>(results[0]); 29 int fd = static_cast<int>(results[0]);
31 region->offset = results[1]; 30 region->offset = results[1];
32 region->size = results[2]; 31 region->size = results[2];
33 return fd; 32 return fd;
34 } 33 }
35 34
36 bool RegisterApkAssetWithGlobalDescriptors(base::GlobalDescriptors::Key key, 35 bool RegisterApkAssetWithGlobalDescriptors(base::GlobalDescriptors::Key key,
37 const std::string& file_path) { 36 const std::string& file_path) {
38 base::MemoryMappedFile::Region region = 37 base::MemoryMappedFile::Region region =
39 base::MemoryMappedFile::Region::kWholeFile; 38 base::MemoryMappedFile::Region::kWholeFile;
40 int asset_fd = OpenApkAsset(file_path, &region); 39 int asset_fd = OpenApkAsset(file_path, &region);
41 if (asset_fd != -1) { 40 if (asset_fd != -1) {
42 base::GlobalDescriptors::GetInstance()->Set(key, asset_fd, region); 41 base::GlobalDescriptors::GetInstance()->Set(key, asset_fd, region);
43 } 42 }
44 return asset_fd != -1; 43 return asset_fd != -1;
45 } 44 }
46 45
47 } // namespace android 46 } // namespace android
48 } // namespace base 47 } // namespace base
OLDNEW
« no previous file with comments | « android_webview/native/token_binding_manager_bridge.cc ('k') | base/android/callback_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698