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

third_party/WebKit/Source/platform/graphics/paint/PaintController.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 "platform/graphics/paint/PaintController.h"
 
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/tracing/TraceEvent.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
@@ skipping 447 matching lines @@
            m_currentPaintArtifact.getDisplayItemList().size());
     cachedItem = &m_currentPaintArtifact.getDisplayItemList()[cachedItemIndex];
   }
 
   if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
     m_underInvalidationCheckingEnd = cachedItemIndex;
     DCHECK(isCheckingUnderInvalidation());
   }
 }
 
-DISABLE_CFI_PERF
 static IntRect visualRectForDisplayItem(
     const DisplayItem& displayItem,
     const LayoutSize& offsetFromLayoutObject) {
   LayoutRect visualRect = displayItem.client().visualRect();
   visualRect.move(-offsetFromLayoutObject);
   return enclosingIntRect(visualRect);
 }
 
 void PaintController::resetCurrentListIndices() {
   m_nextItemToMatch = 0;
   m_nextItemToIndex = 0;
   m_nextChunkToMatch = 0;
   m_underInvalidationCheckingBegin = 0;
   m_underInvalidationCheckingEnd = 0;
   m_skippedProbableUnderInvalidationCount = 0;
 }
 
-DISABLE_CFI_PERF
 void PaintController::commitNewDisplayItems(
     const LayoutSize& offsetFromLayoutObject) {
   TRACE_EVENT2("blink,benchmark", "PaintController::commitNewDisplayItems",
                "current_display_list_size",
                (int)m_currentPaintArtifact.getDisplayItemList().size(),
                "num_non_cached_new_items",
                (int)m_newDisplayItemList.size() - m_numCachedNewItems);
   m_numCachedNewItems = 0;
 
   // These data structures are used during painting only.
@@ skipping 390 matching lines @@
                    m_currentPaintArtifact.getDisplayItemList(), showPictures)
                    .utf8()
                    .data());
   WTFLogAlways("new display item list: [%s]\n",
                displayItemListAsDebugString(m_newDisplayItemList, showPictures)
                    .utf8()
                    .data());
 }
 
 }  // namespace blink