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

Side by Side Diff: mojo/android/system/core_impl.cc

Issue 1358163006: Adds some code to help isolate where crash is happening (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar Created 5 years, 2 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 #include "mojo/android/system/core_impl.h" 5 #include "mojo/android/system/core_impl.h"
6 6
7 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
10 #include "base/android/library_loader/library_loader_hooks.h" 10 #include "base/android/library_loader/library_loader_hooks.h"
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 const JavaParamRef<jobject>& jcaller, 362 const JavaParamRef<jobject>& jcaller,
363 jint mojo_handle, 363 jint mojo_handle,
364 jint signals, 364 jint signals,
365 jlong deadline, 365 jlong deadline,
366 const JavaParamRef<jobject>& callback) { 366 const JavaParamRef<jobject>& callback) {
367 AsyncWaitCallbackData* callback_data = 367 AsyncWaitCallbackData* callback_data =
368 new AsyncWaitCallbackData(env, jcaller, callback); 368 new AsyncWaitCallbackData(env, jcaller, callback);
369 MojoAsyncWaitID cancel_id; 369 MojoAsyncWaitID cancel_id;
370 if (static_cast<MojoHandle>(mojo_handle) != MOJO_HANDLE_INVALID) { 370 if (static_cast<MojoHandle>(mojo_handle) != MOJO_HANDLE_INVALID) {
371 cancel_id = Environment::GetDefaultAsyncWaiter()->AsyncWait( 371 cancel_id = Environment::GetDefaultAsyncWaiter()->AsyncWait(
372 mojo_handle, signals, deadline, AsyncWaitCallback, callback_data); 372 1, mojo_handle, signals, deadline, AsyncWaitCallback, callback_data);
373 } else { 373 } else {
374 cancel_id = kInvalidHandleCancelID; 374 cancel_id = kInvalidHandleCancelID;
375 base::MessageLoop::current()->PostTask( 375 base::MessageLoop::current()->PostTask(
376 FROM_HERE, 376 FROM_HERE,
377 base::Bind( 377 base::Bind(
378 &AsyncWaitCallback, callback_data, MOJO_RESULT_INVALID_ARGUMENT)); 378 &AsyncWaitCallback, callback_data, MOJO_RESULT_INVALID_ARGUMENT));
379 } 379 }
380 base::android::ScopedJavaLocalRef<jobject> cancellable = 380 base::android::ScopedJavaLocalRef<jobject> cancellable =
381 Java_CoreImpl_newAsyncWaiterCancellableImpl( 381 Java_CoreImpl_newAsyncWaiterCancellableImpl(
382 env, jcaller, cancel_id, reinterpret_cast<intptr_t>(callback_data)); 382 env, jcaller, cancel_id, reinterpret_cast<intptr_t>(callback_data));
(...skipping 27 matching lines...) Expand all
410 return 0; 410 return 0;
411 return alignment - offset; 411 return alignment - offset;
412 } 412 }
413 413
414 bool RegisterCoreImpl(JNIEnv* env) { 414 bool RegisterCoreImpl(JNIEnv* env) {
415 return RegisterNativesImpl(env); 415 return RegisterNativesImpl(env);
416 } 416 }
417 417
418 } // namespace android 418 } // namespace android
419 } // namespace mojo 419 } // namespace mojo
OLDNEW
« no previous file with comments | « content/child/web_data_consumer_handle_impl.cc ('k') | mojo/environment/default_async_waiter_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698