Move Frame to the Oilpan heap.

Source/core/editing/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 27 matching lines @@
 
 SpellCheckRequest::SpellCheckRequest(
     PassRefPtrWillBeRawPtr<Range> checkingRange,
     PassRefPtrWillBeRawPtr<Range> paragraphRange,
     const String& text,
     TextCheckingTypeMask mask,
     TextCheckingProcessType processType,
     const Vector<uint32_t>& documentMarkersInRange,
     const Vector<unsigned>& documentMarkerOffsets,
     int requestNumber)
-    : m_requester(0)
+    : m_requester(nullptr)
     , m_checkingRange(checkingRange)
     , m_paragraphRange(paragraphRange)
     , m_rootEditableElement(m_checkingRange->startContainer()->rootEditableElement())
     , m_requestData(unrequestedTextCheckingSequence, text, mask, processType, documentMarkersInRange, documentMarkerOffsets)
     , m_requestNumber(requestNumber)
 {
 }
 
 SpellCheckRequest::~SpellCheckRequest()
 {
 }
 
+void SpellCheckRequest::trace(Visitor* visitor)
+{
+    visitor->trace(m_requester);
+    visitor->trace(m_checkingRange);
+    visitor->trace(m_paragraphRange);
+    visitor->trace(m_rootEditableElement);
+    TextCheckingRequest::trace(visitor);
+}
+
 // static
