Fix main thread top controls scrolling to mirror CC.

content/renderer/render_view_impl.cc

 // Copyright (c) 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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 609 matching lines @@
       page_id_(-1),
       next_page_id_(params.next_page_id),
       history_list_offset_(-1),
       history_list_length_(0),
       frames_in_progress_(0),
       target_url_status_(TARGET_NONE),
       uses_temporary_zoom_level_(false),
 #if defined(OS_ANDROID)
       top_controls_constraints_(TOP_CONTROLS_STATE_BOTH),
 #endif
+      top_controls_shrink_blink_size_(false),
+      top_controls_height_(0.f),
       has_focus_(false),
       has_scrolled_focused_editable_node_into_rect_(false),
       main_render_frame_(nullptr),
       frame_widget_(nullptr),
       speech_recognition_dispatcher_(NULL),
       mouse_lock_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       expected_content_intent_id_(0),
 #endif
 #if defined(ENABLE_PLUGINS)
@@ skipping 1968 matching lines @@
                                   params.new_size.height()));
     }
     if (display_mode_ != params.display_mode) {
       display_mode_ = params.display_mode;
       webview()->setDisplayMode(display_mode_);
     }
   }
 
   gfx::Size old_visible_viewport_size = visible_viewport_size_;
 
+  if (top_controls_height_ || params.top_controls_height) {
+    // When top controls are present, we need to resize the Blink widget and
+    // change the top controls height at the same time to prevent the viewport
+    // from changing scroll offset due to a clamp in between the two operations.
+    top_controls_shrink_blink_size_ = params.top_controls_shrink_blink_size;
+    top_controls_height_ = params.top_controls_height;
+    gfx::Size new_view_size = params.new_size;
+    if (IsUseZoomForDSFEnabled()) {
+      new_view_size = gfx::ScaleToCeiledSize(new_view_size,
+                                             GetOriginalDeviceScaleFactor());
+    }
+    webview()->resizeWithTopControls(new_view_size,

[no sievers, 2016/04/08 19:26:02]

webview() is null-checked everywhere else in OnResize() here and in
RenderWidget::OnResize() also.

[bokan, 2016/04/11 19:54:15]

This is gone now in addressing the comment below.

+                                     top_controls_height_,

[no sievers, 2016/04/08 19:26:02]

I find it slightly weird that we end up calling resize() twice effectively here,
even if it doesn't do anything the second time.

In fact, I'm wondering if it can cause subtle bugs because when we go through
the rest of the code there is a certain order assumed for things to happen, but
here for Android we now actually resize the widget first.

When exactly (or from which call site) do you want this not to happen i.e. why
did you have to move it?

[bokan, 2016/04/11 19:54:15]

I moved it since we didn't want this method to exist on WebWidget since it makes
no sense there. Thus, we need access to the WebView rather than WebWidget.

You're right though we're subtly changing the order here. I've rearranged this
so that RenderViewImpl overrides a ResizeWebWidget method that gets called from
RenderWidget::Resize in the same place as before. This should be less of a
change.

+                                     top_controls_shrink_blink_size_);
+  }
+
   RenderWidget::OnResize(params);
 
   if (old_visible_viewport_size != visible_viewport_size_)
     has_scrolled_focused_editable_node_into_rect_ = false;
 }
 
 void RenderViewImpl::RenderWidgetDidCommitAndDrawCompositorFrame() {
 #if defined(ENABLE_PLUGINS)
   // Notify all instances that we painted.  The same caveats apply as for
   // ViewFlushedPaint regarding instances closing themselves, so we take
@@ skipping 695 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 }  // namespace content