Revert "Revert of FileWriter should not use deprecated {,un}setPendingActivity (https://codereview.…

Source/modules/filesystem/FileWriter.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 69 matching lines @@
 
 void FileWriter::stop()
 {
     // Make sure we've actually got something to stop, and haven't already called abort().
     if (!writer() || m_readyState != WRITING)
         return;
     doOperation(OperationAbort);
     m_readyState = DONE;
 }
 
+bool FileWriter::hasPendingActivity() const
+{
+    return m_operationInProgress != OperationNone || m_queuedOperation != OperationNone || m_readyState == WRITING;
+}
+
 void FileWriter::write(Blob* data, ExceptionState& exceptionState)
 {
     ASSERT(writer());
     ASSERT(data);
     ASSERT(m_truncateLength == -1);
     if (m_readyState == WRITING) {
         setError(FileError::INVALID_STATE_ERR, exceptionState);
         return;
     }
     if (!data) {
@@ skipping 97 matching lines @@
     // already handled the cleanup and signalCompletion call.
     double now = currentTimeMS();
     if (complete || !m_lastProgressNotificationTimeMS || (now - m_lastProgressNotificationTimeMS > progressNotificationIntervalMS)) {
         m_lastProgressNotificationTimeMS = now;
         fireEvent(EventTypeNames::progress);
     }
 
     if (complete) {
       if (numAborts == m_numAborts)
           signalCompletion(FileError::OK);
-      unsetPendingActivity(this);
     }
 }
 
 void FileWriter::didTruncate()
 {
     if (m_operationInProgress == OperationAbort) {
         completeAbort();
         return;
     }
     ASSERT(m_operationInProgress == OperationTruncate);
     ASSERT(m_truncateLength >= 0);
     setLength(m_truncateLength);
     if (position() > length())
         setPosition(length());
     m_operationInProgress = OperationNone;
     signalCompletion(FileError::OK);
-    unsetPendingActivity(this);
 }
 
 void FileWriter::didFail(blink::WebFileError code)
 {
     ASSERT(m_operationInProgress != OperationNone);
     ASSERT(static_cast<FileError::ErrorCode>(code) != FileError::OK);
     if (m_operationInProgress == OperationAbort) {
         completeAbort();
         return;
     }
     ASSERT(m_queuedOperation == OperationNone);
     ASSERT(m_readyState == WRITING);
     m_blobBeingWritten.clear();
     m_operationInProgress = OperationNone;
     signalCompletion(static_cast<FileError::ErrorCode>(code));
-    unsetPendingActivity(this);
 }
 
 void FileWriter::completeAbort()
 {
     ASSERT(m_operationInProgress == OperationAbort);
     m_operationInProgress = OperationNone;
     Operation operation = m_queuedOperation;
     m_queuedOperation = OperationNone;
     doOperation(operation);
-    unsetPendingActivity(this);
 }
 
 void FileWriter::doOperation(Operation operation)
 {
     switch (operation) {
     case OperationWrite:
         ASSERT(m_operationInProgress == OperationNone);
         ASSERT(m_truncateLength == -1);
         ASSERT(m_blobBeingWritten.get());
         ASSERT(m_readyState == WRITING);
-        setPendingActivity(this);
         writer()->write(position(), m_blobBeingWritten->uuid());
         break;
     case OperationTruncate:
         ASSERT(m_operationInProgress == OperationNone);
         ASSERT(m_truncateLength >= 0);
         ASSERT(m_readyState == WRITING);
-        setPendingActivity(this);
         writer()->truncate(m_truncateLength);
         break;
     case OperationNone:
         ASSERT(m_operationInProgress == OperationNone);
         ASSERT(m_truncateLength == -1);
         ASSERT(!m_blobBeingWritten.get());
         ASSERT(m_readyState == DONE);
         break;
     case OperationAbort:
         if (m_operationInProgress == OperationWrite || m_operationInProgress == OperationTruncate)
@@ skipping 41 matching lines @@
 
 void FileWriter::trace(Visitor* visitor)
 {
     visitor->trace(m_error);
     visitor->trace(m_blobBeingWritten);
     FileWriterBase::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace WebCore