Revert of Convert a few more CFI blacklist entries into DISABLE_CFI_PERF attributes.

third_party/WebKit/Source/core/paint/BlockPainter.cpp

 // Copyright 2014 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 "core/paint/BlockPainter.h"
 
 #include "core/editing/DragCaretController.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutFlexibleBox.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/api/LineLayoutBox.h"
 #include "core/page/Page.h"
 #include "core/paint/BlockFlowPainter.h"
 #include "core/paint/BoxClipper.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/ScrollRecorder.h"
 #include "core/paint/ScrollableAreaPainter.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/ClipRecorder.h"
 #include "wtf/Optional.h"
 
 namespace blink {
 
-DISABLE_CFI_PERF
 void BlockPainter::paint(const PaintInfo& paintInfo,
                          const LayoutPoint& paintOffset) {
   LayoutPoint adjustedPaintOffset = paintOffset + m_layoutBlock.location();
   if (!intersectsPaintRect(paintInfo, adjustedPaintOffset))
     return;
 
   PaintInfo localPaintInfo(paintInfo);
   PaintPhase originalPhase = localPaintInfo.phase;
 
   // There are some cases where not all clipped visual overflow is accounted
@@ skipping 115 matching lines @@
                 toLayoutBox(LineLayoutAPIShim::layoutObjectFrom(
                     inlineBox.getLineLayoutItem())),
                 childPoint);
   }
 
   ObjectPainter(
       *LineLayoutAPIShim::constLayoutObjectFrom(inlineBox.getLineLayoutItem()))
       .paintAllPhasesAtomically(paintInfo, childPoint);
 }
 
-DISABLE_CFI_PERF
 void BlockPainter::paintObject(const PaintInfo& paintInfo,
                                const LayoutPoint& paintOffset) {
   const PaintPhase paintPhase = paintInfo.phase;
 
   if (shouldPaintSelfBlockBackground(paintPhase)) {
     if (m_layoutBlock.style()->visibility() == EVisibility::Visible &&
         m_layoutBlock.hasBoxDecorationBackground())
       m_layoutBlock.paintBoxDecorationBackground(paintInfo, paintOffset);
     // We're done. We don't bother painting any children.
     if (paintPhase == PaintPhaseSelfBlockBackgroundOnly)
@@ skipping 79 matching lines @@
   LocalFrame* frame = m_layoutBlock.frame();
 
   if (m_layoutBlock.hasCursorCaret())
     frame->selection().paintCaret(paintInfo.context, paintOffset);
 
   if (m_layoutBlock.hasDragCaret())
     frame->page()->dragCaretController().paintDragCaret(
         frame, paintInfo.context, paintOffset);
 }
 
-DISABLE_CFI_PERF
 bool BlockPainter::intersectsPaintRect(
     const PaintInfo& paintInfo,
     const LayoutPoint& adjustedPaintOffset) const {
   LayoutRect overflowRect;
   if (paintInfo.isPrinting() && m_layoutBlock.isAnonymousBlock() &&
       m_layoutBlock.childrenInline()) {
     // For case <a href="..."><div>...</div></a>, when m_layoutBlock is the
     // anonymous container of <a>, the anonymous container's visual overflow is
     // empty, but we need to continue painting to output <a>'s PDF URL rect
     // which covers the continuations, as if we included <a>'s PDF URL rect into
@@ skipping 24 matching lines @@
 }
 
 void BlockPainter::paintContents(const PaintInfo& paintInfo,
                                  const LayoutPoint& paintOffset) {
   DCHECK(!m_layoutBlock.childrenInline());
   PaintInfo paintInfoForDescendants = paintInfo.forDescendants();
   m_layoutBlock.paintChildren(paintInfoForDescendants, paintOffset);
 }
 
 }  // namespace blink