Merge "Selection API: Show a deprecation message for a quirky addRange() behavior." to M57 branch

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

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 21 matching lines @@
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/Node.h"
 #include "core/dom/Range.h"
 #include "core/dom/TreeScope.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/iterators/TextIterator.h"
+#include "core/frame/Deprecation.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 static Node* selectionShadowAncestor(LocalFrame* frame) {
   Node* node = frame->selection().selection().base().anchorNode();
   if (!node)
@@ skipping 437 matching lines @@
     addConsoleError("Discontiguous selection is not supported.");
     return;
   }
 
   // FIXME: "Merge the ranges if they intersect" is Blink-specific behavior;
   // other browsers supporting discontiguous selection (obviously) keep each
   // Range added and return it in getRangeAt(). But it's unclear if we can
   // really do the same, since we don't support discontiguous selection. Further
   // discussions at
   // <https://code.google.com/p/chromium/issues/detail?id=353069>.
-  UseCounter::count(frame(), UseCounter::SelectionAddRangeIntersect);
+  Deprecation::countDeprecation(frame(),
+                                UseCounter::SelectionAddRangeIntersect);
 
   Range* start = originalRange->compareBoundaryPoints(
                      Range::kStartToStart, newRange, ASSERT_NO_EXCEPTION) < 0
                      ? originalRange
                      : newRange;
   Range* end = originalRange->compareBoundaryPoints(Range::kEndToEnd, newRange,
                                                     ASSERT_NO_EXCEPTION) < 0
                    ? newRange
                    : originalRange;
   const EphemeralRange merged =
@@ skipping 156 matching lines @@
     m_treeScope->document().addConsoleMessage(
         ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->trace(m_treeScope);
   ContextClient::trace(visitor);
 }
 
 }  // namespace blink