| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2013 Google, Inc. 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/html/parser/BackgroundHTMLParser.h" | 27 #include "core/html/parser/BackgroundHTMLParser.h" |
| 28 | 28 |
| 29 #include "base/bind.h" |
| 30 #include "base/single_thread_task_runner.h" |
| 29 #include "core/html/parser/HTMLDocumentParser.h" | 31 #include "core/html/parser/HTMLDocumentParser.h" |
| 30 #include "core/html/parser/HTMLParserIdioms.h" | 32 #include "core/html/parser/HTMLParserIdioms.h" |
| 31 #include "core/html/parser/TextResourceDecoder.h" | 33 #include "core/html/parser/TextResourceDecoder.h" |
| 34 #include "public/platform/Platform.h" |
| 32 #include "wtf/MainThread.h" | 35 #include "wtf/MainThread.h" |
| 33 #include "wtf/text/TextPosition.h" | 36 #include "wtf/text/TextPosition.h" |
| 34 | 37 |
| 35 namespace blink { | 38 namespace blink { |
| 36 | 39 |
| 37 // We limit our chucks to 1000 tokens, to make sure the main | 40 // We limit our chucks to 1000 tokens, to make sure the main |
| 38 // thread is never waiting on the parser thread for tokens. | 41 // thread is never waiting on the parser thread for tokens. |
| 39 // This was tuned in https://bugs.webkit.org/show_bug.cgi?id=110408. | 42 // This was tuned in https://bugs.webkit.org/show_bug.cgi?id=110408. |
| 40 static const size_t pendingTokenLimit = 1000; | 43 static const size_t pendingTokenLimit = 1000; |
| 41 | 44 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 { | 148 { |
| 146 if (m_pendingTokens->isEmpty()) | 149 if (m_pendingTokens->isEmpty()) |
| 147 return; | 150 return; |
| 148 | 151 |
| 149 #if ENABLE(ASSERT) | 152 #if ENABLE(ASSERT) |
| 150 checkThatTokensAreSafeToSendToAnotherThread(m_pendingTokens.get()); | 153 checkThatTokensAreSafeToSendToAnotherThread(m_pendingTokens.get()); |
| 151 #endif | 154 #endif |
| 152 | 155 |
| 153 OwnPtr<HTMLDocumentParser::ParsedChunk> chunk = adoptPtr(new HTMLDocumentPar
ser::ParsedChunk); | 156 OwnPtr<HTMLDocumentParser::ParsedChunk> chunk = adoptPtr(new HTMLDocumentPar
ser::ParsedChunk); |
| 154 chunk->tokens = m_pendingTokens.release(); | 157 chunk->tokens = m_pendingTokens.release(); |
| 155 callOnMainThread(bind(&HTMLDocumentParser::didReceiveParsedChunkFromBackgrou
ndParser, m_parser, chunk.release())); | 158 Platform::current()->mainThreadTaskRunner()->PostTask(FROM_HERE, |
| 159 base::Bind(&HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParse
r, m_parser, chunk.release())); |
| 156 | 160 |
| 157 m_pendingTokens = adoptPtr(new CompactHTMLTokenStream); | 161 m_pendingTokens = adoptPtr(new CompactHTMLTokenStream); |
| 158 } | 162 } |
| 159 | 163 |
| 160 } | 164 } |
| OLD | NEW |