Rename s_range to avoid conflicts with Blink rewrite.

third_party/WebKit/Source/core/dom/Range.cpp

Index: third_party/WebKit/Source/core/dom/Range.cpp
diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp
index 452024df8567c1af088677d2d31139fdda3e4d33..34637fd89c519f1361bb0954bafac3ce3fd35509 100644
--- a/third_party/WebKit/Source/core/dom/Range.cpp
+++ b/third_party/WebKit/Source/core/dom/Range.cpp
@@ -68,9 +68,9 @@ class RangeUpdateScope {
       m_range = range;
       m_oldDocument = range->ownerDocument();
 #if DCHECK_IS_ON()
-      s_range = range;
+      s_rawRange = range;
     } else {
-      DCHECK_EQ(s_range, range);
+      DCHECK_EQ(s_rawRange, range);
 #endif
     }
   }
@@ -82,7 +82,7 @@ class RangeUpdateScope {
     m_range->removeFromSelectionIfInDifferentRoot(*m_oldDocument);
     m_range->updateSelectionIfAddedToSelection();
 #if DCHECK_IS_ON()
-    s_range = nullptr;
+    s_rawRange = nullptr;
 #endif
   }
 
@@ -90,9 +90,10 @@ class RangeUpdateScope {
   static int s_scopeCount;
 #if DCHECK_IS_ON()
   // This raw pointer is safe because
-  //  - s_range has a valid pointer only if RangeUpdateScope instance is live.
+  //  - s_rawRange has a valid pointer only if RangeUpdateScope instance is
+  //  live.
   //  - RangeUpdateScope is used only in Range member functions.
-  static Range* s_range;
+  static Range* s_rawRange;

[dcheng, 2017/03/30 18:46:31]

Hmm... I'd call this s_currentRange.

[nasko, 2017/03/30 22:59:20]

Done.

 #endif
   Member<Range> m_range;
   Member<Document> m_oldDocument;
@@ -102,7 +103,7 @@ class RangeUpdateScope {
 
 int RangeUpdateScope::s_scopeCount = 0;
 #if DCHECK_IS_ON()
-Range* RangeUpdateScope::s_range;
+Range* RangeUpdateScope::s_rawRange;
 #endif
 
 inline Range::Range(Document& ownerDocument)