Made layout viewport scroll updates from compositor work like ordinary layers.

cc/trees/layer_tree_host.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1040 matching lines @@
   base::AutoReset<bool> painting(&in_paint_layer_contents_, true);
   bool did_paint_content = false;
   for (const auto& layer : update_layer_list) {
     did_paint_content |= layer->Update();
     content_is_suitable_for_gpu_rasterization_ &=
         layer->IsSuitableForGpuRasterization();
   }
   return did_paint_content;
 }
 
+void LayerTreeHost::ApplyViewportDeltas(ScrollAndScaleSet* info) {
+  gfx::Vector2dF inner_viewport_scroll_delta;
+  if (info->inner_viewport_scroll.layer_id != Layer::INVALID_ID)
+    inner_viewport_scroll_delta = info->inner_viewport_scroll.scroll_delta;
+
+  if (inner_viewport_scroll_delta.IsZero() && info->page_scale_delta == 1.f &&
+      info->elastic_overscroll_delta.IsZero() && !info->top_controls_delta)
+    return;
+
+  // Preemptively apply the scroll offset and scale delta here before sending
+  // it to the client.  If the client comes back and sets it to the same
+  // value, then the layer can early out without needing a full commit.
+  if (inner_viewport_scroll_layer_.get()) {
+    inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide(
+        gfx::ScrollOffsetWithDelta(
+            inner_viewport_scroll_layer_->scroll_offset(),
+            inner_viewport_scroll_delta));
+  }
+
+  ApplyPageScaleDeltaFromImplSide(info->page_scale_delta);
+  elastic_overscroll_ += info->elastic_overscroll_delta;
+  // TODO(ccameron): pass the elastic overscroll here so that input events
+  // may be translated appropriately.
+  client_->ApplyViewportDeltas(inner_viewport_scroll_delta, gfx::Vector2dF(),
+                               info->elastic_overscroll_delta,
+                               info->page_scale_delta,
+                               info->top_controls_delta);
+  SetNeedsUpdateLayers();
+}
+
 void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) {
   for (auto& swap_promise : info->swap_promises) {
     TRACE_EVENT_WITH_FLOW1("input,benchmark",
                            "LatencyInfo.Flow",
                            TRACE_ID_DONT_MANGLE(swap_promise->TraceId()),
                            TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT,
                            "step", "Main thread scroll update");
     QueueSwapPromise(std::move(swap_promise));
   }
 
-  gfx::Vector2dF inner_viewport_scroll_delta;
-  gfx::Vector2dF outer_viewport_scroll_delta;
-
   if (root_layer_.get()) {
     for (size_t i = 0; i < info->scrolls.size(); ++i) {
       Layer* layer = LayerById(info->scrolls[i].layer_id);
       if (!layer)
         continue;
-      if (layer == outer_viewport_scroll_layer_.get()) {
-        outer_viewport_scroll_delta += info->scrolls[i].scroll_delta;
-      } else if (layer == inner_viewport_scroll_layer_.get()) {
-        inner_viewport_scroll_delta += info->scrolls[i].scroll_delta;
-      } else {
-        layer->SetScrollOffsetFromImplSide(
-            gfx::ScrollOffsetWithDelta(layer->scroll_offset(),
-                                       info->scrolls[i].scroll_delta));
-      }
+      layer->SetScrollOffsetFromImplSide(gfx::ScrollOffsetWithDelta(
+          layer->scroll_offset(), info->scrolls[i].scroll_delta));
       SetNeedsUpdateLayers();
     }
   }
 
-  if (!inner_viewport_scroll_delta.IsZero() ||
-      !outer_viewport_scroll_delta.IsZero() || info->page_scale_delta != 1.f ||
-      !info->elastic_overscroll_delta.IsZero() || info->top_controls_delta) {
-    // Preemptively apply the scroll offset and scale delta here before sending
-    // it to the client.  If the client comes back and sets it to the same
-    // value, then the layer can early out without needing a full commit.
-    if (inner_viewport_scroll_layer_.get()) {
-      inner_viewport_scroll_layer_->SetScrollOffsetFromImplSide(
-          gfx::ScrollOffsetWithDelta(
-              inner_viewport_scroll_layer_->scroll_offset(),
-              inner_viewport_scroll_delta));
-    }
-
-    if (outer_viewport_scroll_layer_.get()) {
-      outer_viewport_scroll_layer_->SetScrollOffsetFromImplSide(
-          gfx::ScrollOffsetWithDelta(
-              outer_viewport_scroll_layer_->scroll_offset(),
-              outer_viewport_scroll_delta));
-    }
-
-    ApplyPageScaleDeltaFromImplSide(info->page_scale_delta);
-    elastic_overscroll_ += info->elastic_overscroll_delta;
-    // TODO(ccameron): pass the elastic overscroll here so that input events
-    // may be translated appropriately.
-    client_->ApplyViewportDeltas(
-        inner_viewport_scroll_delta, outer_viewport_scroll_delta,
-        info->elastic_overscroll_delta, info->page_scale_delta,
-        info->top_controls_delta);
-    SetNeedsUpdateLayers();
-  }
+  // This needs to happen after scroll deltas have been sent to prevent top
+  // controls from clamping the layout viewport both on the compositor and
+  // on the main thread.
+  ApplyViewportDeltas(info);
 }
 
 void LayerTreeHost::SetDeviceScaleFactor(float device_scale_factor) {
   if (device_scale_factor == device_scale_factor_)
     return;
   device_scale_factor_ = device_scale_factor;
 
   property_trees_.needs_rebuild = true;
   SetNeedsCommit();
 }
@@ skipping 555 matching lines @@
   int seq_num = property_trees_.sequence_number;
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) {
     layer->set_property_tree_sequence_number(seq_num);
   });
 
   surface_id_namespace_ = proto.surface_id_namespace();
   next_surface_sequence_ = proto.next_surface_sequence();
 }
 
 }  // namespace cc