Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: Source/core/editing/FrameSelection.cpp

Issue 1182253004: Templatize FrameSelection::contains function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-06-18T19:15:03 Rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/editing/FrameSelection.h ('k') | Source/core/editing/VisibleSelection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/FrameSelection.cpp
diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp
index a0835b63c4d276bd4fee59b61202e2704f6e13bb..0645d497fd212663e658666b11cfdd143164afab 100644
--- a/Source/core/editing/FrameSelection.cpp
+++ b/Source/core/editing/FrameSelection.cpp
@@ -1299,8 +1299,11 @@ void FrameSelection::paintCaret(GraphicsContext* context, const LayoutPoint& pai
}
}
-bool FrameSelection::contains(const LayoutPoint& point)
+template <typename Strategy>
+bool FrameSelection::containsAlgorithm(const LayoutPoint& point)
{
+ using PositionType = typename Strategy::PositionType;
+
Document* document = m_frame->document();
// Treat a collapsed selection like no selection.
@@ -1320,14 +1323,20 @@ bool FrameSelection::contains(const LayoutPoint& point)
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.
« no previous file with comments | « Source/core/editing/FrameSelection.h ('k') | Source/core/editing/VisibleSelection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698