Turn DocumentParser::pinToMainThread into a cleaner api

Source/core/loader/DocumentWriter.cpp

 /*
  * Copyright (C) 2010. Adam Barth. 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
@@ skipping 26 matching lines @@
 #include "core/frame/Settings.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderStateMachine.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<DocumentWriter> DocumentWriter::create(Document* document, const AtomicString& mimeType, const AtomicString& encoding)
+PassRefPtrWillBeRawPtr<DocumentWriter> DocumentWriter::create(Document* document, ParserSynchronizationPolicy parsingPolicy, const AtomicString& mimeType, const AtomicString& encoding)
 {
-    return adoptRefWillBeNoop(new DocumentWriter(document, mimeType, encoding));
+    return adoptRefWillBeNoop(new DocumentWriter(document, parsingPolicy, mimeType, encoding));
 }
 
-DocumentWriter::DocumentWriter(Document* document, const AtomicString& mimeType, const AtomicString& encoding)
+DocumentWriter::DocumentWriter(Document* document, ParserSynchronizationPolicy parsingPolicy, const AtomicString& mimeType, const AtomicString& encoding)
     : m_document(document)
     , m_decoderBuilder(mimeType, encoding)
+    , m_forcedSynchronousParse(parsingPolicy == ForceSynchronousParsing)
+{
+    if (m_forcedSynchronousParse)
+        m_document->forceSynchronousParsing();
+
     // We grab a reference to the parser so that we'll always send data to the
     // original parser, even if the document acquires a new parser (e.g., via
     // document.open).
-    , m_parser(m_document->implicitOpen())
-    , m_forcedSynchronousParse(false)
-{
+    m_parser = m_document->implicitOpen();

[kbalazs, 2014/12/05 23:37:57]

moved out from initializer list because forceSyncParse has to be called on the
document before.

+
     if (m_document->frame()) {
         if (FrameView* view = m_document->frame()->view())
             view->setContentsSize(IntSize());
     }
 }
 
 DocumentWriter::~DocumentWriter()
 {
 }
 
 void DocumentWriter::trace(Visitor* visitor)
 {
     visitor->trace(m_document);
     visitor->trace(m_parser);
 }
 
-void DocumentWriter::forceSynchronousParse()
-{
-    ASSERT(!m_forcedSynchronousParse);
-
-    ASSERT(m_parser);
-    m_parser->pinToMainThread();
-    m_forcedSynchronousParse = true;
-}
-
 void DocumentWriter::appendReplacingData(const String& source)
 {
     m_document->setCompatibilityMode(Document::NoQuirksMode);
 
     // FIXME: This should call DocumentParser::appendBytes instead of append
     // to support RawDataDocumentParsers.
     if (DocumentParser* parser = m_document->parser()) {
-        if (!m_forcedSynchronousParse)
-            forceSynchronousParse();
-        // Because we're pinned to the main thread we don't need to worry about
+        // Because the parser is pinned to the main thread we don't need to worry about
         // passing ownership of the source string.
+        ASSERT(m_forcedSynchronousParse);
         parser->append(source.impl());
     }
 }
 
 void DocumentWriter::addData(const char* bytes, size_t length)
 {
     ASSERT(m_parser);
     if (m_parser->needsDecoder() && 0 < length) {
         OwnPtr<TextResourceDecoder> decoder = m_decoderBuilder.buildFor(m_document);
         m_parser->setDecoder(decoder.release());
@@ skipping 34 matching lines @@
         decoder->setEncoding(charset, TextResourceDecoder::UserChosenEncoding);
 }
 
 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation()
 {
     ASSERT(m_parser && !m_parser->isStopped());
     m_parser->setDocumentWasLoadedAsPartOfNavigation();
 }
 
 } // namespace blink