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

Side by Side Diff: content/browser/android/popup_touch_handle_drawable.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 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 "content/browser/android/popup_touch_handle_drawable.h" 5 #include "content/browser/android/popup_touch_handle_drawable.h"
6 6
7 #include "content/public/browser/android/content_view_core.h" 7 #include "content/public/browser/android/content_view_core.h"
8 #include "jni/PopupTouchHandleDrawable_jni.h" 8 #include "jni/PopupTouchHandleDrawable_jni.h"
9 9
10 using base::android::ScopedJavaLocalRef; 10 using base::android::ScopedJavaLocalRef;
11 11
12 namespace content { 12 namespace content {
13 13
14 // static 14 // static
15 std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create( 15 std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create(
16 ContentViewCore* content_view_core, 16 ContentViewCore* content_view_core,
17 float dpi_scale) { 17 float dpi_scale) {
18 DCHECK(content_view_core); 18 DCHECK(content_view_core);
19 base::android::ScopedJavaLocalRef<jobject> content_view_core_obj = 19 base::android::ScopedJavaLocalRef<jobject> content_view_core_obj =
20 content_view_core->GetJavaObject(); 20 content_view_core->GetJavaObject();
21 if (content_view_core_obj.is_null()) 21 if (content_view_core_obj.is_null())
22 return nullptr; 22 return nullptr;
23 JNIEnv* env = base::android::AttachCurrentThread(); 23 JNIEnv* env = base::android::AttachCurrentThread();
24 base::android::ScopedJavaLocalRef<jobject> drawable_obj( 24 base::android::ScopedJavaLocalRef<jobject> drawable_obj(
25 Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj())); 25 Java_PopupTouchHandleDrawable_create(env, content_view_core_obj));
26 return std::unique_ptr<PopupTouchHandleDrawable>( 26 return std::unique_ptr<PopupTouchHandleDrawable>(
27 new PopupTouchHandleDrawable(env, drawable_obj.obj(), dpi_scale)); 27 new PopupTouchHandleDrawable(env, drawable_obj.obj(), dpi_scale));
28 } 28 }
29 29
30 PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env, 30 PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env,
31 jobject obj, 31 jobject obj,
32 float dpi_scale) 32 float dpi_scale)
33 : java_ref_(env, obj), dpi_scale_(dpi_scale) { 33 : java_ref_(env, obj), dpi_scale_(dpi_scale) {
34 DCHECK(!java_ref_.is_empty()); 34 DCHECK(!java_ref_.is_empty());
35 drawable_horizontal_padding_ratio_ = 35 drawable_horizontal_padding_ratio_ =
36 Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj); 36 Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj);
37 } 37 }
38 38
39 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() { 39 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
40 JNIEnv* env = base::android::AttachCurrentThread(); 40 JNIEnv* env = base::android::AttachCurrentThread();
41 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 41 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
42 if (!obj.is_null()) 42 if (!obj.is_null())
43 Java_PopupTouchHandleDrawable_destroy(env, obj.obj()); 43 Java_PopupTouchHandleDrawable_destroy(env, obj);
44 } 44 }
45 45
46 void PopupTouchHandleDrawable::SetEnabled(bool enabled) { 46 void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
47 JNIEnv* env = base::android::AttachCurrentThread(); 47 JNIEnv* env = base::android::AttachCurrentThread();
48 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 48 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
49 if (obj.is_null()) 49 if (obj.is_null())
50 return; 50 return;
51 if (enabled) 51 if (enabled)
52 Java_PopupTouchHandleDrawable_show(env, obj.obj()); 52 Java_PopupTouchHandleDrawable_show(env, obj);
53 else 53 else
54 Java_PopupTouchHandleDrawable_hide(env, obj.obj()); 54 Java_PopupTouchHandleDrawable_hide(env, obj);
55 } 55 }
56 56
57 void PopupTouchHandleDrawable::SetOrientation( 57 void PopupTouchHandleDrawable::SetOrientation(
58 ui::TouchHandleOrientation orientation, 58 ui::TouchHandleOrientation orientation,
59 bool mirror_vertical, 59 bool mirror_vertical,
60 bool mirror_horizontal) { 60 bool mirror_horizontal) {
61 JNIEnv* env = base::android::AttachCurrentThread(); 61 JNIEnv* env = base::android::AttachCurrentThread();
62 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 62 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
63 if (!obj.is_null()) { 63 if (!obj.is_null()) {
64 Java_PopupTouchHandleDrawable_setOrientation( 64 Java_PopupTouchHandleDrawable_setOrientation(
65 env, obj.obj(), static_cast<int>(orientation), mirror_vertical, 65 env, obj, static_cast<int>(orientation), mirror_vertical,
66 mirror_horizontal); 66 mirror_horizontal);
67 } 67 }
68 } 68 }
69 69
70 void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) { 70 void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
71 JNIEnv* env = base::android::AttachCurrentThread(); 71 JNIEnv* env = base::android::AttachCurrentThread();
72 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 72 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
73 if (!obj.is_null()) { 73 if (!obj.is_null()) {
74 const gfx::PointF origin_pix = gfx::ScalePoint(origin, dpi_scale_); 74 const gfx::PointF origin_pix = gfx::ScalePoint(origin, dpi_scale_);
75 Java_PopupTouchHandleDrawable_setOrigin(env, obj.obj(), origin_pix.x(), 75 Java_PopupTouchHandleDrawable_setOrigin(env, obj, origin_pix.x(),
76 origin_pix.y()); 76 origin_pix.y());
77 } 77 }
78 } 78 }
79 79
80 void PopupTouchHandleDrawable::SetAlpha(float alpha) { 80 void PopupTouchHandleDrawable::SetAlpha(float alpha) {
81 JNIEnv* env = base::android::AttachCurrentThread(); 81 JNIEnv* env = base::android::AttachCurrentThread();
82 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 82 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
83 bool visible = alpha > 0; 83 bool visible = alpha > 0;
84 if (!obj.is_null()) 84 if (!obj.is_null())
85 Java_PopupTouchHandleDrawable_setVisible(env, obj.obj(), visible); 85 Java_PopupTouchHandleDrawable_setVisible(env, obj, visible);
86 } 86 }
87 87
88 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const { 88 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
89 JNIEnv* env = base::android::AttachCurrentThread(); 89 JNIEnv* env = base::android::AttachCurrentThread();
90 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 90 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
91 if (obj.is_null()) 91 if (obj.is_null())
92 return gfx::RectF(); 92 return gfx::RectF();
93 gfx::RectF unscaled_rect( 93 gfx::RectF unscaled_rect(
94 Java_PopupTouchHandleDrawable_getPositionX(env, obj.obj()), 94 Java_PopupTouchHandleDrawable_getPositionX(env, obj),
95 Java_PopupTouchHandleDrawable_getPositionY(env, obj.obj()), 95 Java_PopupTouchHandleDrawable_getPositionY(env, obj),
96 Java_PopupTouchHandleDrawable_getVisibleWidth(env, obj.obj()), 96 Java_PopupTouchHandleDrawable_getVisibleWidth(env, obj),
97 Java_PopupTouchHandleDrawable_getVisibleHeight(env, obj.obj())); 97 Java_PopupTouchHandleDrawable_getVisibleHeight(env, obj));
98 return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_); 98 return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
99 } 99 }
100 100
101 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const { 101 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
102 return drawable_horizontal_padding_ratio_; 102 return drawable_horizontal_padding_ratio_;
103 } 103 }
104 104
105 } // namespace content 105 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/interstitial_page_delegate_android.cc ('k') | content/browser/android/tracing_controller_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698