| Index: third_party/WebKit/Source/core/editing/PositionWithAffinity.h
|
| diff --git a/third_party/WebKit/Source/core/editing/PositionWithAffinity.h b/third_party/WebKit/Source/core/editing/PositionWithAffinity.h
|
| index e8b34aa7884168646b71ae110bb34a34b9be5926..9a794ec79c530e6b69332a67f926eaa65caaa9ec 100644
|
| --- a/third_party/WebKit/Source/core/editing/PositionWithAffinity.h
|
| +++ b/third_party/WebKit/Source/core/editing/PositionWithAffinity.h
|
| @@ -43,10 +43,10 @@ private:
|
| };
|
|
|
| extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionWithAffinityTemplate<EditingStrategy>;
|
| -extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionWithAffinityTemplate<EditingInComposedTreeStrategy>;
|
| +extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionWithAffinityTemplate<EditingInFlatTreeStrategy>;
|
|
|
| using PositionWithAffinity = PositionWithAffinityTemplate<EditingStrategy>;
|
| -using PositionInComposedTreeWithAffinity = PositionWithAffinityTemplate<EditingInComposedTreeStrategy>;
|
| +using PositionInFlatTreeWithAffinity = PositionWithAffinityTemplate<EditingInFlatTreeStrategy>;
|
|
|
| template <typename Strategy>
|
| PositionWithAffinityTemplate<Strategy> fromPositionInDOMTree(const PositionWithAffinity&);
|
| @@ -58,9 +58,9 @@ inline PositionWithAffinity fromPositionInDOMTree<EditingStrategy>(const Positio
|
| }
|
|
|
| template <>
|
| -inline PositionInComposedTreeWithAffinity fromPositionInDOMTree<EditingInComposedTreeStrategy>(const PositionWithAffinity& positionWithAffinity)
|
| +inline PositionInFlatTreeWithAffinity fromPositionInDOMTree<EditingInFlatTreeStrategy>(const PositionWithAffinity& positionWithAffinity)
|
| {
|
| - return PositionInComposedTreeWithAffinity(toPositionInComposedTree(positionWithAffinity.position()), positionWithAffinity.affinity());
|
| + return PositionInFlatTreeWithAffinity(toPositionInFlatTree(positionWithAffinity.position()), positionWithAffinity.affinity());
|
| }
|
|
|
| } // namespace blink
|
|
|