Make XHR use the background HTML parser

Source/core/xml/XMLHttpRequest.cpp

 /*
  *  Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
  *  Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
  *  Copyright (C) 2008, 2011 Google Inc. All rights reserved.
  *  Copyright (C) 2012 Intel Corporation
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 113 matching lines @@
         UnderlyingSource::trace(visitor);
     }
 
 private:
     // This is RawPtr in non-oilpan build to avoid the reference cycle. To
     // avoid use-after free, the associated ReadableStream must be closed
     // or errored when m_owner is gone.
     RawPtrWillBeMember<XMLHttpRequest> m_owner;
 };
 
+HashMap<Document*, XMLHttpRequest*>& xhrPendingDocumentParseMap()
+{
+    typedef HashMap<Document*, XMLHttpRequest*> XHRPendingDocumentParseMap;
+    DEFINE_STATIC_LOCAL(XHRPendingDocumentParseMap, map, ());
+    return map;
+}
+
 } // namespace
 
 PassRefPtrWillBeRawPtr<XMLHttpRequest> XMLHttpRequest::create(ExecutionContext* context, PassRefPtr<SecurityOrigin> securityOrigin)
 {
     RefPtrWillBeRawPtr<XMLHttpRequest> xmlHttpRequest = adoptRefWillBeNoop(new XMLHttpRequest(context, securityOrigin));
     xmlHttpRequest->suspendIfNeeded();
 
     return xmlHttpRequest.release();
 }
 
 XMLHttpRequest::XMLHttpRequest(ExecutionContext* context, PassRefPtr<SecurityOrigin> securityOrigin)
     : ActiveDOMObject(context)
     , m_timeoutMilliseconds(0)
+    , m_loaderIdentifier(0)
     , m_state(UNSENT)
     , m_downloadedBlobLength(0)
     , m_receivedLength(0)
     , m_lastSendLineNumber(0)
     , m_exceptionCode(0)
     , m_progressEventThrottle(this)
     , m_responseTypeCode(ResponseTypeDefault)
     , m_securityOrigin(securityOrigin)
     , m_async(true)
     , m_includeCredentials(false)
@@ skipping 771 matching lines @@
 {
     m_error = true;
 
     if (m_responseDocumentParser && m_responseDocumentParser->isStopped())
         m_responseDocumentParser->stopParsing();
 
     clearVariablesForLoading();
 
     InspectorInstrumentation::didFailXHRLoading(executionContext(), this, this);
 
+    HashMap<Document*, XMLHttpRequest*>& map = xhrPendingDocumentParseMap();
+    for (HashMap<Document*, XMLHttpRequest*>::iterator it = map.begin(), itEnd = map.end(); it != itEnd; ++it) {
+        if (it->value == this) {
+            map.remove(it);
+            break;
+        }
+    }

[tyoshino (SeeGerritForStatus), 2014/09/02 04:12:16]

I recommend that we place this close to stopParsing() call.

[kouhei (in TOK), 2014/09/02 16:17:27]

Done.

+
     if (m_responseLegacyStream && m_state != DONE)
         m_responseLegacyStream->abort();
 
     if (m_responseStream) {
         // When the stream is already closed (including canceled from the
         // user), |error| does nothing.
         // FIXME: Create a more specific error.
         m_responseStream->error(DOMException::create(!m_async && m_exceptionCode ? m_exceptionCode : AbortError, "XMLHttpRequest::abort"));
     }
 
@@ skipping 328 matching lines @@
 void XMLHttpRequest::didFinishLoading(unsigned long identifier, double)
 {
     WTF_LOG(Network, "XMLHttpRequest %p didFinishLoading(%lu)", this, identifier);
 
     if (m_error)
         return;
 
     if (m_state < HEADERS_RECEIVED)
         changeState(HEADERS_RECEIVED);
 
+    m_loaderIdentifier = identifier;
+
     if (m_responseDocumentParser) {
+        // |DocumentParser::finish()| tells the parser that we have reached end of the data.
+        // When using |HTMLDocumentParser|, which works asynchronously, we do not have the
+        // complete document just after the |DocumentParser::finish()| call.
         m_responseDocumentParser->finish();

[tyoshino (SeeGerritForStatus), 2014/09/02 04:19:19]

We are never notified of completion synchronously? If it's possible for some
cases, how about adding this to xhrPendingDocumentParserMap() before calling
finish()?

[kouhei (in TOK), 2014/09/02 16:17:27]

Great catch. Done.

-        m_responseDocumentParser = nullptr;
+        ASSERT(m_responseDocument);
 
-        m_responseDocument->implicitClose();
+        // Record |this| as a XHR waiting for document parse to complete, and wait for
+        // |Document::finishedParsing| to call us back in |didFinishParsingDocument| to progress state.
+        HashMap<Document*, XMLHttpRequest*>& map = xhrPendingDocumentParseMap();
+        HashMap<Document*, XMLHttpRequest*>::AddResult result = map.set(m_responseDocument.get(), this);
+        ASSERT_UNUSED(result, result.isNewEntry);
+        return;
+    }
 
-        if (!m_responseDocument->wellFormed())
-            m_responseDocument = nullptr;
-
-        m_parsedResponse = true;
-    } else if (m_decoder) {
+    if (m_decoder)
         m_responseText = m_responseText.concatenateWith(m_decoder->flush());
-    }
 
     if (m_responseLegacyStream)
         m_responseLegacyStream->finalize();
 
     if (m_responseStream)
         m_responseStream->close();
 
+    endLoading();
+}
+
+XMLHttpRequest* XMLHttpRequest::findInstancePendingDocumentParse(Document* document)
+{
+    return xhrPendingDocumentParseMap().get(document);
+}
+
+void XMLHttpRequest::didFinishParsingDocument()
+{
+    // This should only be called when response document is parsed asynchronously.
+    ASSERT(m_responseDocumentParser);
+    ASSERT(!m_responseDocumentParser->isParsing());
+    ASSERT(!m_responseLegacyStream);
+    ASSERT(!m_responseStream);
+
+    m_responseDocumentParser = nullptr;
+    m_responseDocument->implicitClose();
+
+    if (!m_responseDocument->wellFormed())
+        m_responseDocument = nullptr;
+
+    m_parsedResponse = true;
+
+    endLoading();
+}
+
+void XMLHttpRequest::endLoading()
+{
     clearVariablesForLoading();
 
-    InspectorInstrumentation::didFinishXHRLoading(executionContext(), this, this, identifier, m_responseText, m_method, m_url, m_lastSendURL, m_lastSendLineNumber);
+    InspectorInstrumentation::didFinishXHRLoading(executionContext(), this, this, m_loaderIdentifier, m_responseText, m_method, m_url, m_lastSendURL, m_lastSendLineNumber);
 
     if (m_loader)
         m_loader = nullptr;
+    m_loaderIdentifier = 0;
 
     changeState(DONE);
 }
 
 void XMLHttpRequest::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {
     WTF_LOG(Network, "XMLHttpRequest %p didSendData(%llu, %llu)", this, bytesSent, totalBytesToBeSent);
 
     if (!m_upload)
         return;
@@ skipping 195 matching lines @@
     visitor->trace(m_responseStream);
     visitor->trace(m_streamSource);
     visitor->trace(m_responseDocument);
     visitor->trace(m_responseDocumentParser);
     visitor->trace(m_progressEventThrottle);
     visitor->trace(m_upload);
     XMLHttpRequestEventTarget::trace(visitor);
 }
 
 } // namespace blink