Remove dip scale dependency from ui::WindowAndroid

content/browser/android/content_view_core_impl.cc

 // Copyright 2012 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 "content/browser/android/content_view_core_impl.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 197 matching lines @@
     jobject obj,
     WebContents* web_contents,
     const base::android::JavaRef<jobject>& view_android_delegate,
     ui::WindowAndroid* window_android,
     jobject java_bridge_retained_object_set)
     : WebContentsObserver(web_contents),
       java_ref_(env, obj),
       view_(view_android_delegate),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       page_scale_(1),
       dpi_scale_(ui::GetScaleFactorForNativeView(&view_)),

[no sievers, 2016/08/17 19:21:02]

so can this be removed now?

[Tima Vaisburd, 2016/08/17 19:28:38]

This CL only does a small cleanup wrt set_content_offset().

In the next CL which adds the method that sets |dpi_scale_| we can always set it
with the method instead of assigning initial value here and replacing it by
set_dpi_scale().

[boliu, 2016/08/17 19:32:38]

the question is can dpi_scale_ be removed, and the answer is no because
dpi_scale() is still called from a bunch of places

also just noticed the typo here, it should be dip, not dpi :p

       device_orientation_(0),
       accessibility_enabled_(false) {
   CHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
   DCHECK(window_android);
   DCHECK(!view_android_delegate.is_null());
   window_android->AddChild(&view_);
   view_.SetLayer(cc::Layer::Create());
   gfx::Size physical_size(
       Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
@@ skipping 191 matching lines @@
     const gfx::SizeF& viewport_size,
     const gfx::Vector2dF& controls_offset,
     const gfx::Vector2dF& content_offset,
     bool is_mobile_optimized_hint,
     const gfx::SelectionBound& selection_start) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null() || !view_.GetWindowAndroid())
     return;
 
-  view_.GetWindowAndroid()->set_content_offset(
-      gfx::ScaleVector2d(content_offset, dpi_scale_));
+  view_.GetWindowAndroid()->set_content_offset(content_offset);
 
   page_scale_ = page_scale_factor;
 
   // The CursorAnchorInfo API in Android only supports zero width selection
   // bounds.
   const jboolean has_insertion_marker =
       selection_start.type() == gfx::SelectionBound::CENTER;
   const jboolean is_insertion_marker_visible = selection_start.visible();
   const jfloat insertion_marker_horizontal =
       has_insertion_marker ? selection_start.edge_top().x() : 0.0f;
@@ skipping 1146 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content