Refactor HitTestResult to store the HitTestRequest

Source/core/layout/HitTestResult.cpp

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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 29 matching lines @@
 #include "core/layout/LayoutTextFragment.h"
 #include "core/page/FrameTree.h"
 #include "core/svg/SVGElement.h"
 #include "platform/scroll/Scrollbar.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HitTestResult::HitTestResult()
-    : m_isOverWidget(false)
+    : m_hitTestRequest(HitTestRequest::ReadOnly | HitTestRequest::Active)
+    , m_isOverWidget(false)
 {
 }
 
-HitTestResult::HitTestResult(const LayoutPoint& point)
+HitTestResult::HitTestResult(const HitTestRequest& request, const LayoutPoint& point)
     : m_hitTestLocation(point)
+    , m_hitTestRequest(request)
     , m_pointInInnerNodeFrame(point)
     , m_isOverWidget(false)
 {
 }
 
-HitTestResult::HitTestResult(const LayoutPoint& centerPoint, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
+HitTestResult::HitTestResult(const HitTestRequest& request, const LayoutPoint& centerPoint, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
     : m_hitTestLocation(centerPoint, topPadding, rightPadding, bottomPadding, leftPadding)
+    , m_hitTestRequest(request)
     , m_pointInInnerNodeFrame(centerPoint)
     , m_isOverWidget(false)
 {
 }
 
-HitTestResult::HitTestResult(const HitTestLocation& other)
+HitTestResult::HitTestResult(const HitTestRequest& otherRequest, const HitTestLocation& other)
     : m_hitTestLocation(other)
+    , m_hitTestRequest(otherRequest)
     , m_pointInInnerNodeFrame(m_hitTestLocation.point())
     , m_isOverWidget(false)
 {
 }
 
 HitTestResult::HitTestResult(const HitTestResult& other)
     : m_hitTestLocation(other.m_hitTestLocation)
+    , m_hitTestRequest(other.m_hitTestRequest)
     , m_innerNode(other.innerNode())
     , m_innerPossiblyPseudoNode(other.m_innerPossiblyPseudoNode)
     , m_innerNonSharedNode(other.innerNonSharedNode())
     , m_pointInInnerNodeFrame(other.m_pointInInnerNodeFrame)
     , m_localPoint(other.localPoint())
     , m_innerURLElement(other.URLElement())
     , m_scrollbar(other.scrollbar())
     , m_isOverWidget(other.isOverWidget())
 {
     // Only copy the NodeSet in case of list hit test.
     m_listBasedTestResult = adoptPtrWillBeNoop(other.m_listBasedTestResult ? new NodeSet(*other.m_listBasedTestResult) : 0);
 }
 
 HitTestResult::~HitTestResult()
 {
 }
 
 HitTestResult& HitTestResult::operator=(const HitTestResult& other)
 {
     m_hitTestLocation = other.m_hitTestLocation;
+    m_hitTestRequest = other.m_hitTestRequest;
     m_innerNode = other.innerNode();
     m_innerPossiblyPseudoNode = other.innerPossiblyPseudoNode();
     m_innerNonSharedNode = other.innerNonSharedNode();
     m_pointInInnerNodeFrame = other.m_pointInInnerNodeFrame;
     m_localPoint = other.localPoint();
     m_innerURLElement = other.URLElement();
     m_scrollbar = other.scrollbar();
     m_isOverWidget = other.isOverWidget();
 
     // Only copy the NodeSet in case of list hit test.
@@ skipping 258 matching lines @@
         return !toHTMLTextAreaElement(*m_innerNonSharedNode).isDisabledOrReadOnly();
 
     if (isHTMLInputElement(*m_innerNonSharedNode)) {
         HTMLInputElement& inputElement = toHTMLInputElement(*m_innerNonSharedNode);
         return !inputElement.isDisabledOrReadOnly() && inputElement.isTextField();
     }
 
     return m_innerNonSharedNode->hasEditableStyle();
 }
 
-bool HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestRequest& request, const HitTestLocation& locationInContainer, const LayoutRect& rect)
+bool HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestLocation& locationInContainer, const LayoutRect& rect)
 {
     // If not a list-based test, this function should be a no-op.
-    if (!request.listBased()) {
-        ASSERT(!isRectBasedTest());
+    if (!hitTestRequest().listBased())
         return false;
-    }
 
     // If node is null, return true so the hit test can continue.
     if (!node)
         return true;
 
     mutableListBasedTestResult().add(node);
 
-    if (request.penetratingList())
+    if (hitTestRequest().penetratingList())
         return true;
 
     bool regionFilled = rect.contains(LayoutRect(locationInContainer.boundingBox()));
     return !regionFilled;
 }
 
-bool HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestRequest& request, const HitTestLocation& locationInContainer, const FloatRect& rect)
+bool HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestLocation& locationInContainer, const FloatRect& rect)
 {
     // If not a list-based test, this function should be a no-op.
-    if (!request.listBased()) {
-        ASSERT(!isRectBasedTest());
+    if (!hitTestRequest().listBased())
         return false;
-    }
 
     // If node is null, return true so the hit test can continue.
     if (!node)
         return true;
 
     mutableListBasedTestResult().add(node);
 
-    if (request.penetratingList())
+    if (hitTestRequest().penetratingList())
         return true;
 
     bool regionFilled = rect.contains(locationInContainer.boundingBox());
     return !regionFilled;
 }
 
-void HitTestResult::append(const HitTestResult& other, const HitTestRequest& request)
+void HitTestResult::append(const HitTestResult& other)
 {
-    ASSERT(request.listBased());
+    ASSERT(hitTestRequest().listBased());
 
     if (!m_scrollbar && other.scrollbar()) {
         setScrollbar(other.scrollbar());
     }
 
     if (!m_innerNode && other.innerNode()) {
         m_innerNode = other.innerNode();
         m_innerPossiblyPseudoNode = other.innerPossiblyPseudoNode();
         m_innerNonSharedNode = other.innerNonSharedNode();
         m_localPoint = other.localPoint();
@@ skipping 45 matching lines @@
 {
     for (Node* node = m_innerNode.get(); node; node = NodeRenderingTraversal::parent(*node)) {
         if (node->isElementNode())
             return toElement(node);
     }
 
     return 0;
 }
 
 } // namespace blink