Templatize FrameSelection::contains function

Source/core/editing/FrameSelection.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1275 matching lines @@
 }
 
 void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect)
 {
     if (m_selection.isCaret() && m_shouldPaintCaret) {
         updateCaretRect(m_frame->document(), PositionWithAffinity(m_selection.start(), m_selection.affinity()));
         CaretBase::paintCaret(m_selection.start().deprecatedNode(), context, paintOffset, clipRect);
     }
 }
 
-bool FrameSelection::contains(const LayoutPoint& point)
+template <typename Strategy>

[yoichio, 2015/06/18 07:59:14]

VisibleSelection::InDOMTree does not look like other strategy classes.
What does 'Strategy' mean?

+bool FrameSelection::containsAlgorithm(const LayoutPoint& point)
 {
+    using PositionType = typename Strategy::PositionType;
+
     Document* document = m_frame->document();
 
     // Treat a collapsed selection like no selection.
     if (!isRange())
         return false;
     if (!document->layoutView())
         return false;
 
     HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
     HitTestResult result(request, point);
     document->layoutView()->hitTest(result);
     Node* innerNode = result.innerNode();
     if (!innerNode || !innerNode->layoutObject())
         return false;
 
     VisiblePosition visiblePos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
     if (visiblePos.isNull())
         return false;
 
-    if (m_selection.visibleStart().isNull() || m_selection.visibleEnd().isNull())
+    VisiblePosition visibleStart = Strategy::selectionVisibleStart(m_selection);
+    VisiblePosition visibleEnd = Strategy::selectionVisibleEnd(m_selection);
+    if (visibleStart.isNull() || visibleEnd.isNull())
         return false;
 
-    Position start(m_selection.visibleStart().deepEquivalent());
-    Position end(m_selection.visibleEnd().deepEquivalent());
-    Position p(visiblePos.deepEquivalent());
+    PositionType start(Strategy::toPositionType(visibleStart.deepEquivalent()));
+    PositionType end(Strategy::toPositionType(visibleEnd.deepEquivalent()));
+    PositionType pos(Strategy::toPositionType(visiblePos.deepEquivalent()));
+    return start.compareTo(pos) <= 0 && pos.compareTo(end) <= 0;
+}
 
-    return comparePositions(start, p) <= 0 && comparePositions(p, end) <= 0;
+bool FrameSelection::contains(const LayoutPoint& point)
+{
+    return containsAlgorithm<VisibleSelection::InDOMTree>(point);
 }
 
 // Workaround for the fact that it's hard to delete a frame.
 // Call this after doing user-triggered selections to make it easy to delete the frame you entirely selected.
 // Can't do this implicitly as part of every setSelection call because in some contexts it might not be good
 // for the focus to move to another frame. So instead we call it from places where we are selecting with the
 // mouse or the keyboard after setting the selection.
 void FrameSelection::selectFrameElementInParentIfFullySelected()
 {
     // Find the parent frame; if there is none, then we have nothing to do.
@@ skipping 638 matching lines @@
 
 void showTree(const blink::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n");
 }
 
 #endif