2016-03-02T18:53:01 LayoutPosition

third_party/WebKit/Source/core/editing/VisiblePosition.cpp

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 aec7d2eec7784267c4f07c3699805f9024426602..634ee61354e6b936c7a6a7583ba444b74388db6a 100644
--- a/third_party/WebKit/Source/core/editing/VisiblePosition.cpp
+++ b/third_party/WebKit/Source/core/editing/VisiblePosition.cpp
@@ -59,10 +59,13 @@ VisiblePositionTemplate<Strategy>::VisiblePositionTemplate(const PositionWithAff
 template<typename Strategy>
 VisiblePositionTemplate<Strategy> VisiblePositionTemplate<Strategy>::create(const PositionWithAffinityTemplate<Strategy>& positionWithAffinity)
 {
-    const PositionTemplate<Strategy> deepPosition = canonicalPositionOf(positionWithAffinity.position());
-    if (deepPosition.isNull())
+    if (positionWithAffinity.isNull())
         return VisiblePositionTemplate<Strategy>();
     DCHECK(positionWithAffinity.position().inShadowIncludingDocument()) << positionWithAffinity;
+    const PositionTemplate<Strategy>& deepPosition = canonicalPositionOf(positionWithAffinity.position());
+    if (deepPosition.isNull())
+        return VisiblePositionTemplate<Strategy>();
+    DCHECK(deepPosition.inShadowIncludingDocument()) << positionWithAffinity;
     const PositionWithAffinityTemplate<Strategy> downstreamPosition(deepPosition);
     if (positionWithAffinity.affinity() == TextAffinity::Downstream)
         return VisiblePositionTemplate<Strategy>(downstreamPosition);
@@ -100,11 +103,7 @@ VisiblePositionInFlatTree createVisiblePosition(const PositionInFlatTreeWithAffi
 template<typename Strategy>
 void VisiblePositionTemplate<Strategy>::debugPosition(const char* msg) const
 {
-    if (isNull()) {
-        fprintf(stderr, "Position [%s]: null\n", msg);
-        return;
-    }
-    deepEquivalent().debugPosition(msg);
+    VLOG(0) << msg << ' ' << *this;
 }
 
 template<typename Strategy>
@@ -117,6 +116,7 @@ template<typename Strategy>
 void VisiblePositionTemplate<Strategy>::showTreeForThis() const
 {
     deepEquivalent().showTreeForThis();
+    VLOG(0) << *this;
 }
 
 #endif