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

Unified Diff: components/external_video_surface/browser/android/external_video_surface_container_impl.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 side-by-side diff with in-line comments
Download patch
Index: components/external_video_surface/browser/android/external_video_surface_container_impl.cc
diff --git a/components/external_video_surface/browser/android/external_video_surface_container_impl.cc b/components/external_video_surface/browser/android/external_video_surface_container_impl.cc
index 9b7295f0ee7409e620daaf1da9158b2827475a40..af66b097278a7ecd80afeb6916b0d31c51578ec3 100644
--- a/components/external_video_surface/browser/android/external_video_surface_container_impl.cc
+++ b/components/external_video_surface/browser/android/external_video_surface_container_impl.cc
@@ -36,12 +36,12 @@ ExternalVideoSurfaceContainerImpl::ExternalVideoSurfaceContainerImpl(
base::android::ScopedJavaLocalRef<jobject> java_content_view_core) {
JNIEnv* env = AttachCurrentThread();
jobject_.Reset(Java_ExternalVideoSurfaceContainer_create(
- env, reinterpret_cast<intptr_t>(this), java_content_view_core.obj()));
+ env, reinterpret_cast<intptr_t>(this), java_content_view_core));
}
ExternalVideoSurfaceContainerImpl::~ExternalVideoSurfaceContainerImpl() {
JNIEnv* env = AttachCurrentThread();
- Java_ExternalVideoSurfaceContainer_destroy(env, jobject_.obj());
+ Java_ExternalVideoSurfaceContainer_destroy(env, jobject_);
jobject_.Reset();
}
@@ -54,15 +54,14 @@ void ExternalVideoSurfaceContainerImpl::RequestExternalVideoSurface(
JNIEnv* env = AttachCurrentThread();
Java_ExternalVideoSurfaceContainer_requestExternalVideoSurface(
- env, jobject_.obj(), static_cast<jint>(player_id));
+ env, jobject_, static_cast<jint>(player_id));
}
int ExternalVideoSurfaceContainerImpl::GetCurrentPlayerId() {
JNIEnv* env = AttachCurrentThread();
int current_player = static_cast<int>(
- Java_ExternalVideoSurfaceContainer_getCurrentPlayerId(
- env, jobject_.obj()));
+ Java_ExternalVideoSurfaceContainer_getCurrentPlayerId(env, jobject_));
if (current_player < 0)
return kInvalidPlayerId;
@@ -74,7 +73,7 @@ void ExternalVideoSurfaceContainerImpl::ReleaseExternalVideoSurface(
int player_id) {
JNIEnv* env = AttachCurrentThread();
Java_ExternalVideoSurfaceContainer_releaseExternalVideoSurface(
- env, jobject_.obj(), static_cast<jint>(player_id));
+ env, jobject_, static_cast<jint>(player_id));
surface_created_cb_.Reset();
surface_destroyed_cb_.Reset();
@@ -82,18 +81,15 @@ void ExternalVideoSurfaceContainerImpl::ReleaseExternalVideoSurface(
void ExternalVideoSurfaceContainerImpl::OnFrameInfoUpdated() {
JNIEnv* env = AttachCurrentThread();
- Java_ExternalVideoSurfaceContainer_onFrameInfoUpdated(env, jobject_.obj());
+ Java_ExternalVideoSurfaceContainer_onFrameInfoUpdated(env, jobject_);
}
void ExternalVideoSurfaceContainerImpl::OnExternalVideoSurfacePositionChanged(
int player_id, const gfx::RectF& rect) {
JNIEnv* env = AttachCurrentThread();
Java_ExternalVideoSurfaceContainer_onExternalVideoSurfacePositionChanged(
- env,
- jobject_.obj(),
- static_cast<jint>(player_id),
- static_cast<jfloat>(rect.x()),
- static_cast<jfloat>(rect.y()),
+ env, jobject_, static_cast<jint>(player_id),
+ static_cast<jfloat>(rect.x()), static_cast<jfloat>(rect.y()),
static_cast<jfloat>(rect.x() + rect.width()),
static_cast<jfloat>(rect.y() + rect.height()));
}
« no previous file with comments | « components/dom_distiller/core/distilled_page_prefs_android.cc ('k') | components/gcm_driver/gcm_driver_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698