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

Unified Diff: third_party/WebKit/Source/core/editing/Position.cpp

Issue 2441693004: Make editingIgnoresContents() as global function (Closed)
Patch Set: 2016-10-24T12:29:25 Created 4 years, 2 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
Index: third_party/WebKit/Source/core/editing/Position.cpp
diff --git a/third_party/WebKit/Source/core/editing/Position.cpp b/third_party/WebKit/Source/core/editing/Position.cpp
index 77313e6fd4725f31767777abc8b3faeb762043a7..c551add2b91b90bb524d02340dee3d4cf364203c 100644
--- a/third_party/WebKit/Source/core/editing/Position.cpp
+++ b/third_party/WebKit/Source/core/editing/Position.cpp
@@ -67,7 +67,7 @@ PositionTemplate<Strategy> PositionTemplate<Strategy>::editingPositionOf(
if (!anchorNode || anchorNode->isTextNode())
return PositionTemplate<Strategy>(anchorNode, offset);
- if (!Strategy::editingIgnoresContent(anchorNode))
+ if (!editingIgnoresContent(anchorNode))
return PositionTemplate<Strategy>(anchorNode, offset);
if (offset == 0)
@@ -179,7 +179,7 @@ PositionTemplate<Strategy>::parentAnchoredEquivalent() const {
// needed for positions before and after Tables
if (m_offset == 0 && !isAfterAnchorOrAfterChildren()) {
if (Strategy::parent(*m_anchorNode) &&
- (Strategy::editingIgnoresContent(m_anchorNode.get()) ||
+ (editingIgnoresContent(m_anchorNode.get()) ||
isDisplayInsideTable(m_anchorNode.get())))
return inParentBeforeNode(*m_anchorNode);
return PositionTemplate<Strategy>(m_anchorNode.get(), 0);
@@ -187,7 +187,7 @@ PositionTemplate<Strategy>::parentAnchoredEquivalent() const {
if (!m_anchorNode->isCharacterDataNode() &&
(isAfterAnchorOrAfterChildren() ||
static_cast<unsigned>(m_offset) == m_anchorNode->countChildren()) &&
- (Strategy::editingIgnoresContent(m_anchorNode.get()) ||
+ (editingIgnoresContent(m_anchorNode.get()) ||
isDisplayInsideTable(m_anchorNode.get())) &&
computeContainerNode()) {
return inParentAfterNode(*m_anchorNode);
@@ -485,8 +485,8 @@ PositionTemplate<Strategy>
PositionTemplate<Strategy>::firstPositionInOrBeforeNode(Node* node) {
if (!node)
return PositionTemplate<Strategy>();
- return Strategy::editingIgnoresContent(node) ? beforeNode(node)
- : firstPositionInNode(node);
+ return editingIgnoresContent(node) ? beforeNode(node)
+ : firstPositionInNode(node);
}
// static
@@ -495,8 +495,8 @@ PositionTemplate<Strategy>
PositionTemplate<Strategy>::lastPositionInOrAfterNode(Node* node) {
if (!node)
return PositionTemplate<Strategy>();
- return Strategy::editingIgnoresContent(node) ? afterNode(node)
- : lastPositionInNode(node);
+ return editingIgnoresContent(node) ? afterNode(node)
+ : lastPositionInNode(node);
}
PositionInFlatTree toPositionInFlatTree(const Position& pos) {
« no previous file with comments | « third_party/WebKit/Source/core/editing/EditingUtilities.h ('k') | third_party/WebKit/Source/core/editing/PositionIterator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698