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

third_party/WebKit/Source/core/layout/HitTestResult.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
 */
 
 #ifndef HitTestResult_h
 #define HitTestResult_h
 
 #include "core/CoreExport.h"
 #include "core/editing/PositionWithAffinity.h"
+#include "core/layout/HitTestCanvasResult.h"
 #include "core/layout/HitTestLocation.h"
 #include "core/layout/HitTestRequest.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/heap/Handle.h"
 #include "platform/text/TextDirection.h"
 #include "wtf/Forward.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/RefPtr.h"
 #include "wtf/VectorTraits.h"
@@ skipping 73 matching lines @@
     const LayoutPoint& localPoint() const { return m_localPoint; }
     void setNodeAndPosition(Node* node, const LayoutPoint& p) { m_localPoint = p; setInnerNode(node); }
 
     PositionWithAffinity position() const;
     LayoutObject* layoutObject() const;
 
     void setToShadowHostIfInUserAgentShadowRoot();
 
     const HitTestLocation& hitTestLocation() const { return m_hitTestLocation; }
     const HitTestRequest& hitTestRequest() const { return m_hitTestRequest; }
+    HitTestCanvasResult* hitTestCanvasResult() const { return m_hitTestCanvasResult.get(); }
 
     void setInnerNode(Node*);
     HTMLAreaElement* imageAreaForImage() const;
     void setURLElement(Element*);
     void setScrollbar(Scrollbar*);
     void setIsOverWidget(bool b) { m_isOverWidget = b; }
+    void setHitCanvasRegion(HitTestCanvasResult*);
 
     bool isSelected() const;
     String title(TextDirection&) const;
     const AtomicString& altDisplayString() const;
     Image* image() const;
     IntRect imageRect() const;
     KURL absoluteImageURL() const;
     KURL absoluteMediaURL() const;
     KURL absoluteLinkURL() const;
     String textContent() const;
@@ skipping 22 matching lines @@
 
     // Collapse the rect-based test result into a single target at the specified location.
     void resolveRectBasedTest(Node* resolvedInnerNode, const LayoutPoint& resolvedPointInMainFrame);
 
 private:
     NodeSet& mutableListBasedTestResult(); // See above.
     HTMLMediaElement* mediaElement() const;
 
     HitTestLocation m_hitTestLocation;
     HitTestRequest m_hitTestRequest;
+    Member<HitTestCanvasResult> m_hitTestCanvasResult;
     bool m_cacheable;
 
     Member<Node> m_innerNode;
     Member<Node> m_innerPossiblyPseudoNode;
     // FIXME: Nothing changes this to a value different from m_hitTestLocation!
     LayoutPoint m_pointInInnerNodeFrame; // The hit-tested point in innerNode frame coordinates.
     LayoutPoint m_localPoint; // A point in the local coordinate space of m_innerNode's layoutObject. Allows us to efficiently
         // determine where inside the layoutObject we hit on subsequent operations.
     Member<Element> m_innerURLElement;
     Member<Scrollbar> m_scrollbar;
     bool m_isOverWidget; // Returns true if we are over a widget (and not in the border/padding area of a LayoutPart for example).
 
     mutable Member<NodeSet> m_listBasedTestResult;
 };
 
 } // namespace blink
 
 WTF_ALLOW_CLEAR_UNUSED_SLOTS_WITH_MEM_FUNCTIONS(blink::HitTestResult);
 
 #endif // HitTestResult_h