Rename s_range to avoid conflicts with Blink rewrite.

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

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Gunnstein Lye (gunnstein@netcom.no)
  * (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
  * (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2011 Motorola Mobility. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 44 matching lines @@
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 class RangeUpdateScope {
   STACK_ALLOCATED();
   RangeUpdateScope(Range* range) {

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

Mind fixing this to add explicit while you're at it? =)

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

Done.

     DCHECK(range);
     if (++s_scopeCount == 1) {
       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
     }
   }
 
   ~RangeUpdateScope() {
     DCHECK_GE(s_scopeCount, 1);
     if (--s_scopeCount > 0)
       return;
     m_range->removeFromSelectionIfInDifferentRoot(*m_oldDocument);
     m_range->updateSelectionIfAddedToSelection();
 #if DCHECK_IS_ON()
-    s_range = nullptr;
+    s_rawRange = nullptr;
 #endif
   }
 
  private:
   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;
 
   DISALLOW_COPY_AND_ASSIGN(RangeUpdateScope);
 };
 
 int RangeUpdateScope::s_scopeCount = 0;
 #if DCHECK_IS_ON()
-Range* RangeUpdateScope::s_range;
+Range* RangeUpdateScope::s_rawRange;
 #endif
 
 inline Range::Range(Document& ownerDocument)
     : m_ownerDocument(&ownerDocument),
       m_start(m_ownerDocument),
       m_end(m_ownerDocument) {
   m_ownerDocument->attachRange(this);
 }
 
 Range* Range::create(Document& ownerDocument) {
@@ skipping 1695 matching lines @@
                      .data()
               << "start offset: " << range->startOffset()
               << ", end offset: " << range->endOffset();
   } else {
     LOG(INFO) << "Cannot show tree if range is null, or if boundary points are "
                  "invalid.";
   }
 }
 
 #endif