| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "core/dom/DecodedDataDocumentParser.h" | 27 #include "core/dom/DecodedDataDocumentParser.h" |
| 28 | 28 |
| 29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
| 30 #include "core/dom/DocumentEncodingData.h" | 30 #include "core/dom/DocumentEncodingData.h" |
| 31 #include "core/fetch/TextResourceDecoder.h" | 31 #include "core/fetch/TextResourceDecoder.h" |
| 32 | 32 |
| 33 namespace WebCore { | 33 namespace WebCore { |
| 34 | 34 |
| 35 DecodedDataDocumentParser::DecodedDataDocumentParser(Document* document) | 35 DecodedDataDocumentParser::DecodedDataDocumentParser(Document* document) |
| 36 : DocumentParser(document) | 36 : DocumentParser(document) |
| 37 , m_hasAppendedData(false) | 37 , m_needsDecoder(true) |
| 38 { | 38 { |
| 39 } | 39 } |
| 40 | 40 |
| 41 DecodedDataDocumentParser::~DecodedDataDocumentParser() | 41 DecodedDataDocumentParser::~DecodedDataDocumentParser() |
| 42 { | 42 { |
| 43 } | 43 } |
| 44 | 44 |
| 45 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decod
er) | 45 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decod
er) |
| 46 { | 46 { |
| 47 m_needsDecoder = false; |
| 47 m_decoder = decoder; | 48 m_decoder = decoder; |
| 48 } | 49 } |
| 49 | 50 |
| 50 TextResourceDecoder* DecodedDataDocumentParser::decoder() | 51 TextResourceDecoder* DecodedDataDocumentParser::decoder() |
| 51 { | 52 { |
| 52 return m_decoder.get(); | 53 return m_decoder.get(); |
| 53 } | 54 } |
| 54 | 55 |
| 55 void DecodedDataDocumentParser::setHasAppendedData() | 56 PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder() |
| 56 { | 57 { |
| 57 m_hasAppendedData = true; | 58 return m_decoder.release(); |
| 58 } | 59 } |
| 59 | 60 |
| 60 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length) | 61 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length) |
| 61 { | 62 { |
| 62 if (!length) | 63 if (!length) |
| 63 return; | 64 return; |
| 64 | 65 |
| 65 // This should be checking isStopped(), but XMLDocumentParser prematurely | 66 // This should be checking isStopped(), but XMLDocumentParser prematurely |
| 66 // stops parsing when handling an XSLT processing instruction and still | 67 // stops parsing when handling an XSLT processing instruction and still |
| 67 // needs to receive decoded bytes. | 68 // needs to receive decoded bytes. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 84 // We have nothing to do in that case. | 85 // We have nothing to do in that case. |
| 85 if (!m_decoder) | 86 if (!m_decoder) |
| 86 return; | 87 return; |
| 87 | 88 |
| 88 String remainingData = m_decoder->flush(); | 89 String remainingData = m_decoder->flush(); |
| 89 updateDocument(remainingData); | 90 updateDocument(remainingData); |
| 90 } | 91 } |
| 91 | 92 |
| 92 void DecodedDataDocumentParser::updateDocument(String& decodedData) | 93 void DecodedDataDocumentParser::updateDocument(String& decodedData) |
| 93 { | 94 { |
| 94 DocumentEncodingData encodingData; | 95 document()->setEncodingData(DocumentEncodingData(*m_decoder.get())); |
| 95 encodingData.encoding = m_decoder->encoding(); | |
| 96 encodingData.wasDetectedHeuristically = m_decoder->encodingWasDetectedHeuris
tically(); | |
| 97 encodingData.sawDecodingError = m_decoder->sawError(); | |
| 98 document()->setEncodingData(encodingData); | |
| 99 | 96 |
| 100 if (decodedData.isEmpty()) | 97 if (!decodedData.isEmpty()) |
| 101 return; | 98 append(decodedData.releaseImpl()); |
| 102 | |
| 103 append(decodedData.releaseImpl()); | |
| 104 // FIXME: Should be removed as part of https://code.google.com/p/chromium/is
sues/detail?id=319643 | |
| 105 if (!m_hasAppendedData) { | |
| 106 m_hasAppendedData = true; | |
| 107 if (m_decoder->encoding().usesVisualOrdering()) | |
| 108 document()->setVisuallyOrdered(); | |
| 109 } | |
| 110 } | 99 } |
| 111 | 100 |
| 112 }; | 101 }; |
| OLD | NEW |