Refactor HitTestResult to store the HitTestRequest

Source/core/layout/LayoutInline.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 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.
  *
@@ skipping 767 matching lines @@
 
 const char* LayoutInline::name() const
 {
     if (isRelPositioned())
         return "LayoutInline (relative positioned)";
     if (isAnonymous())
         return "LayoutInline (anonymous)";
     return "LayoutInline";
 }
 
-bool LayoutInline::nodeAtPoint(const HitTestRequest& request, HitTestResult& result,
+bool LayoutInline::nodeAtPoint(HitTestResult& result,
     const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
 {
-    return m_lineBoxes.hitTest(this, request, result, locationInContainer, accumulatedOffset, hitTestAction);
+    return m_lineBoxes.hitTest(this, result, locationInContainer, accumulatedOffset, hitTestAction);
 }
 
 namespace {
 
 class HitTestCulledInlinesGeneratorContext {
 public:
     HitTestCulledInlinesGeneratorContext(Region& region, const HitTestLocation& location) : m_intersected(false), m_region(region), m_location(location) { }
     void operator()(const FloatRect& rect)
     {
         m_intersected = m_intersected || m_location.intersects(rect);
         m_region.unite(enclosingIntRect(rect));
     }
     bool intersected() const { return m_intersected; }
 private:
     bool m_intersected;
     Region& m_region;
     const HitTestLocation& m_location;
 };
 
 } // unnamed namespace
 
-bool LayoutInline::hitTestCulledInline(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
+bool LayoutInline::hitTestCulledInline(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
 {
     ASSERT(result.isRectBasedTest() && !alwaysCreateLineBoxes());
-    if (!visibleToHitTestRequest(request))
+    if (!visibleToHitTestRequest(result.hitTestRequest()))
         return false;
 
     HitTestLocation tmpLocation(locationInContainer, -toLayoutSize(accumulatedOffset));
 
     Region regionResult;
     HitTestCulledInlinesGeneratorContext context(regionResult, tmpLocation);
     generateCulledLineBoxRects(context, this);
 
     if (context.intersected()) {
         updateHitTestResult(result, tmpLocation.point());
         // We can not use addNodeToListBasedTestResult to determine if we fully enclose the hit-test area
         // because it can only handle rectangular targets.
-        result.addNodeToListBasedTestResult(node(), request, locationInContainer);
+        result.addNodeToListBasedTestResult(node(), locationInContainer);
         return regionResult.contains(tmpLocation.boundingBox());
     }
     return false;
 }
 
 PositionWithAffinity LayoutInline::positionForPoint(const LayoutPoint& point)
 {
     // FIXME: Does not deal with relative positioned inlines (should it?)
     LayoutBlock* cb = containingBlock();
     if (firstLineBoxIncludingCulling()) {
@@ skipping 615 matching lines @@
 }
 
 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer) const
 {
     LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContainer);
     for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
         paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box);
 }
 
 } // namespace blink