Refactor HitTestResult to store the HitTestRequest

Source/core/layout/LayoutPart.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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
@@ skipping 117 matching lines @@
     return false;
 }
 
 bool LayoutPart::needsPreferredWidthsRecalculation() const
 {
     if (LayoutReplaced::needsPreferredWidthsRecalculation())
         return true;
     return embeddedContentBox();
 }
 
-bool LayoutPart::nodeAtPointOverWidget(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
+bool LayoutPart::nodeAtPointOverWidget(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
 {
     bool hadResult = result.innerNode();
-    bool inside = LayoutReplaced::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, action);
+    bool inside = LayoutReplaced::nodeAtPoint(result, locationInContainer, accumulatedOffset, action);
 
     // Check to see if we are really over the widget itself (and not just in the border/padding area).
     if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == node())
         result.setIsOverWidget(contentBoxRect().contains(result.localPoint()));
     return inside;
 }
 
-bool LayoutPart::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
+bool LayoutPart::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action)
 {
-    if (!widget() || !widget()->isFrameView() || !request.allowsChildFrameContent())
-        return nodeAtPointOverWidget(request, result, locationInContainer, accumulatedOffset, action);
+    if (!widget() || !widget()->isFrameView() || !result.hitTestRequest().allowsChildFrameContent())
+        return nodeAtPointOverWidget(result, locationInContainer, accumulatedOffset, action);
 
     FrameView* childFrameView = toFrameView(widget());
     LayoutView* childRoot = childFrameView->layoutView();
 
-    if (visibleToHitTestRequest(request) && childRoot) {
+    if (visibleToHitTestRequest(result.hitTestRequest()) && childRoot) {
         LayoutPoint adjustedLocation = accumulatedOffset + location();
         LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), borderTop() + paddingTop()) - LayoutSize(childFrameView->scrollOffset());
         HitTestLocation newHitTestLocation(locationInContainer, -adjustedLocation - contentOffset);
-        HitTestRequest newHitTestRequest(request.type() | HitTestRequest::ChildFrameHitTest);
-        HitTestResult childFrameResult(newHitTestLocation);
+        HitTestRequest newHitTestRequest(result.hitTestRequest().type() | HitTestRequest::ChildFrameHitTest);
+        HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation);
 
         bool isInsideChildFrame = childRoot->hitTest(newHitTestRequest, newHitTestLocation, childFrameResult);
 
-        if (request.listBased())
-            result.append(childFrameResult, request);
+        if (result.hitTestRequest().listBased())
+            result.append(childFrameResult);
         else if (isInsideChildFrame)
             result = childFrameResult;
 
         if (isInsideChildFrame)
             return true;
     }
 
-    return nodeAtPointOverWidget(request, result, locationInContainer, accumulatedOffset, action);
+    return nodeAtPointOverWidget(result, locationInContainer, accumulatedOffset, action);
 }
 
 CompositingReasons LayoutPart::additionalCompositingReasons() const
 {
     if (requiresAcceleratedCompositing())
         return CompositingReasonIFrame;
     return CompositingReasonNone;
 }
 
 void LayoutPart::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
@@ skipping 124 matching lines @@
     if (widget->frameRect() == newFrame)
         return false;
 
     RefPtrWillBeRawPtr<LayoutPart> protector(this);
     RefPtrWillBeRawPtr<Node> protectedNode(node());
     widget->setFrameRect(newFrame);
     return widget->frameRect().size() != newFrame.size();
 }
 
 }