Refactor DocumentMarkerController

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 2578 matching lines @@
   return page && page->focusController().isActive();
 }
 
 void FrameView::invalidatePaintForTickmarks() {
   if (Scrollbar* scrollbar = verticalScrollbar())
     scrollbar->setNeedsPaintInvalidation(
         static_cast<ScrollbarPart>(~ThumbPart));
 }
 
 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const {
-  if (!m_tickmarks.isEmpty())
+  if (!m_tickmarks.isEmpty()) {

[Xiaocheng, 2017/03/21 03:59:44]

This change is irrelevant.

     tickmarks = m_tickmarks;
-  else
+  } else {
     tickmarks = frame().document()->markers().renderedRectsForMarkers(
         DocumentMarker::TextMatch);
+  }
 }
 
 void FrameView::setInputEventsTransformForEmulation(const IntSize& offset,
                                                     float contentScaleFactor) {
   m_inputEventsOffsetForEmulation = offset;
   m_inputEventsScaleFactorForEmulation = contentScaleFactor;
 }
 
 IntSize FrameView::inputEventsOffsetForEmulation() const {
   return m_inputEventsOffsetForEmulation;
@@ skipping 2647 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink