Rename ScrollType helper and combine some redundant checks.

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 4092 matching lines @@
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     // Don't scroll the FrameView!
     ASSERT_NOT_REACHED();
   }
 
   scroll_offset_ = offset;
 
   if (!ScrollbarsSuppressed())
     pending_scroll_delta_ += scroll_delta;
 
-  if (ScrollTypeClearsFragmentAnchor(scroll_type))
-    ClearFragmentAnchor();
   UpdateLayersAndCompositingAfterScrollIfNeeded();
 
   Document* document = frame_->GetDocument();
   document->EnqueueScrollEventForNode(document);
 
   frame_->GetEventHandler().DispatchFakeMouseMoveEventSoon();
   if (scroll_type == kUserScroll || scroll_type == kCompositorScroll) {
     Page* page = GetFrame().GetPage();
     if (page)
       page->GetChromeClient().ClearToolTip(*frame_);
@@ skipping 13 matching lines @@
     cache->HandleScrollPositionChanged(this);
 
   GetFrame().Loader().SaveScrollState();
   DidChangeScrollOffset();
 
   if (scroll_type == kCompositorScroll && frame_->IsMainFrame()) {
     if (DocumentLoader* document_loader = frame_->Loader().GetDocumentLoader())
       document_loader->GetInitialScrollState().was_scrolled_by_user = true;
   }
 
-  if (scroll_type != kAnchoringScroll && scroll_type != kClampingScroll)
+  if (IsExplicitScrollType(scroll_type)) {
+    ClearFragmentAnchor();
     ClearScrollAnchor();
+  }
 }
 
 void FrameView::DidChangeScrollOffset() {
   GetFrame().Loader().Client()->DidChangeScrollOffset();
   if (GetFrame().IsMainFrame())
     GetFrame().GetPage()->GetChromeClient().MainFrameScrollOffsetChanged();
 }
 
 void FrameView::ClearScrollAnchor() {
   if (!RuntimeEnabledFeatures::scrollAnchoringEnabled())
@@ skipping 1214 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