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

Side by Side Diff: ui/android/view_android.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
« no previous file with comments | « ui/android/resources/resource_manager_impl.cc ('k') | ui/android/window_android.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ui/android/view_android.h" 5 #include "ui/android/view_android.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 other.delegate_.reset(); 45 other.delegate_.reset();
46 } 46 }
47 return *this; 47 return *this;
48 } 48 }
49 49
50 ViewAndroid::ScopedAnchorView::~ScopedAnchorView() { 50 ViewAndroid::ScopedAnchorView::~ScopedAnchorView() {
51 JNIEnv* env = base::android::AttachCurrentThread(); 51 JNIEnv* env = base::android::AttachCurrentThread();
52 const ScopedJavaLocalRef<jobject> view = view_.get(env); 52 const ScopedJavaLocalRef<jobject> view = view_.get(env);
53 const ScopedJavaLocalRef<jobject> delegate = delegate_.get(env); 53 const ScopedJavaLocalRef<jobject> delegate = delegate_.get(env);
54 if (!view.is_null() && !delegate.is_null()) { 54 if (!view.is_null() && !delegate.is_null()) {
55 Java_ViewAndroidDelegate_removeView(env, 55 Java_ViewAndroidDelegate_removeView(env, delegate, view);
56 delegate.obj(),
57 view.obj());
58 } 56 }
59 view_.reset(); 57 view_.reset();
60 } 58 }
61 59
62 void ViewAndroid::ScopedAnchorView::Reset() { 60 void ViewAndroid::ScopedAnchorView::Reset() {
63 view_.reset(); 61 view_.reset();
64 delegate_.reset(); 62 delegate_.reset();
65 } 63 }
66 64
67 const base::android::ScopedJavaLocalRef<jobject> 65 const base::android::ScopedJavaLocalRef<jobject>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 parent_->RemoveChild(this); 101 parent_->RemoveChild(this);
104 } 102 }
105 103
106 ViewAndroid::ScopedAnchorView ViewAndroid::AcquireAnchorView() { 104 ViewAndroid::ScopedAnchorView ViewAndroid::AcquireAnchorView() {
107 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate()); 105 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
108 if (delegate.is_null()) 106 if (delegate.is_null())
109 return ViewAndroid::ScopedAnchorView(); 107 return ViewAndroid::ScopedAnchorView();
110 108
111 JNIEnv* env = base::android::AttachCurrentThread(); 109 JNIEnv* env = base::android::AttachCurrentThread();
112 return ViewAndroid::ScopedAnchorView( 110 return ViewAndroid::ScopedAnchorView(
113 env, 111 env, Java_ViewAndroidDelegate_acquireView(env, delegate), delegate);
114 Java_ViewAndroidDelegate_acquireView(env, delegate.obj()),
115 delegate);
116 } 112 }
117 113
118 void ViewAndroid::SetAnchorRect(const JavaRef<jobject>& anchor, 114 void ViewAndroid::SetAnchorRect(const JavaRef<jobject>& anchor,
119 const gfx::RectF& bounds) { 115 const gfx::RectF& bounds) {
120 if (bounds.IsEmpty()) 116 if (bounds.IsEmpty())
121 return; 117 return;
122 118
123 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate()); 119 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
124 if (delegate.is_null()) 120 if (delegate.is_null())
125 return; 121 return;
126 122
127 float scale = display::Screen::GetScreen() 123 float scale = display::Screen::GetScreen()
128 ->GetDisplayNearestWindow(this) 124 ->GetDisplayNearestWindow(this)
129 .device_scale_factor(); 125 .device_scale_factor();
130 int left_margin = std::round(bounds.x() * scale); 126 int left_margin = std::round(bounds.x() * scale);
131 // TODO(jinsukkim): Move content_offset() to ViewAndroid, since it's 127 // TODO(jinsukkim): Move content_offset() to ViewAndroid, since it's
132 // specific to a given web contents/render widget. 128 // specific to a given web contents/render widget.
133 float content_offset_y_pix = GetWindowAndroid()->content_offset().y(); 129 float content_offset_y_pix = GetWindowAndroid()->content_offset().y();
134 int top_margin = std::round(content_offset_y_pix + bounds.y() * scale); 130 int top_margin = std::round(content_offset_y_pix + bounds.y() * scale);
135 JNIEnv* env = base::android::AttachCurrentThread(); 131 JNIEnv* env = base::android::AttachCurrentThread();
136 Java_ViewAndroidDelegate_setViewPosition(env, 132 Java_ViewAndroidDelegate_setViewPosition(
137 delegate.obj(), 133 env, delegate, anchor, bounds.x(), bounds.y(), bounds.width(),
138 anchor.obj(), 134 bounds.height(), scale, left_margin, top_margin);
139 bounds.x(),
140 bounds.y(),
141 bounds.width(),
142 bounds.height(),
143 scale,
144 left_margin,
145 top_margin);
146 } 135 }
147 136
148 void ViewAndroid::RemoveChild(ViewAndroid* child) { 137 void ViewAndroid::RemoveChild(ViewAndroid* child) {
149 DCHECK(child); 138 DCHECK(child);
150 DCHECK_EQ(child->parent_, this); 139 DCHECK_EQ(child->parent_, this);
151 140
152 std::list<ViewAndroid*>::iterator it = 141 std::list<ViewAndroid*>::iterator it =
153 std::find(children_.begin(), children_.end(), child); 142 std::find(children_.begin(), children_.end(), child);
154 DCHECK(it != children_.end()); 143 DCHECK(it != children_.end());
155 children_.erase(it); 144 children_.erase(it);
(...skipping 21 matching lines...) Expand all
177 void ViewAndroid::SetLayer(scoped_refptr<cc::Layer> layer) { 166 void ViewAndroid::SetLayer(scoped_refptr<cc::Layer> layer) {
178 layer_ = layer; 167 layer_ = layer;
179 } 168 }
180 169
181 void ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext, 170 void ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext,
182 const JavaRef<jobject>& jimage) { 171 const JavaRef<jobject>& jimage) {
183 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate()); 172 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
184 if (delegate.is_null()) 173 if (delegate.is_null())
185 return; 174 return;
186 JNIEnv* env = base::android::AttachCurrentThread(); 175 JNIEnv* env = base::android::AttachCurrentThread();
187 Java_ViewAndroidDelegate_startDragAndDrop(env, 176 Java_ViewAndroidDelegate_startDragAndDrop(env, delegate, jtext, jimage);
188 delegate.obj(),
189 jtext.obj(),
190 jimage.obj());
191 } 177 }
192 178
193 } // namespace ui 179 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/resources/resource_manager_impl.cc ('k') | ui/android/window_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698