Index: Source/core/page/TouchAdjustment.cpp |
diff --git a/Source/core/page/TouchAdjustment.cpp b/Source/core/page/TouchAdjustment.cpp |
index c1e1aaea2a1cf76232ab9aac9e8c9e47fe91505f..89d396a8a24728abd57ca06c9864f777bcdc1655 100644 |
--- a/Source/core/page/TouchAdjustment.cpp |
+++ b/Source/core/page/TouchAdjustment.cpp |
@@ -46,22 +46,34 @@ const float zeroTolerance = 1e-6f; |
// Class for remembering absolute quads of a target node and what node they represent. |
class SubtargetGeometry { |
+ ALLOW_ONLY_INLINE_ALLOCATION(); |
public: |
SubtargetGeometry(Node* node, const FloatQuad& quad) |
: m_node(node) |
, m_quad(quad) |
{ } |
+ void trace(Visitor* visitor) { visitor->trace(m_node); } |
Node* node() const { return m_node; } |
FloatQuad quad() const { return m_quad; } |
IntRect boundingBox() const { return m_quad.enclosingBoundingBox(); } |
private: |
- Node* m_node; |
+ RawPtrWillBeMember<Node> m_node; |
FloatQuad m_quad; |
}; |
-typedef Vector<SubtargetGeometry> SubtargetGeometryList; |
+} |
+ |
+} |
+ |
+WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(WebCore::TouchAdjustment::SubtargetGeometry) |
+ |
+namespace WebCore { |
+ |
+namespace TouchAdjustment { |
+ |
+typedef WillBeHeapVector<SubtargetGeometry> SubtargetGeometryList; |
typedef bool (*NodeFilter)(Node*); |
typedef void (*AppendSubtargetsForNode)(Node*, SubtargetGeometryList&); |
typedef float (*DistanceFunction)(const IntPoint&, const IntRect&, const SubtargetGeometry&); |