Move content offset to ViewAndroid

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"
@@ skipping 122 matching lines @@
 void ViewAndroid::SetAnchorRect(const JavaRef<jobject>& anchor,
                                 const gfx::RectF& bounds) {
   ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
   if (delegate.is_null())
     return;
 
   float scale = display::Screen::GetScreen()
       ->GetDisplayNearestWindow(this)
       .device_scale_factor();
   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.
-  int top_margin = std::round(
-      (GetWindowAndroid()->content_offset().y() + bounds.y()) * scale);
+  int top_margin = std::round((content_offset().y() + bounds.y()) * scale);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ViewAndroidDelegate_setViewPosition(
       env, delegate, anchor, 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);
 
@@ skipping 109 matching lines @@
                                   int height) {
   ViewAndroid* view_android = reinterpret_cast<ViewAndroid*>(native_view);
   view_android->OnPhysicalBackingSizeChanged(width, height);
 }
 
 bool RegisterViewRoot(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace ui