Revert "Oilpan: fix build after r197063, move HitTestCache to the heap."

Source/core/layout/LayoutView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 46 matching lines @@
     , m_selectionEnd(nullptr)
     , m_selectionStartPos(-1)
     , m_selectionEndPos(-1)
     , m_pageLogicalHeight(0)
     , m_pageLogicalHeightChanged(false)
     , m_layoutState(nullptr)
     , m_layoutQuoteHead(nullptr)
     , m_layoutCounterCount(0)
     , m_hitTestCount(0)
     , m_hitTestCacheHits(0)
-    , m_hitTestCache(HitTestCache::create())
     , m_pendingSelection(PendingSelection::create())
 {
     // init LayoutObject attributes
     setInline(false);
 
     m_minPreferredLogicalWidth = 0;
     m_maxPreferredLogicalWidth = 0;
 
     setPreferredLogicalWidthsDirty(MarkOnlyThis);
 
@@ skipping 14 matching lines @@
     // We have to recursively update layout/style here because otherwise, when the hit test recurses
     // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer
     // that are higher up in the call stack, leading to crashes.
     // Note that Document::updateLayout calls its parent's updateLayout.
     // FIXME: It should be the caller's responsibility to ensure an up-to-date layout.
     frameView()->updateLayoutAndStyleForPainting();
     commitPendingSelection();
 
     uint64_t domTreeVersion = document().domTreeVersion();
     HitTestResult cacheResult = result;
-    bool cacheHit = m_hitTestCache->lookupCachedResult(cacheResult, domTreeVersion);
+    bool cacheHit = m_hitTestCache.lookupCachedResult(cacheResult, domTreeVersion);
     bool hitLayer = layer()->hitTest(result);
 
     // FrameView scrollbars are not the same as Layer scrollbars tested by Layer::hitTestOverflowControls,
     // so we need to test FrameView scrollbars separately here. Note that it's important we do this after
     // the hit test above, because that may overwrite the entire HitTestResult when it finds a hit.
     IntPoint framePoint = frameView()->contentsToFrame(result.hitTestLocation().roundedPoint());
     if (Scrollbar* frameScrollbar = frameView()->scrollbarAtFramePoint(framePoint))
         result.setScrollbar(frameScrollbar);
 
     if (cacheHit) {
         m_hitTestCacheHits++;
-        m_hitTestCache->verifyCachedResult(result, cacheResult);
+        m_hitTestCache.verifyCachedResult(result, cacheResult);
     }
 
     if (hitLayer) {
-        m_hitTestCache->addCachedResult(result, domTreeVersion);
+        m_hitTestCache.addCachedResult(result, domTreeVersion);
 
         if (layer()->graphicsLayerBacking()) {
             layer()->graphicsLayerBacking()->platformLayer()->setHitTestCacheRect(enclosingIntRect(result.validityRect()));
         }
     }
 
     TRACE_EVENT_END1("blink,devtools.timeline", "HitTest", "endData", InspectorHitTestEvent::endData(result.hitTestRequest(), result.hitTestLocation(), result));
     return hitLayer;
 }
 
@@ skipping 835 matching lines @@
     return viewHeight(IncludeScrollbars) / scale;
 }
 
 void LayoutView::willBeDestroyed()
 {
     LayoutBlockFlow::willBeDestroyed();
     m_compositor.clear();
 }
 
 } // namespace blink