Revert "Scale heights of BrowserControls in compositor by DSF"
This reverts commit 030794ca2b2e0ed6b16b2130c952a8adefa8222f.
Reason for revert: Caused lots of use-of-uninitialized-value errors on MSAN bot.
First failure: https://build.chromium.org/p/chromium.memory/builders/Linux%20ChromiumOS%20MSan%20Tests/builds/2902
Sample output:
[ RUN ] RenderWidgetHostTest.FrameToken_MultipleTokensThenMessages
==19305==WARNING: MemorySanitizer: use-of-uninitialized-value
#0 0xb7bc12c in content::RenderWidgetHostImpl::GetResizeParams(content::ResizeParams*) content/browser/renderer_host/render_widget_host_impl.cc:786:46
#1 0xb7bc693 in content::RenderWidgetHostImpl::WasResized() content/browser/renderer_host/render_widget_host_impl.cc:823:8
#2 0xb7a52d4 in content::RenderWidgetHostImpl::Init() content/browser/renderer_host/render_widget_host_impl.cc:559:3
#3 0x3c744e5 in content::(anonymous namespace)::RenderWidgetHostTest::SetUp() content/browser/renderer_host/render_widget_host_unittest.cc:628:12
.......
Original change's description:
> Scale heights of BrowserControls in compositor by DSF
>
> Bug: 737777
> Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I711e05e8747850041f2c799d3b482da34e7e520d
> Reviewed-on: https://chromium-review.googlesource.com/645906
> Commit-Queue: Jaebaek Seo <jaebaek@chromium.org>
> Reviewed-by: Alexandre Elias <aelias@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#500841}
TBR=aelias@chromium.org,jaebaek@chromium.org
Change-Id: Ib975068339c31ab51327c72d322f3f23dd7a0cbe
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 737777
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/659677
Reviewed-by: Ben Wells <benwells@chromium.org>
Commit-Queue: Ben Wells <benwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#500866}diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index e4328f6..3a33775 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2016,7 +2016,9 @@
// Adjust the viewport layers by shrinking/expanding the container to account
// for changes in the size (e.g. browser controls) since the last resize from
// Blink.
- gfx::Vector2dF amount_to_expand(0.f, delta_from_top_controls);
+ gfx::Vector2dF amount_to_expand(
+ 0.f,
+ delta_from_top_controls * active_tree_->painted_device_scale_factor());
inner_container->SetViewportBoundsDelta(amount_to_expand);
if (outer_container && !outer_container->BoundsForScrolling().IsEmpty()) {
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 05ed957..a25d09d 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -5092,6 +5092,40 @@
ASSERT_EQ(0, host_impl_->active_tree()->CurrentBrowserControlsShownRatio());
}
+TEST_F(LayerTreeHostImplBrowserControlsTest, ViewportBoundsUseZoomForDSF) {
+ SetupBrowserControlsAndScrollLayerWithVirtualViewport(
+ gfx::Size(50, 50), gfx::Size(100, 100), gfx::Size(100, 100));
+ DrawFrame();
+
+ LayerImpl* inner_container =
+ host_impl_->active_tree()->InnerViewportContainerLayer();
+
+ gfx::Vector2dF scroll_delta(0.f, 10.f);
+ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD,
+ host_impl_
+ ->ScrollBegin(BeginState(gfx::Point()).get(),
+ InputHandler::TOUCHSCREEN)
+ .thread);
+ host_impl_->ScrollBy(UpdateState(gfx::Point(), scroll_delta).get());
+
+ gfx::Vector2dF bounds_delta = inner_container->ViewportBoundsDelta();
+ host_impl_->active_tree()->SetCurrentBrowserControlsShownRatio(1.f);
+ host_impl_->ScrollEnd(EndState().get());
+
+ float device_scale = 3.5f;
+ host_impl_->active_tree()->set_painted_device_scale_factor(device_scale);
+
+ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD,
+ host_impl_
+ ->ScrollBegin(BeginState(gfx::Point()).get(),
+ InputHandler::TOUCHSCREEN)
+ .thread);
+ host_impl_->ScrollBy(UpdateState(gfx::Point(), scroll_delta).get());
+
+ bounds_delta.Scale(device_scale);
+ EXPECT_EQ(bounds_delta, inner_container->ViewportBoundsDelta());
+}
+
// Test that if only the browser controls are scrolled, we shouldn't request a
// commit.
TEST_F(LayerTreeHostImplBrowserControlsTest, BrowserControlsDontTriggerCommit) {
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 1046e8e..0180d75 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -755,14 +755,9 @@
// ScaleToCeiledSize(new_size, device_scale_factor) ??
resize_params->physical_backing_size = view_->GetPhysicalBackingSize();
resize_params->top_controls_height = view_->GetTopControlsHeight();
- resize_params->bottom_controls_height = view_->GetBottomControlsHeight();
- if (IsUseZoomForDSFEnabled()) {
- float device_scale = resize_params->screen_info.device_scale_factor;
- resize_params->top_controls_height *= device_scale;
- resize_params->bottom_controls_height *= device_scale;
- }
resize_params->browser_controls_shrink_blink_size =
view_->DoBrowserControlsShrinkBlinkSize();
+ resize_params->bottom_controls_height = view_->GetBottomControlsHeight();
resize_params->visible_viewport_size = view_->GetVisibleViewportSize();
viz::LocalSurfaceId local_surface_id = view_->GetLocalSurfaceId();
if (local_surface_id.is_valid())
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 67569f2..fa6a10a 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -308,14 +308,6 @@
bounds_ = bounds;
}
- void set_top_controls_height(float top_controls_height) {
- top_controls_height_ = top_controls_height;
- }
-
- void set_bottom_controls_height(float bottom_controls_height) {
- bottom_controls_height_ = bottom_controls_height;
- }
-
const WebTouchEvent& acked_event() const { return acked_event_; }
int acked_event_count() const { return acked_event_count_; }
void ClearAckedEvent() {
@@ -342,10 +334,6 @@
// RenderWidgetHostView override.
gfx::Rect GetViewBounds() const override { return bounds_; }
- float GetTopControlsHeight() const override { return top_controls_height_; }
- float GetBottomControlsHeight() const override {
- return bottom_controls_height_;
- }
void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
InputEventAckState ack_result) override {
acked_event_ = touch.event;
@@ -379,8 +367,6 @@
bool use_fake_physical_backing_size_;
gfx::Size mock_physical_backing_size_;
InputEventAckState ack_result_;
- float top_controls_height_;
- float bottom_controls_height_;
private:
DISALLOW_COPY_AND_ASSIGN(TestView);
@@ -2590,33 +2576,6 @@
EXPECT_EQ(physical_backing_size, resize_params.physical_backing_size);
}
-TEST_F(RenderWidgetHostTest, ResizeParamsDeviceScale) {
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- command_line->AppendSwitchASCII(switches::kEnableUseZoomForDSF, "true");
-
- float device_scale = 3.5f;
- ScreenInfo screen_info;
- screen_info.device_scale_factor = device_scale;
-
- auto* host_delegate =
- static_cast<MockRenderWidgetHostDelegate*>(host_->delegate());
-
- host_delegate->SetScreenInfo(screen_info);
- host_->WasResized();
-
- float top_controls_height = 10.0f;
- float bottom_controls_height = 20.0f;
- view_->set_top_controls_height(top_controls_height);
- view_->set_bottom_controls_height(bottom_controls_height);
-
- ResizeParams resize_params;
- host_->GetResizeParams(&resize_params);
- EXPECT_EQ(top_controls_height * device_scale,
- resize_params.top_controls_height);
- EXPECT_EQ(bottom_controls_height * device_scale,
- resize_params.bottom_controls_height);
-}
-
// Make sure no dragging occurs after renderer exited. See crbug.com/704832.
TEST_F(RenderWidgetHostTest, RendererExitedNoDrag) {
host_->SetView(new TestView(host_.get()));
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 94f9afb3..0997df88 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -64,7 +64,6 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_input_event_router.h"
#include "content/browser/renderer_host/ui_events_helper.h"
-#include "content/common/content_switches_internal.h"
#include "content/common/gpu_stream_constants.h"
#include "content/common/input_messages.h"
#include "content/common/site_isolation_policy.h"
@@ -1489,7 +1488,7 @@
bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata);
gesture_provider_.SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
- float dip_scale = IsUseZoomForDSFEnabled() ? 1.f : view_.GetDipScale();
+ float dip_scale = view_.GetDipScale();
float top_controls_pix = frame_metadata.top_controls_height * dip_scale;
float top_content_offset = frame_metadata.top_controls_height *
frame_metadata.top_controls_shown_ratio;
