Rename cc::ScrollNode's inner and outer viewport members

cc/trees/layer_tree_host_impl.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_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2582 matching lines @@
           !impl_scroll_node) {
         impl_scroll_node = scroll_node;
       }
     }
   }
 
   // Falling back to the viewport layer ensures generation of root overscroll
   // notifications. We use the viewport's main scroll layer to represent the
   // viewport in scrolling code.
   bool scrolls_inner_viewport =
-      impl_scroll_node && InnerViewportScrollLayer() &&
-      InnerViewportScrollLayer()->scroll_tree_index() == impl_scroll_node->id;
+      impl_scroll_node && impl_scroll_node->scrolls_inner_viewport;
   bool scrolls_outer_viewport =
-      impl_scroll_node && OuterViewportScrollLayer() &&
-      OuterViewportScrollLayer()->scroll_tree_index() == impl_scroll_node->id;
+      impl_scroll_node && impl_scroll_node->scrolls_outer_viewport;
   if (!impl_scroll_node || scrolls_inner_viewport || scrolls_outer_viewport) {
     if (auto* mainScrollLayer = viewport()->MainScrollLayer())
       impl_scroll_node = scroll_tree.Node(mainScrollLayer->scroll_tree_index());
     else
       impl_scroll_node = nullptr;
   }
 
   if (impl_scroll_node) {
     // Ensure that final layer scrolls on impl thread (crbug.com/625100)
     ScrollStatus status =
@@ skipping 423 matching lines @@
 
   bool scrolls_main_viewport_scroll_layer =
       viewport()->MainScrollLayer() &&
       viewport()->MainScrollLayer()->scroll_tree_index() == scroll_node->id;
 
   // This is needed if the scroll chains up to the viewport without going
   // through the outer viewport scroll node. This can happen if we scroll an
   // element that's not a descendant of the document.rootScroller. In that case
   // we want to scroll the inner viewport -- to allow panning while zoomed --
   // but also move browser controls if needed.
-  bool scrolls_inner_viewport_layer =
-      InnerViewportScrollLayer() &&
-      InnerViewportScrollLayer()->scroll_tree_index() == scroll_node->id;
+  bool scrolls_inner_viewport = scroll_node->scrolls_inner_viewport;
 
-  if (scrolls_main_viewport_scroll_layer || scrolls_inner_viewport_layer) {
+  if (scrolls_main_viewport_scroll_layer || scrolls_inner_viewport) {
     Viewport::ScrollResult result = viewport()->ScrollBy(
         delta, viewport_point, scroll_state->is_direct_manipulation(),
         !wheel_scrolling_, scrolls_main_viewport_scroll_layer);
 
     applied_delta = result.consumed_delta;
     delta_applied_to_content = result.content_scrolled_delta;
   } else {
     applied_delta = ScrollSingleNode(
         scroll_node, delta, viewport_point,
         scroll_state->is_direct_manipulation(),
         &scroll_state->layer_tree_impl()->property_trees()->scroll_tree);
   }
 
   // If the layer wasn't able to move, try the next one in the hierarchy.
   bool scrolled = std::abs(applied_delta.x()) > kEpsilon;
   scrolled = scrolled || std::abs(applied_delta.y()) > kEpsilon;
   if (!scrolled) {
     // TODO(bokan): This preserves existing behavior by not allowing tiny
     // scrolls to produce overscroll but is inconsistent in how delta gets
     // chained up. We need to clean this up.
     if (scrolls_main_viewport_scroll_layer)
       scroll_state->ConsumeDelta(applied_delta.x(), applied_delta.y());
     return;
   }
 
-  if (!scrolls_main_viewport_scroll_layer && !scrolls_inner_viewport_layer) {
+  if (!scrolls_main_viewport_scroll_layer && !scrolls_inner_viewport) {
     // If the applied delta is within 45 degrees of the input
     // delta, bail out to make it easier to scroll just one layer
     // in one direction without affecting any of its parents.
     float angle_threshold = 45;
     if (MathUtil::SmallestAngleBetweenVectors(applied_delta, delta) <
         angle_threshold) {
       applied_delta = delta;
     } else {
       // Allow further movement only on an axis perpendicular to the direction
       // in which the layer moved.
@@ skipping 1050 matching lines @@
       worker_context_visibility_ =
           worker_context->CacheController()->ClientBecameVisible();
     } else {
       worker_context->CacheController()->ClientBecameNotVisible(
           std::move(worker_context_visibility_));
     }
   }
 }
 
 }  // namespace cc