-PassRefPtr<SpellCheckRequest> SpellCheckRequest::create(TextCheckingTypeMask textCheckingOptions, TextCheckingProcessType processType, PassRefPtrWillBeRawPtr<Range> checkingRange, PassRefPtrWillBeRawPtr<Range> paragraphRange, int requestNumber)
+PassRefPtrWillBeRawPtr<SpellCheckRequest> SpellCheckRequest::create(TextCheckingTypeMask textCheckingOptions, TextCheckingProcessType processType, PassRefPtrWillBeRawPtr<Range> checkingRange, PassRefPtrWillBeRawPtr<Range> paragraphRange, int requestNumber)
 {
     ASSERT(checkingRange);
     ASSERT(paragraphRange);
 
     String text = checkingRange->text();
     if (!text.length())
-        return PassRefPtr<SpellCheckRequest>();
+        return PassRefPtrWillBeRawPtr<SpellCheckRequest>();

[haraken, 2014/09/08 07:25:57]

nullptr

[sof, 2014/09/08 21:17:45]

Simplified.

 
     const DocumentMarkerVector& markers = checkingRange->ownerDocument().markers().markersInRange(checkingRange.get(), 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 adoptRef(new SpellCheckRequest(checkingRange, paragraphRange, text, textCheckingOptions, processType, hashes, offsets, requestNumber));
+    return adoptRefWillBeNoop(new SpellCheckRequest(checkingRange, paragraphRange, text, textCheckingOptions, processType, hashes, offsets, requestNumber));
 }
 
 const TextCheckingRequestData& SpellCheckRequest::data() const
 {
     return m_requestData;
 }
 
 void SpellCheckRequest::didSucceed(const Vector<TextCheckingResult>& results)
 {
     if (!m_requester)
         return;
     SpellCheckRequester* requester = m_requester;
-    m_requester = 0;
+    m_requester = nullptr;
     requester->didCheckSucceed(m_requestData.sequence(), results);
 }
 
 void SpellCheckRequest::didCancel()
 {
     if (!m_requester)
         return;
     SpellCheckRequester* requester = m_requester;
-    m_requester = 0;
+    m_requester = nullptr;
     requester->didCheckCancel(m_requestData.sequence());
 }
 
 void SpellCheckRequest::setCheckerAndSequence(SpellCheckRequester* requester, int sequence)
 {
     ASSERT(!m_requester);
     ASSERT(m_requestData.sequence() == unrequestedTextCheckingSequence);
     m_requester = requester;
     m_requestData.m_sequence = sequence;
 }
 
+#if !ENABLE(OILPAN)
 void SpellCheckRequest::requesterDestroyed()
 {
-    m_requester = 0;
+    m_requester = nullptr;
 }
+#endif
 
 SpellCheckRequester::SpellCheckRequester(LocalFrame& frame)
-    : m_frame(frame)
+    : m_frame(&frame)
     , m_lastRequestSequence(0)
     , m_lastProcessedSequence(0)
     , m_timerToProcessQueuedRequest(this, &SpellCheckRequester::timerFiredToProcessQueuedRequest)
 {
 }
 
 SpellCheckRequester::~SpellCheckRequester()
 {
+#if !ENABLE(OILPAN)
     if (m_processingRequest)
         m_processingRequest->requesterDestroyed();
     for (RequestQueue::iterator i = m_requestQueue.begin(); i != m_requestQueue.end(); ++i)
         (*i)->requesterDestroyed();
+#endif
 }
 
 TextCheckerClient& SpellCheckRequester::client() const
 {
-    return m_frame.spellChecker().textChecker();
+    return m_frame->spellChecker().textChecker();
 }
 
 void SpellCheckRequester::timerFiredToProcessQueuedRequest(Timer<SpellCheckRequester>*)
 {
     ASSERT(!m_requestQueue.isEmpty());
     if (m_requestQueue.isEmpty())
         return;
 
     invokeRequest(m_requestQueue.takeFirst());
 }
 
 bool SpellCheckRequester::isAsynchronousEnabled() const
 {
-    return m_frame.settings() && m_frame.settings()->asynchronousSpellCheckingEnabled();
+    return m_frame->settings() && m_frame->settings()->asynchronousSpellCheckingEnabled();
 }
 
 bool SpellCheckRequester::canCheckAsynchronously(Range* range) const
 {
     return isCheckable(range) && isAsynchronousEnabled();
 }
 
 bool SpellCheckRequester::isCheckable(Range* range) const
 {
     if (!range || !range->firstNode() || !range->firstNode()->renderer())
         return false;
     const Node* node = range->startContainer();
     if (node && node->isElementNode() && !toElement(node)->isSpellCheckingEnabled())
         return false;
     return true;
 }
 
-void SpellCheckRequester::requestCheckingFor(PassRefPtr<SpellCheckRequest> request)
+void SpellCheckRequester::requestCheckingFor(PassRefPtrWillBeRawPtr<SpellCheckRequest> request)
 {
     if (!request || !canCheckAsynchronously(request->paragraphRange().get()))
         return;
 
     ASSERT(request->data().sequence() == unrequestedTextCheckingSequence);
     int sequence = ++m_lastRequestSequence;
     if (sequence == unrequestedTextCheckingSequence)
         sequence = ++m_lastRequestSequence;
 
     request->setCheckerAndSequence(this, sequence);
 
     if (m_timerToProcessQueuedRequest.isActive() || m_processingRequest) {
         enqueueRequest(request);
         return;
     }
 
     invokeRequest(request);
 }
 
 void SpellCheckRequester::cancelCheck()
 {
     if (m_processingRequest)
         m_processingRequest->didCancel();
 }
 
-void SpellCheckRequester::invokeRequest(PassRefPtr<SpellCheckRequest> request)
+void SpellCheckRequester::invokeRequest(PassRefPtrWillBeRawPtr<SpellCheckRequest> request)
 {
     ASSERT(!m_processingRequest);
     m_processingRequest = request;
     client().requestCheckingOfString(m_processingRequest);
 }
 
-void SpellCheckRequester::enqueueRequest(PassRefPtr<SpellCheckRequest> request)
+void SpellCheckRequester::enqueueRequest(PassRefPtrWillBeRawPtr<SpellCheckRequest> request)
 {
     ASSERT(request);
     bool continuation = false;
     if (!m_requestQueue.isEmpty()) {
-        RefPtr<SpellCheckRequest> lastRequest = m_requestQueue.last();
+        RefPtrWillBeRawPtr<SpellCheckRequest> lastRequest = m_requestQueue.last();
         // 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 (RequestQueue::iterator it = m_requestQueue.begin(); it != m_requestQueue.end(); ++it) {
             if (request->rootEditableElement() != (*it)->rootEditableElement())
                 continue;
 
             *it = request;
             return;
         }
     }
 
     m_requestQueue.append(request);
 }
 
 void SpellCheckRequester::didCheck(int sequence, const Vector<TextCheckingResult>& results)
 {
     ASSERT(m_processingRequest);
     ASSERT(m_processingRequest->data().sequence() == sequence);
     if (m_processingRequest->data().sequence() != sequence) {
         m_requestQueue.clear();
         return;
     }
 
-    m_frame.spellChecker().markAndReplaceFor(m_processingRequest, results);
+    m_frame->spellChecker().markAndReplaceFor(m_processingRequest, results);
 
     if (m_lastProcessedSequence < sequence)
         m_lastProcessedSequence = sequence;
 
     m_processingRequest.clear();
     if (!m_requestQueue.isEmpty())
         m_timerToProcessQueuedRequest.startOneShot(0, FROM_HERE);
 }
 
 void SpellCheckRequester::didCheckSucceed(int sequence, const Vector<TextCheckingResult>& results)
 {
     TextCheckingRequestData requestData = m_processingRequest->data();
     if (requestData.sequence() == sequence) {
         DocumentMarker::MarkerTypes markers = DocumentMarker::SpellCheckClientMarkers();
         if (!requestData.maskContains(TextCheckingTypeSpelling))
             markers.remove(DocumentMarker::Spelling);
         if (!requestData.maskContains(TextCheckingTypeGrammar))
             markers.remove(DocumentMarker::Grammar);
-        m_frame.document()->markers().removeMarkers(m_processingRequest->checkingRange().get(), markers);
+        if (m_frame->document())

[haraken, 2014/09/08 07:25:57]

Why do we need to introduce this check in this CL?

[sof, 2014/09/08 21:17:45]

Thanks for bringing this up. With the prompt disposing of LocalFrames upon
calling close(), we could end up having access to a document-less m_frame here.
This broke editing/spelling/spellcheck-async-remove-frame.html.

As close() now no longer causes any explicit disposal operations, the check is
no longer needed. m_frame will still be accessible via these closed&detached
frames (and have a document.) Reverted.

+            m_frame->document()->markers().removeMarkers(m_processingRequest->checkingRange().get(), markers);
     }
     didCheck(sequence, results);
 }
 
 void SpellCheckRequester::didCheckCancel(int sequence)
 {
     Vector<TextCheckingResult> results;
     didCheck(sequence, results);
 }
 
+void SpellCheckRequester::trace(Visitor* visitor)
+{
+    visitor->trace(m_frame);
+    visitor->trace(m_processingRequest);
+    visitor->trace(m_requestQueue);
+}
+
 } // namespace blink