Kill ScrollbarModesCalculationStrategy.

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 743 matching lines @@
     if (overflow_y == EOverflow::kHidden)
       v_mode = kScrollbarAlwaysOff;
   }
 
   if (overflow_x == EOverflow::kScroll)
     h_mode = kScrollbarAlwaysOn;
   if (overflow_y == EOverflow::kScroll)
     v_mode = kScrollbarAlwaysOn;
 }
 
-void FrameView::CalculateScrollbarModes(
-    ScrollbarMode& h_mode,
-    ScrollbarMode& v_mode,
-    ScrollbarModesCalculationStrategy strategy) const {
+void FrameView::CalculateScrollbarModes(ScrollbarMode& h_mode,
+                                        ScrollbarMode& v_mode) const {
 #define RETURN_SCROLLBAR_MODE(mode) \
   {                                 \
     h_mode = v_mode = mode;         \
     return;                         \
   }
 
   // Setting scrolling="no" on an iframe element disables scrolling.
   if (frame_->Owner() &&
       frame_->Owner()->ScrollingMode() == kScrollbarAlwaysOff)
     RETURN_SCROLLBAR_MODE(kScrollbarAlwaysOff);
 
   // Framesets can't scroll.
   Node* body = frame_->GetDocument()->body();
   if (isHTMLFrameSetElement(body) && body->GetLayoutObject())
     RETURN_SCROLLBAR_MODE(kScrollbarAlwaysOff);
 
   // Scrollbars can be disabled by FrameView::setCanHaveScrollbars.
-  if (!can_have_scrollbars_ && strategy != kRulesFromWebContentOnly)
+  if (!can_have_scrollbars_)
     RETURN_SCROLLBAR_MODE(kScrollbarAlwaysOff);
 
   // This will be the LayoutObject for either the body element or the html
   // element (see Document::viewportDefiningElement).
   LayoutObject* viewport = ViewportLayoutObject();
   if (!viewport || !viewport->Style())
     RETURN_SCROLLBAR_MODE(kScrollbarAuto);
 
   if (viewport->IsSVGRoot()) {
     // Don't allow overflow to affect <img> and css backgrounds
@@ skipping 1930 matching lines @@
   // Covers #2.
   // FIXME: Do we need to fix this for OOPI?
   HTMLFrameOwnerElement* owner = frame_->DeprecatedLocalOwner();
   if (owner && (!owner->GetLayoutObject() ||
                 !owner->GetLayoutObject()->VisibleToHitTesting()))
     return kNotScrollableNotVisible;
 
   // Cover #3 and #4.
   ScrollbarMode horizontal_mode;
   ScrollbarMode vertical_mode;
-  CalculateScrollbarModes(horizontal_mode, vertical_mode,
-                          kRulesFromWebContentOnly);
+  CalculateScrollbarModes(horizontal_mode, vertical_mode);
   if (horizontal_mode == kScrollbarAlwaysOff &&
       vertical_mode == kScrollbarAlwaysOff)
     return kNotScrollableExplicitlyDisabled;
 
   return kScrollable;
 }
 
 void FrameView::UpdateParentScrollableAreaSet() {
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     return;
@@ skipping 2641 matching lines @@
 void FrameView::SetAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   animation_host_ = std::move(host);
 }
 
 LayoutUnit FrameView::CaretWidth() const {
   return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
 }
 
 }  // namespace blink