Index: third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
diff --git a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
index 0a1e0b021db3acc4760e51da963cd9eef17918e8..a9187c09d098b1deaa903fcad6f959e989ae41a8 100644 |
--- a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
+++ b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp |
@@ -144,12 +144,17 @@ VisiblePositionTemplate<Strategy> VisiblePositionTemplate<Strategy>::lastPositio |
return create(PositionWithAffinityTemplate<Strategy>(PositionTemplate<Strategy>::lastPositionInNode(node))); |
} |
-VisiblePosition createVisiblePosition(const Position& position, TextAffinity affinity) |
+VisiblePosition createVisiblePositionDeprecated(const Position& position, TextAffinity affinity) |
{ |
- return createVisiblePosition(PositionWithAffinity(position, affinity)); |
+ // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
+ // needs to be audited. See http://crbug.com/590369 for more details. |
+ if (position.isNotNull()) |
+ position.document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
+ |
+ return VisiblePosition::create(PositionWithAffinity(position, affinity)); |
} |
-VisiblePosition createVisiblePosition(const PositionWithAffinity& positionWithAffinity) |
+VisiblePosition createVisiblePositionDeprecated(const PositionWithAffinity& positionWithAffinity) |
{ |
// TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
// needs to be audited. See http://crbug.com/590369 for more details. |
@@ -159,12 +164,17 @@ VisiblePosition createVisiblePosition(const PositionWithAffinity& positionWithAf |
return VisiblePosition::create(positionWithAffinity); |
} |
-VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTree& position, TextAffinity affinity) |
+VisiblePositionInFlatTree createVisiblePositionDeprecated(const PositionInFlatTree& position, TextAffinity affinity) |
{ |
+ // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
+ // needs to be audited. See http://crbug.com/590369 for more details. |
+ if (position.isNotNull()) |
+ position.document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
+ |
return VisiblePositionInFlatTree::create(PositionInFlatTreeWithAffinity(position, affinity)); |
} |
-VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTreeWithAffinity& positionWithAffinity) |
+VisiblePositionInFlatTree createVisiblePositionDeprecated(const PositionInFlatTreeWithAffinity& positionWithAffinity) |
{ |
// TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
// needs to be audited. See http://crbug.com/590369 for more details. |
@@ -174,6 +184,26 @@ VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTreeWithAffi |
return VisiblePositionInFlatTree::create(positionWithAffinity); |
} |
+VisiblePosition createVisiblePosition(const Position& position, TextAffinity affinity) |
+{ |
+ return VisiblePosition::create(PositionWithAffinity(position, affinity)); |
+} |
+ |
+VisiblePosition createVisiblePosition(const PositionWithAffinity& positionWithAffinity) |
+{ |
+ return VisiblePosition::create(positionWithAffinity); |
+} |
+ |
+VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTree& position, TextAffinity affinity) |
+{ |
+ return VisiblePositionInFlatTree::create(PositionInFlatTreeWithAffinity(position, affinity)); |
+} |
+ |
+VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTreeWithAffinity& positionWithAffinity) |
+{ |
+ return VisiblePositionInFlatTree::create(positionWithAffinity); |
+} |
+ |
#ifndef NDEBUG |
template<typename Strategy> |