Factor out ContentViewAndroidDelegate

ui/android/view_android.cc

 // Copyright 2016 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 "ui/android/view_android.h"
 
 #include <algorithm>
 
 #include "base/android/jni_android.h"
 #include "cc/layers/layer.h"
+#include "jni/ViewAndroidDelegate_jni.h"
 #include "ui/android/window_android.h"
-
+#include "ui/base/layout.h"
 
 namespace ui {
 
 using base::android::JavaRef;
 
+ViewAndroid::ScopedAnchorView::ScopedAnchorView(

[Ted C, 2016/07/27 20:10:48]

the ordering of the .cc file should match the .h, so I think you need to move
the definition of ScopedAnchorView up in the header to match this

[Jinsuk Kim, 2016/07/29 06:09:14]

Done.

+    JNIEnv* env,
+    const JavaRef<jobject>& jview,
+    const JavaRef<jobject>& jdelegate)
+    : view_(env, jview.obj()), delegate_(env, jdelegate.obj()) {
+  // If there's a view, then we need a delegate to remove it.
+  DCHECK(!jdelegate.is_null() || jview.is_null());
+}
+
+ViewAndroid::ScopedAnchorView::ScopedAnchorView() { }
+
+ViewAndroid::ScopedAnchorView::ScopedAnchorView(ScopedAnchorView&& other) {
+  view_ = other.view_;
+  other.view_.reset();
+  delegate_ = other.delegate_;
+  other.delegate_.reset();
+}
+
+ViewAndroid::ScopedAnchorView&
+ViewAndroid::ScopedAnchorView::operator=(ScopedAnchorView&& other) {
+  if (this != &other) {
+    view_ = other.view_;
+    other.view_.reset();
+    delegate_ = other.delegate_;
+    other.delegate_.reset();
+  }
+  return *this;
+}
+
+ViewAndroid::ScopedAnchorView::~ScopedAnchorView() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (!view_.is_empty())

[Ted C, 2016/07/27 20:10:48]

needs braces since the condition is more than one line (at least I think we do)

[Jinsuk Kim, 2016/07/29 06:09:14]

Done.

+      Java_ViewAndroidDelegate_removeView(env,

[Ted C, 2016/07/27 20:10:48]

indented too much

[Jinsuk Kim, 2016/07/29 06:09:14]

Done.

+                                          delegate_.get(env).obj(),
+                                          view_.get(env).obj());
+  view_.reset();
+}
+
+void ViewAndroid::ScopedAnchorView::Reset() {
+  view_.reset();
+  delegate_.reset();
+}
+
 ViewAndroid::ViewAndroid(const JavaRef<jobject>& delegate)
     : parent_(nullptr), delegate_(delegate) {}
 
 ViewAndroid::ViewAndroid() : parent_(nullptr) {}
 
 ViewAndroid::~ViewAndroid() {
   RemoveFromParent();
 
   for (std::list<ViewAndroid*>::iterator it = children_.begin();
        it != children_.end(); it++) {
     DCHECK_EQ((*it)->parent_, this);
     (*it)->parent_ = nullptr;
   }
 }
 
+bool ViewAndroid::RegisterViewAndroid(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
 void ViewAndroid::AddChild(ViewAndroid* child) {
   DCHECK(child);
   DCHECK(std::find(children_.begin(), children_.end(), child) ==
          children_.end());
 
   children_.push_back(child);
   if (child->parent_)
     child->RemoveFromParent();
   child->parent_ = this;
 }
 
 void ViewAndroid::RemoveFromParent() {
   if (parent_)
     parent_->RemoveChild(this);
 }
 
+ViewAndroid::ScopedAnchorView ViewAndroid::AcquireAnchorView() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
+  if (delegate.is_null())
+      return ViewAndroid::ScopedAnchorView();

[Ted C, 2016/07/27 20:10:48]

-2 indent

[Jinsuk Kim, 2016/07/29 06:09:14]

Done.

+
+  return ViewAndroid::ScopedAnchorView(
+      env,
+      Java_ViewAndroidDelegate_acquireView(env, delegate.obj()),
+      delegate);
+}
+
+void ViewAndroid::SetAnchorRect(const JavaRef<jobject>& anchor,
+                                const gfx::RectF& bounds) {
+  if (bounds.IsEmpty()) return;

[Ted C, 2016/07/27 20:10:48]

return needs to go on the next line in c++

[Jinsuk Kim, 2016/07/29 06:09:14]

Done.

+
+  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
+  if (delegate.is_null())
+    return;
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  float scale = GetScaleFactorForNativeView(this);
+  int left_margin = std::round(bounds.x() * scale);
+  // TODO(jinsukkim): Move content_offset() to ViewAndroid, since it's
+  //                  specific to a given web contents/render widget.
+  float content_offset_y_pix = GetWindowAndroid()->content_offset().y();
+  int top_margin = std::round(content_offset_y_pix + bounds.y() * scale);
+  Java_ViewAndroidDelegate_setViewPosition(env,
+                                           delegate.obj(),
+                                           anchor.obj(),
+                                           bounds.x(),
+                                           bounds.y(),
+                                           bounds.width(),
+                                           bounds.height(),
+                                           scale,
+                                           left_margin,
+                                           top_margin);
+}
+
 void ViewAndroid::RemoveChild(ViewAndroid* child) {
   DCHECK(child);
   DCHECK_EQ(child->parent_, this);
 
   std::list<ViewAndroid*>::iterator it =
       std::find(children_.begin(), children_.end(), child);
   DCHECK(it != children_.end());
   children_.erase(it);
   child->parent_ = nullptr;
 }
 
 WindowAndroid* ViewAndroid::GetWindowAndroid() const {
   return parent_ ? parent_->GetWindowAndroid() : nullptr;
 }
 
-const JavaRef<jobject>& ViewAndroid::GetViewAndroidDelegate()
-    const {
+const JavaRef<jobject>& ViewAndroid::GetViewAndroidDelegate() const {
   if (!delegate_.is_null())
     return delegate_;
 
   return parent_ ? parent_->GetViewAndroidDelegate() : delegate_;
 }
 
 cc::Layer* ViewAndroid::GetLayer() const {
   return layer_.get();
 }
 
 void ViewAndroid::SetLayer(scoped_refptr<cc::Layer> layer) {
   layer_ = layer;
 }
 
 void ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext,
                                    const JavaRef<jobject>& jimage) {
-  WindowAndroid* window_android = GetWindowAndroid();
-  if (!window_android)
-    return;
-
-  window_android->StartDragAndDrop(GetViewAndroidDelegate(), jtext, jimage);
+  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
+  if (delegate.is_null())
+      return;

[Ted C, 2016/07/27 20:10:48]

-2 indent

[Jinsuk Kim, 2016/07/29 06:09:14]

Done.

+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_ViewAndroidDelegate_startDragAndDrop(env,
+                                            delegate.obj(),
+                                            jtext.obj(),
+                                            jimage.obj());
 }
 
 }  // namespace ui