add HitTestCanvasResult Class instend of std::pair<Element*, String>

third_party/WebKit/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 65 matching lines @@
     , m_hitTestRequest(otherRequest)
     , m_cacheable(true)
     , m_pointInInnerNodeFrame(m_hitTestLocation.point())
     , m_isOverWidget(false)
 {
 }
 
 HitTestResult::HitTestResult(const HitTestResult& other)
     : m_hitTestLocation(other.m_hitTestLocation)
     , m_hitTestRequest(other.m_hitTestRequest)
+    , m_hitTestCanvasResult(other.m_hitTestCanvasResult)
     , m_cacheable(other.m_cacheable)
     , m_innerNode(other.innerNode())
     , m_innerPossiblyPseudoNode(other.m_innerPossiblyPseudoNode)
     , 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 = other.m_listBasedTestResult ? new NodeSet(*other.m_listBasedTestResult) : nullptr;
 }
 
 HitTestResult::~HitTestResult()
 {
 }
 
 HitTestResult& HitTestResult::operator=(const HitTestResult& other)
 {
     m_hitTestLocation = other.m_hitTestLocation;
     m_hitTestRequest = other.m_hitTestRequest;
+    m_hitTestCanvasResult = other.m_hitTestCanvasResult;
     populateFromCachedResult(other);
 
     return *this;
 }
 
 bool HitTestResult::equalForCacheability(const HitTestResult& other) const
 {
     return m_hitTestRequest.equalForCacheability(other.m_hitTestRequest)
         && m_innerNode == other.innerNode()
         && m_innerPossiblyPseudoNode == other.innerPossiblyPseudoNode()
@@ skipping 25 matching lines @@
     m_listBasedTestResult = other.m_listBasedTestResult ? new NodeSet(*other.m_listBasedTestResult) : nullptr;
 }
 
 DEFINE_TRACE(HitTestResult)
 {
     visitor->trace(m_innerNode);
     visitor->trace(m_innerPossiblyPseudoNode);
     visitor->trace(m_innerURLElement);
     visitor->trace(m_scrollbar);
     visitor->trace(m_listBasedTestResult);
+    visitor->trace(m_hitTestCanvasResult);
 }
 
 PositionWithAffinity HitTestResult::position() const
 {
     if (!m_innerPossiblyPseudoNode)
         return PositionWithAffinity();
     LayoutObject* layoutObject = this->layoutObject();
     if (!layoutObject)
         return PositionWithAffinity();
     if (m_innerPossiblyPseudoNode->isPseudoElement() && m_innerPossiblyPseudoNode->getPseudoId() == PseudoIdBefore)
@@ skipping 54 matching lines @@
 void HitTestResult::setURLElement(Element* n)
 {
     m_innerURLElement = n;
 }
 
 void HitTestResult::setScrollbar(Scrollbar* s)
 {
     m_scrollbar = s;
 }
 
+void HitTestResult::setHitCanvasRegion(HitTestCanvasResult* n)

[zino, 2016/08/19 18:00:07]

You are saving HitTestCanvasResult to HitTestResult but it can't be used because
there is no getter.
Also, you are not using HitTestResult directly in this patch. So, You can remove
this?

[Hwanseung Lee, 2016/08/20 06:03:54]

Done.

+{
+    m_hitTestCanvasResult = n;
+}
+
 LocalFrame* HitTestResult::innerNodeFrame() const
 {
     if (m_innerNode)
         return m_innerNode->document().frame();
     return nullptr;
 }
 
 bool HitTestResult::isSelected() const
 {
     if (!m_innerNode)
@@ skipping 277 matching lines @@
     else if (isHTMLMapElement(m_innerNode))
         imageMapImageElement = toHTMLMapElement(m_innerNode)->imageElement();
 
     if (!imageMapImageElement)
         return m_innerNode.get();
 
     return imageMapImageElement;
 }
 
 } // namespace blink