Remove m_paragraphRange from SpellCheckRequest

third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp

 /*
  * Copyright (C) 2010 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/spellcheck/SpellChecker.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "platform/text/TextCheckerClient.h"
 
 namespace blink {
 
 SpellCheckRequest::SpellCheckRequest(
     Range* checkingRange,
-    Range* paragraphRange,
     const String& text,
     TextCheckingProcessType processType,
     const Vector<uint32_t>& documentMarkersInRange,
     const Vector<unsigned>& documentMarkerOffsets,
     int requestNumber)
     : m_requester(nullptr)
     , m_checkingRange(checkingRange)
-    , m_paragraphRange(paragraphRange)
     , m_rootEditableElement(blink::rootEditableElement(*m_checkingRange->startContainer()))
     , m_requestData(unrequestedTextCheckingSequence, text, processType, documentMarkersInRange, documentMarkerOffsets)
     , m_requestNumber(requestNumber)
 {
     DCHECK(m_checkingRange);
     DCHECK(m_checkingRange->isConnected());
-    DCHECK(m_paragraphRange);
-    DCHECK(m_paragraphRange->isConnected());
     DCHECK(m_rootEditableElement);
 }
 
 SpellCheckRequest::~SpellCheckRequest()
 {
 }
 
 DEFINE_TRACE(SpellCheckRequest)
 {
     visitor->trace(m_requester);
     visitor->trace(m_checkingRange);
-    visitor->trace(m_paragraphRange);
     visitor->trace(m_rootEditableElement);
     TextCheckingRequest::trace(visitor);
 }
 
 void SpellCheckRequest::dispose()
 {
     if (m_checkingRange)
         m_checkingRange->dispose();
-    if (m_paragraphRange && m_paragraphRange != m_checkingRange)
-        m_paragraphRange->dispose();
 }
 
 // static
-SpellCheckRequest* SpellCheckRequest::create(TextCheckingProcessType processType, const EphemeralRange& checkingRange, const EphemeralRange& paragraphRange, int requestNumber)
+SpellCheckRequest* SpellCheckRequest::create(TextCheckingProcessType processType, const EphemeralRange& checkingRange, int requestNumber)
 {
     if (checkingRange.isNull())
         return nullptr;
     if (!blink::rootEditableElement(*checkingRange.startPosition().computeContainerNode()))
         return nullptr;
 
     String text = plainText(checkingRange, TextIteratorEmitsObjectReplacementCharacter);
     if (text.isEmpty())
         return nullptr;
 
     Range* checkingRangeObject = createRange(checkingRange);
-    Range* paragraphRangeObject = nullptr;
-    // Share identical Range objects.
-    if (checkingRange == paragraphRange)
-        paragraphRangeObject = checkingRangeObject;
-    else
-        paragraphRangeObject = createRange(paragraphRange);
 
     const DocumentMarkerVector& markers = checkingRangeObject->ownerDocument().markers().markersInRange(checkingRange, DocumentMarker::SpellCheckClientMarkers());
     Vector<uint32_t> hashes(markers.size());
     Vector<unsigned> offsets(markers.size());
     for (size_t i = 0; i < markers.size(); ++i) {
         hashes[i] = markers[i]->hash();
         offsets[i] = markers[i]->startOffset();
     }
 
-    return new SpellCheckRequest(checkingRangeObject, paragraphRangeObject, text, processType, hashes, offsets, requestNumber);
+    return new SpellCheckRequest(checkingRangeObject, text, processType, hashes, offsets, requestNumber);
 }
 
 const TextCheckingRequestData& SpellCheckRequest::data() const
 {
     return m_requestData;
 }
 
 bool SpellCheckRequest::isValid() const
 {
-    return m_checkingRange->isConnected() && m_paragraphRange->isConnected() && m_rootEditableElement->isConnected();
+    return m_checkingRange->isConnected() && m_rootEditableElement->isConnected();
 }
 
 void SpellCheckRequest::didSucceed(const Vector<TextCheckingResult>& results)
 {
     if (!m_requester)
         return;
     SpellCheckRequester* requester = m_requester;
     m_requester = nullptr;
     requester->didCheckSucceed(m_requestData.sequence(), results);
 }
@@ skipping 46 matching lines @@
     if (!range || !range->firstNode() || !range->firstNode()->layoutObject())
         return false;
     const Node* node = range->startContainer();
     if (node && node->isElementNode() && !toElement(node)->isSpellCheckingEnabled())
         return false;
     return true;
 }
 
 void SpellCheckRequester::requestCheckingFor(SpellCheckRequest* request)
 {
-    if (!request || !canCheckAsynchronously(request->paragraphRange()))
+    if (!request || !canCheckAsynchronously(request->checkingRange()))
         return;
 
     DCHECK_EQ(request->data().sequence(), unrequestedTextCheckingSequence);
     int sequence = ++m_lastRequestSequence;
     if (sequence == unrequestedTextCheckingSequence)
         sequence = ++m_lastRequestSequence;
 
     request->setCheckerAndSequence(this, sequence);
 
     if (m_timerToProcessQueuedRequest.isActive() || m_processingRequest) {
@@ skipping 108 matching lines @@
 }
 
 DEFINE_TRACE(SpellCheckRequester)
 {
     visitor->trace(m_frame);
     visitor->trace(m_processingRequest);
     visitor->trace(m_requestQueue);
 }
 
 } // namespace blink