Ensure same invocation order as creation order for SpellCheckRequests

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 15 matching lines @@
 #include "core/editing/spellcheck/SpellCheckRequester.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/spellcheck/SpellChecker.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
+#include "core/html/TextControlElement.h"
 #include "platform/text/TextCheckerClient.h"
 
 namespace blink {
 
 SpellCheckRequest::SpellCheckRequest(
     Range* checkingRange,
     const String& text,
     const Vector<uint32_t>& documentMarkersInRange,
     const Vector<unsigned>& documentMarkerOffsets,
     int requestNumber)
@@ skipping 173 matching lines @@
     // It's a continuation if the number of the last request got incremented in
     // the new one and both apply to the same editable.
     continuation =
         request->rootEditableElement() == lastRequest->rootEditableElement() &&
         request->requestNumber() == lastRequest->requestNumber() + 1;
   }
 
   // Spellcheck requests for chunks of text in the same element should not
   // overwrite each other.
   if (!continuation) {
-    for (auto& requestQueue : m_requestQueue) {
-      if (request->rootEditableElement() != requestQueue->rootEditableElement())
+    for (RequestQueue::const_iterator iter = m_requestQueue.begin();

[yosin_UTC9, 2017/01/17 08:20:12]

Can we use std::find_if()?

[Xiaocheng, 2017/01/17 08:48:18]

Yes.Done.

+         iter != m_requestQueue.end(); ++iter) {
+      if (request->rootEditableElement() != (*iter)->rootEditableElement())
         continue;
 
-      requestQueue = request;
-      return;
+      m_requestQueue.remove(iter);
+      break;
     }
   }
 
   m_requestQueue.append(request);
 }
 
 void SpellCheckRequester::didCheck(int sequence,
                                    const Vector<TextCheckingResult>& results) {
   DCHECK(m_processingRequest);
   DCHECK_EQ(m_processingRequest->data().sequence(), sequence);
   if (m_processingRequest->data().sequence() != sequence) {
     m_requestQueue.clear();
     return;
   }
 
   frame().spellChecker().markAndReplaceFor(m_processingRequest, results);
 
-  if (m_lastProcessedSequence < sequence)
-    m_lastProcessedSequence = sequence;
+  DCHECK_LT(m_lastProcessedSequence, sequence);
+  m_lastProcessedSequence = sequence;
 
   clearProcessingRequest();
   if (!m_requestQueue.isEmpty())
     m_timerToProcessQueuedRequest.startOneShot(0, BLINK_FROM_HERE);
 }
 
 void SpellCheckRequester::didCheckSucceed(
     int sequence,
     const Vector<TextCheckingResult>& results) {
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
@@ skipping 18 matching lines @@
   didCheck(sequence, results);
 }
 
 DEFINE_TRACE(SpellCheckRequester) {
   visitor->trace(m_frame);
   visitor->trace(m_processingRequest);
   visitor->trace(m_requestQueue);
 }
 
 }  // namespace blink