[Editing][Stability] Recanonicalize m_originalbase in FrameSelection

third_party/WebKit/Source/core/editing/FrameSelection.cpp

Index: third_party/WebKit/Source/core/editing/FrameSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index 88b0334f037acf89acdb46d11066424ccb943189..5558f1f659123dd029929590d3b571873773c61f 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -225,6 +225,18 @@ static void adjustEndpointsAtBidiBoundary(VisiblePositionTemplate<Strategy>& vis
     }
 }
 
+void FrameSelection::setOriginalBase(const VisiblePosition& newBase)
+{
+    m_originalBase = newBase;
+    m_originalBaseInFlatTree = createVisiblePosition(toPositionInFlatTree(newBase.deepEquivalent()));
+}
+
+void FrameSelection::setOriginalBase(const VisiblePositionInFlatTree& newBase)
+{
+    m_originalBaseInFlatTree = newBase;
+    m_originalBase = createVisiblePosition(toPositionInDOMTree(newBase.deepEquivalent()));
+}
+
 template <typename Strategy>
 void FrameSelection::setNonDirectionalSelectionIfNeededAlgorithm(const VisibleSelectionTemplate<Strategy>& passedNewSelection, TextGranularity granularity,
     EndPointsAdjustmentMode endpointsAdjustmentMode)
@@ -232,7 +244,8 @@ void FrameSelection::setNonDirectionalSelectionIfNeededAlgorithm(const VisibleSe
     VisibleSelectionTemplate<Strategy> newSelection = passedNewSelection;
     bool isDirectional = shouldAlwaysUseDirectionalSelection(m_frame) || newSelection.isDirectional();
 
-    const VisiblePositionTemplate<Strategy> originalBase = this->originalBase<Strategy>();
+    const PositionTemplate<Strategy> basePosition = this->originalBase<Strategy>().deepEquivalent();
+    const VisiblePositionTemplate<Strategy> originalBase = basePosition.inShadowIncludingDocument() ? createVisiblePosition(basePosition) : VisiblePositionTemplate<Strategy>();
     const VisiblePositionTemplate<Strategy> base = originalBase.isNotNull() ? originalBase : createVisiblePosition(newSelection.base());
     VisiblePositionTemplate<Strategy> newBase = base;
     const VisiblePositionTemplate<Strategy> extent = createVisiblePosition(newSelection.extent());
@@ -664,6 +677,8 @@ void FrameSelection::clear()
 
 void FrameSelection::prepareForDestruction()
 {
+    m_originalBase = VisiblePosition();
+    m_originalBaseInFlatTree = VisiblePositionInFlatTree();
     m_granularity = CharacterGranularity;
 
     m_caretBlinkTimer.stop();