Threaded data provider: Support main thread data notifications (Blink side)

Source/core/html/parser/HTMLDocumentParser.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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/parser/HTMLDocumentParser.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/dom/DocumentFragment.h"
+#include "core/dom/DocumentLifecycleNotifier.h"
 #include "core/dom/Element.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/parser/AtomicHTMLToken.h"
 #include "core/html/parser/BackgroundHTMLParser.h"
 #include "core/html/parser/HTMLParserScheduler.h"
 #include "core/html/parser/HTMLParserThread.h"
 #include "core/html/parser/HTMLScriptRunner.h"
 #include "core/html/parser/HTMLTreeBuilder.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ skipping 27 matching lines @@
         || (contextTag.matches(noscriptTag) && options.scriptEnabled)
         || contextTag.matches(noframesTag))
         return reportErrors ? HTMLTokenizer::RAWTEXTState : HTMLTokenizer::PLAINTEXTState;
     if (contextTag.matches(scriptTag))
         return reportErrors ? HTMLTokenizer::ScriptDataState : HTMLTokenizer::PLAINTEXTState;
     if (contextTag.matches(plaintextTag))
         return HTMLTokenizer::PLAINTEXTState;
     return HTMLTokenizer::DataState;
 }
 
-class ParserDataReceiver : public blink::WebThreadedDataReceiver {
+class ParserDataReceiver : public WebThreadedDataReceiver, public DocumentLifecycleObserver {
 public:
-    explicit ParserDataReceiver(WeakPtr<BackgroundHTMLParser> backgroundParser)
-        : m_backgroundParser(backgroundParser)
+    explicit ParserDataReceiver(WeakPtr<BackgroundHTMLParser> backgroundParser, Document* document)
+        : DocumentLifecycleObserver(document)
+        , m_backgroundParser(backgroundParser)
+        , m_document(document)
     {
+        ASSERT(document);
+        document->lifecycleNotifier().addObserver(this);

[haraken, 2015/01/16 01:01:59]

This won't be needed. DocumentLifecycleObserver's constructor will register the
observer to the notifier.

[oystein (OOO til 10th of July), 2015/01/16 04:31:49]

Done.

+    }
+
+    virtual ~ParserDataReceiver()
+    {
+        if (m_document)
+            m_document->lifecycleNotifier().removeObserver(this);

[haraken, 2015/01/16 01:01:59]

Ditto. DocumentLifecycleObserver's destructor will do the removal.

[oystein (OOO til 10th of July), 2015/01/16 04:31:49]

Done.

+    }
+
+    // DocumentLifecycleObserver
+    virtual void documentWasDetached() override final
+    {
+        m_document = nullptr;
     }
 
     // WebThreadedDataReceiver
     virtual void acceptData(const char* data, int dataLength) override final
     {
         ASSERT(backgroundThread() && backgroundThread()->isCurrentThread());
         if (m_backgroundParser.get())
             m_backgroundParser.get()->appendRawBytesFromParserThread(data, dataLength);
     }
 
     virtual blink::WebThread* backgroundThread() override final
     {
         if (HTMLParserThread::shared())
             return &HTMLParserThread::shared()->platformThread();
 
         return nullptr;
     }
 
+    virtual bool needsMainthreadDataCopy() override final { return InspectorInstrumentation::hasFrontends(); }
+    virtual void acceptMainthreadDataNotification(const char* data, int dataLength, int encodedDataLength) override final
+    {
+        ASSERT(!data || needsMainthreadDataCopy());
+        if (m_document)
+            m_document->loader()->acceptDataFromThreadedReceiver(data, dataLength, encodedDataLength);
+    }
+
 private:
     WeakPtr<BackgroundHTMLParser> m_backgroundParser;
+    Document* m_document;

[haraken, 2015/01/16 01:01:59]

Remove this. Instead you should use
DocumentLifecycleObserver::lifecycleContext().

[oystein (OOO til 10th of July), 2015/01/16 04:31:49]

Done.

 };
 
 HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors, ParserSynchronizationPolicy syncPolicy)
     : ScriptableDocumentParser(document)
     , m_options(&document)
     , m_token(syncPolicy == ForceSynchronousParsing ? adoptPtr(new HTMLToken) : nullptr)
     , m_tokenizer(syncPolicy == ForceSynchronousParsing ? HTMLTokenizer::create(m_options) : nullptr)
     , m_scriptRunner(HTMLScriptRunner::create(&document, this))
     , m_treeBuilder(HTMLTreeBuilder::create(this, &document, parserContentPolicy(), reportErrors, m_options))
     , m_parserScheduler(HTMLParserScheduler::create(this))
@@ skipping 608 matching lines @@
     ASSERT(shouldUseThreading());
     ASSERT(!m_haveBackgroundParser);
     m_haveBackgroundParser = true;
 
     RefPtr<WeakReference<BackgroundHTMLParser>> reference = WeakReference<BackgroundHTMLParser>::createUnbound();
     m_backgroundParser = WeakPtr<BackgroundHTMLParser>(reference);
 
     // TODO(oysteine): Disabled due to crbug.com/398076 until a full fix can be implemented.
     if (RuntimeEnabledFeatures::threadedParserDataReceiverEnabled()) {
         if (DocumentLoader* loader = document()->loader())
-            loader->attachThreadedDataReceiver(adoptPtr(new ParserDataReceiver(m_backgroundParser)));
+            loader->attachThreadedDataReceiver(adoptPtr(new ParserDataReceiver(m_backgroundParser, document()->contextDocument().get())));
     }
 
     OwnPtr<BackgroundHTMLParser::Configuration> config = adoptPtr(new BackgroundHTMLParser::Configuration);
     config->options = m_options;
     config->parser = m_weakFactory.createWeakPtr();
     config->xssAuditor = adoptPtr(new XSSAuditor);
     config->xssAuditor->init(document(), &m_xssAuditorDelegate);
     config->preloadScanner = adoptPtr(new TokenPreloadScanner(document()->url().copy(), createMediaValues(document())));
     config->decoder = takeDecoder();
 
@@ skipping 320 matching lines @@
 void HTMLDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decoder)
 {
     ASSERT(decoder);
     DecodedDataDocumentParser::setDecoder(decoder);
 
     if (m_haveBackgroundParser)
         HTMLParserThread::shared()->postTask(bind(&BackgroundHTMLParser::setDecoder, m_backgroundParser, takeDecoder()));
 }
 
 }