| OLD | NEW |
| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 }; | 100 }; |
| 101 | 101 |
| 102 } // namespace | 102 } // namespace |
| 103 | 103 |
| 104 // Explicitly register static JNI functions. | 104 // Explicitly register static JNI functions. |
| 105 bool ChromiumUrlRequestRegisterJni(JNIEnv* env) { | 105 bool ChromiumUrlRequestRegisterJni(JNIEnv* env) { |
| 106 return RegisterNativesImpl(env); | 106 return RegisterNativesImpl(env); |
| 107 } | 107 } |
| 108 | 108 |
| 109 static jlong CreateRequestAdapter(JNIEnv* env, | 109 static jlong CreateRequestAdapter(JNIEnv* env, |
| 110 jobject jcaller, | 110 const JavaParamRef<jobject>& jcaller, |
| 111 jlong jurl_request_context_adapter, | 111 jlong jurl_request_context_adapter, |
| 112 jstring jurl, | 112 const JavaParamRef<jstring>& jurl, |
| 113 jint jrequest_priority) { | 113 jint jrequest_priority) { |
| 114 URLRequestContextAdapter* context_adapter = | 114 URLRequestContextAdapter* context_adapter = |
| 115 reinterpret_cast<URLRequestContextAdapter*>(jurl_request_context_adapter); | 115 reinterpret_cast<URLRequestContextAdapter*>(jurl_request_context_adapter); |
| 116 DCHECK(context_adapter); | 116 DCHECK(context_adapter); |
| 117 | 117 |
| 118 GURL url(ConvertJavaStringToUTF8(env, jurl)); | 118 GURL url(ConvertJavaStringToUTF8(env, jurl)); |
| 119 | 119 |
| 120 VLOG(1) << "New chromium network request: " << url.possibly_invalid_spec(); | 120 VLOG(1) << "New chromium network request: " << url.possibly_invalid_spec(); |
| 121 | 121 |
| 122 URLRequestAdapter* adapter = new URLRequestAdapter( | 122 URLRequestAdapter* adapter = new URLRequestAdapter( |
| 123 context_adapter, new JniURLRequestAdapterDelegate(env, jcaller), url, | 123 context_adapter, new JniURLRequestAdapterDelegate(env, jcaller), url, |
| 124 ConvertRequestPriority(jrequest_priority)); | 124 ConvertRequestPriority(jrequest_priority)); |
| 125 | 125 |
| 126 return reinterpret_cast<jlong>(adapter); | 126 return reinterpret_cast<jlong>(adapter); |
| 127 } | 127 } |
| 128 | 128 |
| 129 // synchronized | 129 // synchronized |
| 130 static void AddHeader(JNIEnv* env, | 130 static void AddHeader(JNIEnv* env, |
| 131 jobject jcaller, | 131 const JavaParamRef<jobject>& jcaller, |
| 132 jlong jurl_request_adapter, | 132 jlong jurl_request_adapter, |
| 133 jstring jheader_name, | 133 const JavaParamRef<jstring>& jheader_name, |
| 134 jstring jheader_value) { | 134 const JavaParamRef<jstring>& jheader_value) { |
| 135 URLRequestAdapter* request_adapter = | 135 URLRequestAdapter* request_adapter = |
| 136 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 136 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 137 DCHECK(request_adapter); | 137 DCHECK(request_adapter); |
| 138 | 138 |
| 139 std::string header_name(ConvertJavaStringToUTF8(env, jheader_name)); | 139 std::string header_name(ConvertJavaStringToUTF8(env, jheader_name)); |
| 140 std::string header_value(ConvertJavaStringToUTF8(env, jheader_value)); | 140 std::string header_value(ConvertJavaStringToUTF8(env, jheader_value)); |
| 141 | 141 |
| 142 request_adapter->AddHeader(header_name, header_value); | 142 request_adapter->AddHeader(header_name, header_value); |
| 143 } | 143 } |
| 144 | 144 |
| 145 static void SetMethod(JNIEnv* env, | 145 static void SetMethod(JNIEnv* env, |
| 146 jobject jcaller, | 146 const JavaParamRef<jobject>& jcaller, |
| 147 jlong jurl_request_adapter, | 147 jlong jurl_request_adapter, |
| 148 jstring jmethod) { | 148 const JavaParamRef<jstring>& jmethod) { |
| 149 URLRequestAdapter* request_adapter = | 149 URLRequestAdapter* request_adapter = |
| 150 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 150 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 151 DCHECK(request_adapter); | 151 DCHECK(request_adapter); |
| 152 | 152 |
| 153 std::string method(ConvertJavaStringToUTF8(env, jmethod)); | 153 std::string method(ConvertJavaStringToUTF8(env, jmethod)); |
| 154 | 154 |
| 155 request_adapter->SetMethod(method); | 155 request_adapter->SetMethod(method); |
| 156 } | 156 } |
| 157 | 157 |
| 158 static void SetUploadData(JNIEnv* env, | 158 static void SetUploadData(JNIEnv* env, |
| 159 jobject jcaller, | 159 const JavaParamRef<jobject>& jcaller, |
| 160 jlong jurl_request_adapter, | 160 jlong jurl_request_adapter, |
| 161 jstring jcontent_type, | 161 const JavaParamRef<jstring>& jcontent_type, |
| 162 jbyteArray jcontent) { | 162 const JavaParamRef<jbyteArray>& jcontent) { |
| 163 URLRequestAdapter* request_adapter = | 163 URLRequestAdapter* request_adapter = |
| 164 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 164 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 165 DCHECK(request_adapter); | 165 DCHECK(request_adapter); |
| 166 SetPostContentType(env, request_adapter, jcontent_type); | 166 SetPostContentType(env, request_adapter, jcontent_type); |
| 167 | 167 |
| 168 if (jcontent != NULL) { | 168 if (jcontent != NULL) { |
| 169 jsize size = env->GetArrayLength(jcontent); | 169 jsize size = env->GetArrayLength(jcontent); |
| 170 if (size > 0) { | 170 if (size > 0) { |
| 171 jbyte* content_bytes = env->GetByteArrayElements(jcontent, NULL); | 171 jbyte* content_bytes = env->GetByteArrayElements(jcontent, NULL); |
| 172 request_adapter->SetUploadContent( | 172 request_adapter->SetUploadContent( |
| 173 reinterpret_cast<const char*>(content_bytes), size); | 173 reinterpret_cast<const char*>(content_bytes), size); |
| 174 env->ReleaseByteArrayElements(jcontent, content_bytes, 0); | 174 env->ReleaseByteArrayElements(jcontent, content_bytes, 0); |
| 175 } | 175 } |
| 176 } | 176 } |
| 177 } | 177 } |
| 178 | 178 |
| 179 static void SetUploadChannel(JNIEnv* env, | 179 static void SetUploadChannel(JNIEnv* env, |
| 180 jobject jcaller, | 180 const JavaParamRef<jobject>& jcaller, |
| 181 jlong jurl_request_adapter, | 181 jlong jurl_request_adapter, |
| 182 jstring jcontent_type, | 182 const JavaParamRef<jstring>& jcontent_type, |
| 183 jlong jcontent_length) { | 183 jlong jcontent_length) { |
| 184 URLRequestAdapter* request_adapter = | 184 URLRequestAdapter* request_adapter = |
| 185 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 185 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 186 DCHECK(request_adapter); | 186 DCHECK(request_adapter); |
| 187 SetPostContentType(env, request_adapter, jcontent_type); | 187 SetPostContentType(env, request_adapter, jcontent_type); |
| 188 | 188 |
| 189 request_adapter->SetUploadChannel(env, jcontent_length); | 189 request_adapter->SetUploadChannel(env, jcontent_length); |
| 190 } | 190 } |
| 191 | 191 |
| 192 static void EnableChunkedUpload(JNIEnv* env, | 192 static void EnableChunkedUpload(JNIEnv* env, |
| 193 jobject jcaller, | 193 const JavaParamRef<jobject>& jcaller, |
| 194 jlong jurl_request_adapter, | 194 jlong jurl_request_adapter, |
| 195 jstring jcontent_type) { | 195 const JavaParamRef<jstring>& jcontent_type) { |
| 196 URLRequestAdapter* request_adapter = | 196 URLRequestAdapter* request_adapter = |
| 197 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 197 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 198 DCHECK(request_adapter); | 198 DCHECK(request_adapter); |
| 199 SetPostContentType(env, request_adapter, jcontent_type); | 199 SetPostContentType(env, request_adapter, jcontent_type); |
| 200 | 200 |
| 201 request_adapter->EnableChunkedUpload(); | 201 request_adapter->EnableChunkedUpload(); |
| 202 } | 202 } |
| 203 | 203 |
| 204 static void AppendChunk(JNIEnv* env, | 204 static void AppendChunk(JNIEnv* env, |
| 205 jobject jcaller, | 205 const JavaParamRef<jobject>& jcaller, |
| 206 jlong jurl_request_adapter, | 206 jlong jurl_request_adapter, |
| 207 jobject jchunk_byte_buffer, | 207 const JavaParamRef<jobject>& jchunk_byte_buffer, |
| 208 jint jchunk_size, | 208 jint jchunk_size, |
| 209 jboolean jis_last_chunk) { | 209 jboolean jis_last_chunk) { |
| 210 URLRequestAdapter* request_adapter = | 210 URLRequestAdapter* request_adapter = |
| 211 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 211 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 212 DCHECK(request_adapter); | 212 DCHECK(request_adapter); |
| 213 DCHECK(jchunk_byte_buffer); | 213 DCHECK(jchunk_byte_buffer); |
| 214 | 214 |
| 215 void* chunk = env->GetDirectBufferAddress(jchunk_byte_buffer); | 215 void* chunk = env->GetDirectBufferAddress(jchunk_byte_buffer); |
| 216 request_adapter->AppendChunk(reinterpret_cast<const char*>(chunk), | 216 request_adapter->AppendChunk(reinterpret_cast<const char*>(chunk), |
| 217 jchunk_size, jis_last_chunk); | 217 jchunk_size, jis_last_chunk); |
| 218 } | 218 } |
| 219 | 219 |
| 220 /* synchronized */ | 220 /* synchronized */ |
| 221 static void Start(JNIEnv* env, jobject jcaller, jlong jurl_request_adapter) { | 221 static void Start(JNIEnv* env, |
| 222 const JavaParamRef<jobject>& jcaller, |
| 223 jlong jurl_request_adapter) { |
| 222 URLRequestAdapter* request_adapter = | 224 URLRequestAdapter* request_adapter = |
| 223 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 225 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 224 if (request_adapter != NULL) | 226 if (request_adapter != NULL) |
| 225 request_adapter->Start(); | 227 request_adapter->Start(); |
| 226 } | 228 } |
| 227 | 229 |
| 228 /* synchronized */ | 230 /* synchronized */ |
| 229 static void DestroyRequestAdapter(JNIEnv* env, | 231 static void DestroyRequestAdapter(JNIEnv* env, |
| 230 jobject jcaller, | 232 const JavaParamRef<jobject>& jcaller, |
| 231 jlong jurl_request_adapter) { | 233 jlong jurl_request_adapter) { |
| 232 URLRequestAdapter* request_adapter = | 234 URLRequestAdapter* request_adapter = |
| 233 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 235 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 234 if (request_adapter != NULL) | 236 if (request_adapter != NULL) |
| 235 request_adapter->Destroy(); | 237 request_adapter->Destroy(); |
| 236 } | 238 } |
| 237 | 239 |
| 238 /* synchronized */ | 240 /* synchronized */ |
| 239 static void Cancel(JNIEnv* env, jobject jcaller, jlong jurl_request_adapter) { | 241 static void Cancel(JNIEnv* env, |
| 242 const JavaParamRef<jobject>& jcaller, |
| 243 jlong jurl_request_adapter) { |
| 240 URLRequestAdapter* request_adapter = | 244 URLRequestAdapter* request_adapter = |
| 241 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 245 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 242 if (request_adapter != NULL) | 246 if (request_adapter != NULL) |
| 243 request_adapter->Cancel(); | 247 request_adapter->Cancel(); |
| 244 } | 248 } |
| 245 | 249 |
| 246 static jint GetErrorCode(JNIEnv* env, | 250 static jint GetErrorCode(JNIEnv* env, |
| 247 jobject jcaller, | 251 const JavaParamRef<jobject>& jcaller, |
| 248 jlong jurl_request_adapter) { | 252 jlong jurl_request_adapter) { |
| 249 URLRequestAdapter* request_adapter = | 253 URLRequestAdapter* request_adapter = |
| 250 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 254 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 251 DCHECK(request_adapter); | 255 DCHECK(request_adapter); |
| 252 int error_code = request_adapter->error_code(); | 256 int error_code = request_adapter->error_code(); |
| 253 switch (error_code) { | 257 switch (error_code) { |
| 254 // TODO(mef): Investigate returning success on positive values, too, as | 258 // TODO(mef): Investigate returning success on positive values, too, as |
| 255 // they technically indicate success. | 259 // they technically indicate success. |
| 256 case net::OK: | 260 case net::OK: |
| 257 return REQUEST_ERROR_SUCCESS; | 261 return REQUEST_ERROR_SUCCESS; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 277 return REQUEST_ERROR_CONNECTION_TIMED_OUT; | 281 return REQUEST_ERROR_CONNECTION_TIMED_OUT; |
| 278 | 282 |
| 279 case net::ERR_NAME_NOT_RESOLVED: | 283 case net::ERR_NAME_NOT_RESOLVED: |
| 280 return REQUEST_ERROR_UNKNOWN_HOST; | 284 return REQUEST_ERROR_UNKNOWN_HOST; |
| 281 case net::ERR_TOO_MANY_REDIRECTS: | 285 case net::ERR_TOO_MANY_REDIRECTS: |
| 282 return REQUEST_ERROR_TOO_MANY_REDIRECTS; | 286 return REQUEST_ERROR_TOO_MANY_REDIRECTS; |
| 283 } | 287 } |
| 284 return REQUEST_ERROR_UNKNOWN; | 288 return REQUEST_ERROR_UNKNOWN; |
| 285 } | 289 } |
| 286 | 290 |
| 287 static ScopedJavaLocalRef<jstring> GetErrorString(JNIEnv* env, | 291 static ScopedJavaLocalRef<jstring> GetErrorString( |
| 288 jobject jcaller, | 292 JNIEnv* env, |
| 289 jlong jurl_request_adapter) { | 293 const JavaParamRef<jobject>& jcaller, |
| 294 jlong jurl_request_adapter) { |
| 290 URLRequestAdapter* request_adapter = | 295 URLRequestAdapter* request_adapter = |
| 291 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 296 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 292 DCHECK(request_adapter); | 297 DCHECK(request_adapter); |
| 293 int error_code = request_adapter->error_code(); | 298 int error_code = request_adapter->error_code(); |
| 294 char buffer[200]; | 299 char buffer[200]; |
| 295 std::string error_string = net::ErrorToString(error_code); | 300 std::string error_string = net::ErrorToString(error_code); |
| 296 snprintf(buffer, | 301 snprintf(buffer, |
| 297 sizeof(buffer), | 302 sizeof(buffer), |
| 298 "System error: %s(%d)", | 303 "System error: %s(%d)", |
| 299 error_string.c_str(), | 304 error_string.c_str(), |
| 300 error_code); | 305 error_code); |
| 301 return ConvertUTF8ToJavaString(env, buffer); | 306 return ConvertUTF8ToJavaString(env, buffer); |
| 302 } | 307 } |
| 303 | 308 |
| 304 static jint GetHttpStatusCode(JNIEnv* env, | 309 static jint GetHttpStatusCode(JNIEnv* env, |
| 305 jobject jcaller, | 310 const JavaParamRef<jobject>& jcaller, |
| 306 jlong jurl_request_adapter) { | 311 jlong jurl_request_adapter) { |
| 307 URLRequestAdapter* request_adapter = | 312 URLRequestAdapter* request_adapter = |
| 308 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 313 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 309 DCHECK(request_adapter); | 314 DCHECK(request_adapter); |
| 310 return request_adapter->http_status_code(); | 315 return request_adapter->http_status_code(); |
| 311 } | 316 } |
| 312 | 317 |
| 313 static ScopedJavaLocalRef<jstring> | 318 static ScopedJavaLocalRef<jstring> GetHttpStatusText( |
| 314 GetHttpStatusText(JNIEnv* env, jobject jcaller, jlong jurl_request_adapter) { | 319 JNIEnv* env, |
| 320 const JavaParamRef<jobject>& jcaller, |
| 321 jlong jurl_request_adapter) { |
| 315 URLRequestAdapter* request_adapter = | 322 URLRequestAdapter* request_adapter = |
| 316 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 323 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 317 DCHECK(request_adapter); | 324 DCHECK(request_adapter); |
| 318 return ConvertUTF8ToJavaString(env, request_adapter->http_status_text()); | 325 return ConvertUTF8ToJavaString(env, request_adapter->http_status_text()); |
| 319 } | 326 } |
| 320 | 327 |
| 321 static ScopedJavaLocalRef<jstring> GetContentType(JNIEnv* env, | 328 static ScopedJavaLocalRef<jstring> GetContentType( |
| 322 jobject jcaller, | 329 JNIEnv* env, |
| 323 jlong jurl_request_adapter) { | 330 const JavaParamRef<jobject>& jcaller, |
| 331 jlong jurl_request_adapter) { |
| 324 URLRequestAdapter* request_adapter = | 332 URLRequestAdapter* request_adapter = |
| 325 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 333 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 326 DCHECK(request_adapter); | 334 DCHECK(request_adapter); |
| 327 std::string type = request_adapter->content_type(); | 335 std::string type = request_adapter->content_type(); |
| 328 if (!type.empty()) { | 336 if (!type.empty()) { |
| 329 return ConvertUTF8ToJavaString(env, type.c_str()); | 337 return ConvertUTF8ToJavaString(env, type.c_str()); |
| 330 } else { | 338 } else { |
| 331 return ScopedJavaLocalRef<jstring>(); | 339 return ScopedJavaLocalRef<jstring>(); |
| 332 } | 340 } |
| 333 } | 341 } |
| 334 | 342 |
| 335 static jlong GetContentLength(JNIEnv* env, | 343 static jlong GetContentLength(JNIEnv* env, |
| 336 jobject jcaller, | 344 const JavaParamRef<jobject>& jcaller, |
| 337 jlong jurl_request_adapter) { | 345 jlong jurl_request_adapter) { |
| 338 URLRequestAdapter* request_adapter = | 346 URLRequestAdapter* request_adapter = |
| 339 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 347 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 340 DCHECK(request_adapter); | 348 DCHECK(request_adapter); |
| 341 return request_adapter->content_length(); | 349 return request_adapter->content_length(); |
| 342 } | 350 } |
| 343 | 351 |
| 344 static ScopedJavaLocalRef<jstring> GetHeader(JNIEnv* env, | 352 static ScopedJavaLocalRef<jstring> GetHeader( |
| 345 jobject jcaller, | 353 JNIEnv* env, |
| 346 jlong jurl_request_adapter, | 354 const JavaParamRef<jobject>& jcaller, |
| 347 jstring jheader_name) { | 355 jlong jurl_request_adapter, |
| 356 const JavaParamRef<jstring>& jheader_name) { |
| 348 URLRequestAdapter* request_adapter = | 357 URLRequestAdapter* request_adapter = |
| 349 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 358 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 350 DCHECK(request_adapter); | 359 DCHECK(request_adapter); |
| 351 std::string header_name = ConvertJavaStringToUTF8(env, jheader_name); | 360 std::string header_name = ConvertJavaStringToUTF8(env, jheader_name); |
| 352 std::string header_value = request_adapter->GetHeader(header_name); | 361 std::string header_value = request_adapter->GetHeader(header_name); |
| 353 if (!header_value.empty()) | 362 if (!header_value.empty()) |
| 354 return ConvertUTF8ToJavaString(env, header_value.c_str()); | 363 return ConvertUTF8ToJavaString(env, header_value.c_str()); |
| 355 return ScopedJavaLocalRef<jstring>(); | 364 return ScopedJavaLocalRef<jstring>(); |
| 356 } | 365 } |
| 357 | 366 |
| 358 static void GetAllHeaders(JNIEnv* env, | 367 static void GetAllHeaders(JNIEnv* env, |
| 359 jobject jcaller, | 368 const JavaParamRef<jobject>& jcaller, |
| 360 jlong jurl_request_adapter, | 369 jlong jurl_request_adapter, |
| 361 jobject jheaders_map) { | 370 const JavaParamRef<jobject>& jheaders_map) { |
| 362 URLRequestAdapter* request_adapter = | 371 URLRequestAdapter* request_adapter = |
| 363 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 372 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 364 DCHECK(request_adapter); | 373 DCHECK(request_adapter); |
| 365 | 374 |
| 366 net::HttpResponseHeaders* headers = request_adapter->GetResponseHeaders(); | 375 net::HttpResponseHeaders* headers = request_adapter->GetResponseHeaders(); |
| 367 if (headers == NULL) | 376 if (headers == NULL) |
| 368 return; | 377 return; |
| 369 | 378 |
| 370 void* iter = NULL; | 379 void* iter = NULL; |
| 371 std::string header_name; | 380 std::string header_name; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 382 // Some implementations (notably HttpURLConnection) include a mapping for the | 391 // Some implementations (notably HttpURLConnection) include a mapping for the |
| 383 // null key; in HTTP's case, this maps to the HTTP status line. | 392 // null key; in HTTP's case, this maps to the HTTP status line. |
| 384 ScopedJavaLocalRef<jstring> status_line = | 393 ScopedJavaLocalRef<jstring> status_line = |
| 385 ConvertUTF8ToJavaString(env, headers->GetStatusLine()); | 394 ConvertUTF8ToJavaString(env, headers->GetStatusLine()); |
| 386 Java_ChromiumUrlRequest_onAppendResponseHeader(env, jcaller, jheaders_map, | 395 Java_ChromiumUrlRequest_onAppendResponseHeader(env, jcaller, jheaders_map, |
| 387 NULL, status_line.obj()); | 396 NULL, status_line.obj()); |
| 388 } | 397 } |
| 389 | 398 |
| 390 static ScopedJavaLocalRef<jstring> GetNegotiatedProtocol( | 399 static ScopedJavaLocalRef<jstring> GetNegotiatedProtocol( |
| 391 JNIEnv* env, | 400 JNIEnv* env, |
| 392 jobject jcaller, | 401 const JavaParamRef<jobject>& jcaller, |
| 393 jlong jurl_request_adapter) { | 402 jlong jurl_request_adapter) { |
| 394 URLRequestAdapter* request_adapter = | 403 URLRequestAdapter* request_adapter = |
| 395 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 404 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 396 DCHECK(request_adapter); | 405 DCHECK(request_adapter); |
| 397 | 406 |
| 398 std::string negotiated_protocol = request_adapter->GetNegotiatedProtocol(); | 407 std::string negotiated_protocol = request_adapter->GetNegotiatedProtocol(); |
| 399 return ConvertUTF8ToJavaString(env, negotiated_protocol.c_str()); | 408 return ConvertUTF8ToJavaString(env, negotiated_protocol.c_str()); |
| 400 } | 409 } |
| 401 | 410 |
| 402 static jboolean GetWasCached(JNIEnv* env, | 411 static jboolean GetWasCached(JNIEnv* env, |
| 403 jobject jcaller, | 412 const JavaParamRef<jobject>& jcaller, |
| 404 jlong jurl_request_adapter) { | 413 jlong jurl_request_adapter) { |
| 405 URLRequestAdapter* request_adapter = | 414 URLRequestAdapter* request_adapter = |
| 406 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); | 415 reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter); |
| 407 DCHECK(request_adapter); | 416 DCHECK(request_adapter); |
| 408 | 417 |
| 409 bool was_cached = request_adapter->GetWasCached(); | 418 bool was_cached = request_adapter->GetWasCached(); |
| 410 return was_cached ? JNI_TRUE : JNI_FALSE; | 419 return was_cached ? JNI_TRUE : JNI_FALSE; |
| 411 } | 420 } |
| 412 | 421 |
| 413 static void DisableRedirects(JNIEnv* env, jobject jcaller, | 422 static void DisableRedirects(JNIEnv* env, |
| 423 const JavaParamRef<jobject>& jcaller, |
| 414 jlong jrequest_adapter) { | 424 jlong jrequest_adapter) { |
| 415 URLRequestAdapter* request_adapter = | 425 URLRequestAdapter* request_adapter = |
| 416 reinterpret_cast<URLRequestAdapter*>(jrequest_adapter); | 426 reinterpret_cast<URLRequestAdapter*>(jrequest_adapter); |
| 417 DCHECK(request_adapter); | 427 DCHECK(request_adapter); |
| 418 request_adapter->DisableRedirects(); | 428 request_adapter->DisableRedirects(); |
| 419 } | 429 } |
| 420 | 430 |
| 421 } // namespace cronet | 431 } // namespace cronet |
| OLD | NEW |