| Index: Source/core/editing/htmlediting.cpp
|
| diff --git a/Source/core/editing/htmlediting.cpp b/Source/core/editing/htmlediting.cpp
|
| index cbaacdad8b11127f3a91d37028e28a4beeab6a5f..721a3afc75e61b9ac4dc4b994cbc2d844ae3aaa5 100644
|
| --- a/Source/core/editing/htmlediting.cpp
|
| +++ b/Source/core/editing/htmlediting.cpp
|
| @@ -136,6 +136,11 @@ ContainerNode* highestEditableRoot(const Position& position, EditableType editab
|
| return highestRoot;
|
| }
|
|
|
| +ContainerNode* highestEditableRoot(const PositionInComposedTree& position, EditableType editableType)
|
| +{
|
| + return highestEditableRoot(toPositionInDOMTree(position), editableType);
|
| +}
|
| +
|
| Element* lowestEditableAncestor(Node* node)
|
| {
|
| while (node) {
|
| @@ -165,6 +170,11 @@ bool isEditablePosition(const Position& p, EditableType editableType, EUpdateSty
|
| return node->hasEditableStyle(editableType);
|
| }
|
|
|
| +bool isEditablePosition(const PositionInComposedTree& p, EditableType editableType, EUpdateStyle updateStyle)
|
| +{
|
| + return isEditablePosition(toPositionInDOMTree(p), editableType, updateStyle);
|
| +}
|
| +
|
| bool isAtUnsplittableElement(const Position& pos)
|
| {
|
| Node* node = pos.deprecatedNode();
|
| @@ -291,6 +301,11 @@ Position previousVisuallyDistinctCandidate(const Position& position)
|
| return previousVisuallyDistinctCandidateAlgorithm<Position>(position);
|
| }
|
|
|
| +PositionInComposedTree previousVisuallyDistinctCandidate(const PositionInComposedTree& position)
|
| +{
|
| + return previousVisuallyDistinctCandidateAlgorithm<PositionInComposedTree>(position);
|
| +}
|
| +
|
| VisiblePosition firstEditableVisiblePositionAfterPositionInRoot(const Position& position, ContainerNode* highestRoot)
|
| {
|
| // position falls before highestRoot.
|
| @@ -351,6 +366,11 @@ Position lastEditablePositionBeforePositionInRoot(const Position& position, Node
|
| return lastEditablePositionBeforePositionInRootAlgorithm<Position>(position, highestRoot);
|
| }
|
|
|
| +PositionInComposedTree lastEditablePositionBeforePositionInRoot(const PositionInComposedTree& position, Node* highestRoot)
|
| +{
|
| + return lastEditablePositionBeforePositionInRootAlgorithm<PositionInComposedTree>(position, highestRoot);
|
| +}
|
| +
|
| // FIXME: The method name, comment, and code say three different things here!
|
| // Whether or not content before and after this node will collapse onto the same line as it.
|
| bool isBlock(const Node* node)
|
|
|