OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2010. Adam Barth. All rights reserved. | 2 * Copyright (C) 2010. Adam Barth. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 26 matching lines...) Expand all Loading... | |
37 #include "core/frame/Settings.h" | 37 #include "core/frame/Settings.h" |
38 #include "core/html/parser/TextResourceDecoder.h" | 38 #include "core/html/parser/TextResourceDecoder.h" |
39 #include "core/loader/FrameLoader.h" | 39 #include "core/loader/FrameLoader.h" |
40 #include "core/loader/FrameLoaderStateMachine.h" | 40 #include "core/loader/FrameLoaderStateMachine.h" |
41 #include "platform/weborigin/KURL.h" | 41 #include "platform/weborigin/KURL.h" |
42 #include "platform/weborigin/SecurityOrigin.h" | 42 #include "platform/weborigin/SecurityOrigin.h" |
43 #include "wtf/PassOwnPtr.h" | 43 #include "wtf/PassOwnPtr.h" |
44 | 44 |
45 namespace blink { | 45 namespace blink { |
46 | 46 |
47 PassRefPtrWillBeRawPtr<DocumentWriter> DocumentWriter::create(Document* document , const AtomicString& mimeType, const AtomicString& encoding) | 47 PassRefPtrWillBeRawPtr<DocumentWriter> DocumentWriter::create(Document* document , ParserSynchronizationPolicy parsingPolicy, const AtomicString& mimeType, const AtomicString& encoding) |
48 { | 48 { |
49 return adoptRefWillBeNoop(new DocumentWriter(document, mimeType, encoding)); | 49 return adoptRefWillBeNoop(new DocumentWriter(document, parsingPolicy, mimeTy pe, encoding)); |
50 } | 50 } |
51 | 51 |
52 DocumentWriter::DocumentWriter(Document* document, const AtomicString& mimeType, const AtomicString& encoding) | 52 DocumentWriter::DocumentWriter(Document* document, ParserSynchronizationPolicy p arsingPolicy, const AtomicString& mimeType, const AtomicString& encoding) |
53 : m_document(document) | 53 : m_document(document) |
54 , m_decoderBuilder(mimeType, encoding) | 54 , m_decoderBuilder(mimeType, encoding) |
55 , m_forcedSynchronousParse(parsingPolicy == ForceSynchronousParsing) | |
56 { | |
57 if (m_forcedSynchronousParse) | |
58 m_document->forceSynchronousParsing(); | |
59 | |
55 // We grab a reference to the parser so that we'll always send data to the | 60 // We grab a reference to the parser so that we'll always send data to the |
56 // original parser, even if the document acquires a new parser (e.g., via | 61 // original parser, even if the document acquires a new parser (e.g., via |
57 // document.open). | 62 // document.open). |
58 , m_parser(m_document->implicitOpen()) | 63 m_parser = m_document->implicitOpen(); |
kbalazs
2014/12/05 23:37:57
moved out from initializer list because forceSyncP
| |
59 , m_forcedSynchronousParse(false) | 64 |
60 { | |
61 if (m_document->frame()) { | 65 if (m_document->frame()) { |
62 if (FrameView* view = m_document->frame()->view()) | 66 if (FrameView* view = m_document->frame()->view()) |
63 view->setContentsSize(IntSize()); | 67 view->setContentsSize(IntSize()); |
64 } | 68 } |
65 } | 69 } |
66 | 70 |
67 DocumentWriter::~DocumentWriter() | 71 DocumentWriter::~DocumentWriter() |
68 { | 72 { |
69 } | 73 } |
70 | 74 |
71 void DocumentWriter::trace(Visitor* visitor) | 75 void DocumentWriter::trace(Visitor* visitor) |
72 { | 76 { |
73 visitor->trace(m_document); | 77 visitor->trace(m_document); |
74 visitor->trace(m_parser); | 78 visitor->trace(m_parser); |
75 } | 79 } |
76 | 80 |
77 void DocumentWriter::forceSynchronousParse() | |
78 { | |
79 ASSERT(!m_forcedSynchronousParse); | |
80 | |
81 ASSERT(m_parser); | |
82 m_parser->pinToMainThread(); | |
83 m_forcedSynchronousParse = true; | |
84 } | |
85 | |
86 void DocumentWriter::appendReplacingData(const String& source) | 81 void DocumentWriter::appendReplacingData(const String& source) |
87 { | 82 { |
88 m_document->setCompatibilityMode(Document::NoQuirksMode); | 83 m_document->setCompatibilityMode(Document::NoQuirksMode); |
89 | 84 |
90 // FIXME: This should call DocumentParser::appendBytes instead of append | 85 // FIXME: This should call DocumentParser::appendBytes instead of append |
91 // to support RawDataDocumentParsers. | 86 // to support RawDataDocumentParsers. |
92 if (DocumentParser* parser = m_document->parser()) { | 87 if (DocumentParser* parser = m_document->parser()) { |
93 if (!m_forcedSynchronousParse) | 88 // Because the parser is pinned to the main thread we don't need to worr y about |
94 forceSynchronousParse(); | |
95 // Because we're pinned to the main thread we don't need to worry about | |
96 // passing ownership of the source string. | 89 // passing ownership of the source string. |
90 ASSERT(m_forcedSynchronousParse); | |
97 parser->append(source.impl()); | 91 parser->append(source.impl()); |
98 } | 92 } |
99 } | 93 } |
100 | 94 |
101 void DocumentWriter::addData(const char* bytes, size_t length) | 95 void DocumentWriter::addData(const char* bytes, size_t length) |
102 { | 96 { |
103 ASSERT(m_parser); | 97 ASSERT(m_parser); |
104 if (m_parser->needsDecoder() && 0 < length) { | 98 if (m_parser->needsDecoder() && 0 < length) { |
105 OwnPtr<TextResourceDecoder> decoder = m_decoderBuilder.buildFor(m_docume nt); | 99 OwnPtr<TextResourceDecoder> decoder = m_decoderBuilder.buildFor(m_docume nt); |
106 m_parser->setDecoder(decoder.release()); | 100 m_parser->setDecoder(decoder.release()); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
141 decoder->setEncoding(charset, TextResourceDecoder::UserChosenEncoding); | 135 decoder->setEncoding(charset, TextResourceDecoder::UserChosenEncoding); |
142 } | 136 } |
143 | 137 |
144 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation() | 138 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation() |
145 { | 139 { |
146 ASSERT(m_parser && !m_parser->isStopped()); | 140 ASSERT(m_parser && !m_parser->isStopped()); |
147 m_parser->setDocumentWasLoadedAsPartOfNavigation(); | 141 m_parser->setDocumentWasLoadedAsPartOfNavigation(); |
148 } | 142 } |
149 | 143 |
150 } // namespace blink | 144 } // namespace blink |
OLD | NEW |