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

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

Issue 2406163004: Simplify the usage of PositionWithAffinity (Closed)
Patch Set: 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/VisiblePosition.cpp
diff --git a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp
index fa7eaf80d1ef0eb5e144be7dc39f3475c4700b4f..8e85aef74d1f56803bf7182e4b7ebc88ece1a114 100644
--- a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp
+++ b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp
@@ -59,9 +59,8 @@ VisiblePositionTemplate<Strategy>::VisiblePositionTemplate(
: m_positionWithAffinity(positionWithAffinity)
#if DCHECK_IS_ON()
,
- m_domTreeVersion(
- positionWithAffinity.position().document()->domTreeVersion()),
- m_styleVersion(positionWithAffinity.position().document()->styleVersion())
+ m_domTreeVersion(positionWithAffinity.document()->domTreeVersion()),
+ m_styleVersion(positionWithAffinity.document()->styleVersion())
#endif
{
}
@@ -71,9 +70,9 @@ VisiblePositionTemplate<Strategy> VisiblePositionTemplate<Strategy>::create(
const PositionWithAffinityTemplate<Strategy>& positionWithAffinity) {
if (positionWithAffinity.isNull())
return VisiblePositionTemplate<Strategy>();
- DCHECK(positionWithAffinity.position().isConnected()) << positionWithAffinity;
+ DCHECK(positionWithAffinity.isConnected()) << positionWithAffinity;
- Document& document = *positionWithAffinity.position().document();
+ Document& document = *positionWithAffinity.document();
DCHECK(!document.needsLayoutTreeUpdate());
DocumentLifecycle::DisallowTransitionScope disallowTransition(
document.lifecycle());
@@ -247,7 +246,7 @@ bool VisiblePositionTemplate<Strategy>::isValid() const {
#if DCHECK_IS_ON()
if (isNull())
return true;
- Document& document = *m_positionWithAffinity.position().document();
+ Document& document = *m_positionWithAffinity.document();
return m_domTreeVersion == document.domTreeVersion() &&
m_styleVersion == document.styleVersion() &&
!document.needsLayoutTreeUpdate();

Powered by Google App Engine
This is Rietveld 408576698