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

Side by Side Diff: components/cronet/android/chromium_url_request.cc

Issue 743713002: Cronet Fix Channel Write after Close when request is canceled after success. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows linker error. Created 6 years 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
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/MockUrlRequestJobTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/cronet/android/chromium_url_request.h" 5 #include "components/cronet/android/chromium_url_request.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "components/cronet/android/url_request_adapter.h" 10 #include "components/cronet/android/url_request_adapter.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 public: 57 public:
58 JniURLRequestAdapterDelegate(JNIEnv* env, jobject owner) { 58 JniURLRequestAdapterDelegate(JNIEnv* env, jobject owner) {
59 owner_ = env->NewGlobalRef(owner); 59 owner_ = env->NewGlobalRef(owner);
60 } 60 }
61 61
62 void OnResponseStarted(URLRequestAdapter* request_adapter) override { 62 void OnResponseStarted(URLRequestAdapter* request_adapter) override {
63 JNIEnv* env = base::android::AttachCurrentThread(); 63 JNIEnv* env = base::android::AttachCurrentThread();
64 cronet::Java_ChromiumUrlRequest_onResponseStarted(env, owner_); 64 cronet::Java_ChromiumUrlRequest_onResponseStarted(env, owner_);
65 } 65 }
66 66
67 void OnBytesRead(URLRequestAdapter* request_adapter) override { 67 void OnBytesRead(URLRequestAdapter* request_adapter,
68 int bytes_read = request_adapter->bytes_read(); 68 int bytes_read) override {
69 if (bytes_read != 0) { 69 if (bytes_read != 0) {
70 JNIEnv* env = base::android::AttachCurrentThread(); 70 JNIEnv* env = base::android::AttachCurrentThread();
71 base::android::ScopedJavaLocalRef<jobject> java_buffer( 71 base::android::ScopedJavaLocalRef<jobject> java_buffer(
72 env, env->NewDirectByteBuffer(request_adapter->Data(), bytes_read)); 72 env, env->NewDirectByteBuffer(request_adapter->Data(), bytes_read));
73 cronet::Java_ChromiumUrlRequest_onBytesRead( 73 cronet::Java_ChromiumUrlRequest_onBytesRead(
74 env, owner_, java_buffer.obj()); 74 env, owner_, java_buffer.obj());
75 } 75 }
76 } 76 }
77 77
78 void OnRequestFinished(URLRequestAdapter* request_adapter) override { 78 void OnRequestFinished(URLRequestAdapter* request_adapter) override {
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 403
404 static void DisableRedirects(JNIEnv* env, jobject jcaller, 404 static void DisableRedirects(JNIEnv* env, jobject jcaller,
405 jlong jrequest_adapter) { 405 jlong jrequest_adapter) {
406 URLRequestAdapter* request_adapter = 406 URLRequestAdapter* request_adapter =
407 reinterpret_cast<URLRequestAdapter*>(jrequest_adapter); 407 reinterpret_cast<URLRequestAdapter*>(jrequest_adapter);
408 if (request_adapter != NULL) 408 if (request_adapter != NULL)
409 request_adapter->DisableRedirects(); 409 request_adapter->DisableRedirects();
410 } 410 }
411 411
412 } // namespace cronet 412 } // namespace cronet
OLDNEW
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/MockUrlRequestJobTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698