Chromium Code Reviews| 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 17 matching lines...) Expand all Loading... | |
| 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_hasAppendedData(false) |
| 38 , m_needsDecoder(true) | |
| 38 { | 39 { |
| 39 } | 40 } |
| 40 | 41 |
| 41 DecodedDataDocumentParser::~DecodedDataDocumentParser() | 42 DecodedDataDocumentParser::~DecodedDataDocumentParser() |
| 42 { | 43 { |
| 43 } | 44 } |
| 44 | 45 |
| 45 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decod er) | 46 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decod er) |
| 46 { | 47 { |
| 48 m_needsDecoder = false; | |
| 47 m_decoder = decoder; | 49 m_decoder = decoder; |
| 48 } | 50 } |
| 49 | 51 |
| 50 TextResourceDecoder* DecodedDataDocumentParser::decoder() | 52 TextResourceDecoder* DecodedDataDocumentParser::decoder() |
| 51 { | 53 { |
| 52 return m_decoder.get(); | 54 return m_decoder.get(); |
| 53 } | 55 } |
| 54 | 56 |
| 57 PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::adoptDecoder() | |
|
eseidel
2013/11/18 20:07:40
Maybe takeDecoder()? Not quite sure what this is
oystein (OOO til 10th of July)
2013/11/18 22:18:42
Done.
| |
| 58 { | |
| 59 return m_decoder.release(); | |
| 60 } | |
| 61 | |
| 55 void DecodedDataDocumentParser::setHasAppendedData() | 62 void DecodedDataDocumentParser::setHasAppendedData() |
| 56 { | 63 { |
| 57 m_hasAppendedData = true; | 64 m_hasAppendedData = true; |
| 58 } | 65 } |
| 59 | 66 |
| 60 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length) | 67 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length) |
| 61 { | 68 { |
| 62 if (!length) | 69 if (!length) |
| 63 return; | 70 return; |
| 64 | 71 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 | 109 |
| 103 append(decodedData.releaseImpl()); | 110 append(decodedData.releaseImpl()); |
| 104 if (!m_hasAppendedData) { | 111 if (!m_hasAppendedData) { |
| 105 m_hasAppendedData = true; | 112 m_hasAppendedData = true; |
| 106 if (m_decoder->encoding().usesVisualOrdering()) | 113 if (m_decoder->encoding().usesVisualOrdering()) |
| 107 document()->setVisuallyOrdered(); | 114 document()->setVisuallyOrdered(); |
| 108 } | 115 } |
| 109 } | 116 } |
| 110 | 117 |
| 111 }; | 118 }; |
| OLD | NEW |