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

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

 // Copyright 2016 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/ObjectPaintInvalidator.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/LayoutView.h"
@@ skipping 416 matching lines @@
                                   invalidationRect, reason);
 
     if (invalidationRect.contains(newBounds))
       return;
   }
 
   invalidatePaintUsingContainer(*m_context.paintInvalidationContainer,
                                 newBounds, reason);
 }
 
-DISABLE_CFI_PERF
 PaintInvalidationReason
 ObjectPaintInvalidatorWithContext::computePaintInvalidationReason() {
   // This is before any early return to ensure the background obscuration status
   // is saved.
   bool backgroundObscurationChanged = false;
   bool backgroundObscured = m_object.backgroundIsKnownToBeObscured();
   if (backgroundObscured != m_object.previousBackgroundObscured()) {
     m_object.getMutableForPainting().setPreviousBackgroundObscured(
         backgroundObscured);
     backgroundObscurationChanged = true;
@@ skipping 50 matching lines @@
   // before us in the tree.
   if (m_context.newBounds.location() != m_context.oldBounds.location())
     return PaintInvalidationBoundsChange;
 
   if (locationChanged)
     return PaintInvalidationLocationChange;
 
   return PaintInvalidationIncremental;
 }
 
-DISABLE_CFI_PERF
 void ObjectPaintInvalidatorWithContext::invalidateSelectionIfNeeded(
     PaintInvalidationReason reason) {
   // Update selection rect when we are doing full invalidation (in case that the
   // object is moved, composite status changed, etc.) or
   // shouldInvalidationSelection is set (in case that the selection itself
   // changed).
   bool fullInvalidation = isImmediateFullPaintInvalidationReason(reason);
   if (!fullInvalidation && !m_object.shouldInvalidateSelection())
     return;
 
   LayoutRect oldSelectionRect = selectionPaintInvalidationMap().get(&m_object);
   LayoutRect newSelectionRect = m_object.localSelectionRect();
   if (!newSelectionRect.isEmpty()) {
     m_context.mapLocalRectToPaintInvalidationBacking(m_object,
                                                      newSelectionRect);
     newSelectionRect.move(m_object.scrollAdjustmentForPaintInvalidation(
         *m_context.paintInvalidationContainer));
   }
 
   setPreviousSelectionPaintInvalidationRect(m_object, newSelectionRect);
 
   if (!fullInvalidation) {
     fullyInvalidatePaint(PaintInvalidationSelection, oldSelectionRect,
                          newSelectionRect);
     m_context.paintingLayer->setNeedsRepaint();
     m_object.invalidateDisplayItemClients(PaintInvalidationSelection);
   }
 }
 
-DISABLE_CFI_PERF
 PaintInvalidationReason
 ObjectPaintInvalidatorWithContext::invalidatePaintIfNeededWithComputedReason(
     PaintInvalidationReason reason) {
   // We need to invalidate the selection before checking for whether we are
   // doing a full invalidation.  This is because we need to update the previous
   // selection rect regardless.
   invalidateSelectionIfNeeded(reason);
 
   if (reason == PaintInvalidationIncremental && !incrementallyInvalidatePaint())
     reason = PaintInvalidationNone;
@@ skipping 23 matching lines @@
 
   m_context.paintingLayer->setNeedsRepaint();
   m_object.invalidateDisplayItemClients(reason);
   return reason;
 }
 
 DisablePaintInvalidationStateAsserts::DisablePaintInvalidationStateAsserts()
     : m_disabler(&gDisablePaintInvalidationStateAsserts, true) {}
 
 }  // namespace blink