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

Unified Diff: components/cronet/android/cronet_url_request.cc

Issue 586143002: Initial implementation of Cronet Async API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: components/cronet/android/cronet_url_request.cc
diff --git a/components/cronet/android/cronet_url_request.cc b/components/cronet/android/cronet_url_request.cc
new file mode 100644
index 0000000000000000000000000000000000000000..607d6b6ab6e3137bfebbdccb0478463014c92f82
--- /dev/null
+++ b/components/cronet/android/cronet_url_request.cc
@@ -0,0 +1,292 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/cronet/android/cronet_url_request.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/macros.h"
+#include "components/cronet/android/cronet_url_request_adapter.h"
+#include "components/cronet/android/cronet_url_request_context_adapter.h"
+#include "jni/CronetUrlRequest_jni.h"
+#include "net/base/net_errors.h"
+#include "net/base/request_priority.h"
+#include "net/http/http_response_headers.h"
+
+using base::android::ConvertUTF8ToJavaString;
+
+namespace cronet {
+namespace {
+
+net::RequestPriority ConvertRequestPriority(jint request_priority) {
+ switch (request_priority) {
+ case CRONET_REQUEST_PRIORITY_IDLE:
+ return net::IDLE;
+ case CRONET_REQUEST_PRIORITY_LOWEST:
+ return net::LOWEST;
+ case CRONET_REQUEST_PRIORITY_LOW:
+ return net::LOW;
+ case CRONET_REQUEST_PRIORITY_MEDIUM:
+ return net::MEDIUM;
+ case CRONET_REQUEST_PRIORITY_HIGHEST:
+ return net::HIGHEST;
+ default:
+ return net::LOWEST;
+ }
+}
mmenke 2014/10/06 18:28:43 nit: Blank line after function.
mef 2014/10/07 00:45:17 Done.
+// A delegate of CronetURLRequestAdapter that delivers callbacks to the Java
+// layer. Always called on Network Thread.
+class JniCronetURLRequestAdapterDelegate
+ : public CronetURLRequestAdapter::CronetURLRequestAdapterDelegate {
+ public:
+ JniCronetURLRequestAdapterDelegate(JNIEnv* env, jobject owner) {
+ owner_ = env->NewGlobalRef(owner);
+ }
+
+ virtual void OnRedirect(CronetURLRequestAdapter* request,
+ const GURL& newLocation) OVERRIDE {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ cronet::Java_CronetUrlRequest_onRedirect(
+ env,
+ owner_,
+ ConvertUTF8ToJavaString(env, newLocation.spec()).Release());
+ }
+
+ virtual void OnResponseStarted(CronetURLRequestAdapter* request) OVERRIDE {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ cronet::Java_CronetUrlRequest_onResponseStarted(env, owner_);
+ }
+
+ virtual void OnBytesRead(CronetURLRequestAdapter* request,
+ int bytes_read) OVERRIDE {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ base::android::ScopedJavaLocalRef<jobject> java_buffer(
+ env, env->NewDirectByteBuffer(request->Data(), bytes_read));
+ cronet::Java_CronetUrlRequest_onDataReceived(
+ env, owner_, java_buffer.obj());
+ }
+
+ virtual void OnRequestFinished(CronetURLRequestAdapter* request,
+ bool canceled) OVERRIDE {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ cronet::Java_CronetUrlRequest_onComplete(
+ env, owner_, canceled ? JNI_TRUE : JNI_FALSE);
+ }
+
+ virtual void OnError(CronetURLRequestAdapter* request, int error) OVERRIDE {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ cronet::Java_CronetUrlRequest_onError(env, owner_, error);
+ }
+
+ protected:
+ virtual ~JniCronetURLRequestAdapterDelegate() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ env->DeleteGlobalRef(owner_);
+ }
+
+ private:
+ jobject owner_;
+
+ DISALLOW_COPY_AND_ASSIGN(JniCronetURLRequestAdapterDelegate);
+};
+
+} // namespace
+
+// Explicitly register static JNI functions.
+bool CronetUrlRequestRegisterJni(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+static jlong CreateRequestAdapter(JNIEnv* env,
+ jobject object,
+ jlong url_request_context_adapter,
+ jstring url_string,
+ jint priority) {
+ CronetURLRequestContextAdapter* context =
+ reinterpret_cast<CronetURLRequestContextAdapter*>(
+ url_request_context_adapter);
+ DCHECK(context != NULL);
mmenke 2014/10/06 18:28:44 Can this be DCHECK_NE(nullptr, context); now?
mef 2014/10/07 00:45:17 Probably. Is there something special that's requir
+
+ GURL url(base::android::ConvertJavaStringToUTF8(env, url_string));
+
+ VLOG(1) << "New chromium network request: " << url.possibly_invalid_spec();
+
+ CronetURLRequestAdapter* adapter = new CronetURLRequestAdapter(
+ context,
+ new JniCronetURLRequestAdapterDelegate(env, object),
+ url,
+ ConvertRequestPriority(priority));
+
+ return reinterpret_cast<jlong>(adapter);
+}
+
+static void AddHeader(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter,
+ jstring name,
+ jstring value) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ std::string name_string(base::android::ConvertJavaStringToUTF8(env, name));
+ std::string value_string(base::android::ConvertJavaStringToUTF8(env, value));
+
+ if (request != NULL)
mmenke 2014/10/06 18:28:44 Can this happen when the request is NULL? It does
mef 2014/10/07 00:45:17 Done.
+ request->AddHeader(name_string, value_string);
+}
+
+static void SetHttpMethod(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter,
+ jstring method) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ std::string method_string(
+ base::android::ConvertJavaStringToUTF8(env, method));
+
+ if (request != NULL)
+ request->SetMethod(method_string);
+}
+
+static void Start(JNIEnv* env, jobject object, jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request != NULL)
+ request->Start();
+}
+
+static void DestroyRequestAdapter(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request != NULL)
+ request->Destroy();
+}
+
+static void Cancel(JNIEnv* env, jobject object, jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request != NULL)
+ request->Cancel();
+}
+
+static void ReceiveData(JNIEnv* env,
+ jobject jcaller,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request != NULL)
+ request->ReadData();
+}
+
+static void FollowDeferredRedirect(JNIEnv* env,
+ jobject jcaller,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request != NULL)
+ request->FollowDeferredRedirect();
+}
+
+static jint GetHttpStatusCode(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL)
mmenke 2014/10/06 18:28:43 None of these accessors can be called when the req
mef 2014/10/07 00:45:17 Done.
+ return 0;
+ return request->http_status_code();
+}
+
+static jstring GetContentType(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL)
+ return NULL;
+ std::string type = request->content_type();
+ if (type.empty())
+ return NULL;
+ return ConvertUTF8ToJavaString(env, type.c_str()).Release();
+}
+
+static jlong GetContentLength(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL)
+ return 0;
+ return request->content_length();
+}
+
+static void GetAllHeaders(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter,
+ jobject headersMap) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL)
+ return;
+
+ net::HttpResponseHeaders* headers = request->GetResponseHeaders();
+ if (headers == NULL)
+ return;
+
+ void* iter = NULL;
+ std::string header_name;
+ std::string header_value;
+ while (headers->EnumerateHeaderLines(&iter, &header_name, &header_value)) {
+ ScopedJavaLocalRef<jstring> name =
+ ConvertUTF8ToJavaString(env, header_name);
+ ScopedJavaLocalRef<jstring> value =
+ ConvertUTF8ToJavaString(env, header_value);
+ Java_CronetUrlRequest_onAppendResponseHeader(
+ env, object, headersMap, name.Release(), value.Release());
+ }
+
+ // Some implementations (notably HttpURLConnection) include a mapping for the
+ // null key; in HTTP's case, this maps to the HTTP status line.
+ ScopedJavaLocalRef<jstring> status_line =
+ ConvertUTF8ToJavaString(env, headers->GetStatusLine());
+ Java_CronetUrlRequest_onAppendResponseHeader(
+ env, object, headersMap, NULL, status_line.Release());
+}
+
+static jstring GetNegotiatedProtocol(JNIEnv* env,
+ jobject object,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL)
+ return ConvertUTF8ToJavaString(env, "").Release();
+
+ std::string negotiated_protocol = request->GetNegotiatedProtocol();
+ return ConvertUTF8ToJavaString(env, negotiated_protocol.c_str()).Release();
+}
+
+static jboolean GetWasCached(JNIEnv* env,
+ jobject jcaller,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL)
+ return JNI_FALSE;
+
+ return request->GetWasCached() ? JNI_TRUE : JNI_FALSE;
+}
+
+static jlong GetTotalReceivedBytes(JNIEnv* env,
+ jobject jcaller,
+ jlong url_request_adapter) {
+ CronetURLRequestAdapter* request =
+ reinterpret_cast<CronetURLRequestAdapter*>(url_request_adapter);
+ if (request == NULL) {
+ return 0;
+ }
+ return request->GetTotalReceivedBytes();
+}
+
+} // namespace cronet

Powered by Google App Engine
This is Rietveld 408576698