| 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 // that can be mistaken for hintEncoding (or related encoding) by | 81 // that can be mistaken for hintEncoding (or related encoding) by |
| 82 // an auto detector. When interpreted in the latter, it could be | 82 // an auto detector. When interpreted in the latter, it could be |
| 83 // an attack vector. | 83 // an attack vector. |
| 84 // FIXME: This might be too cautious for non-7bit-encodings and | 84 // FIXME: This might be too cautious for non-7bit-encodings and |
| 85 // we may consider relaxing this later after testing. | 85 // we may consider relaxing this later after testing. |
| 86 if (frame && canReferToParentFrameEncoding(frame, parentFrame)) { | 86 if (frame && canReferToParentFrameEncoding(frame, parentFrame)) { |
| 87 if (parentFrame->document()->encodingWasDetectedHeuristically()) | 87 if (parentFrame->document()->encodingWasDetectedHeuristically()) |
| 88 decoder->setHintEncoding(parentFrame->document()->encoding()); | 88 decoder->setHintEncoding(parentFrame->document()->encoding()); |
| 89 | 89 |
| 90 if (m_encoding.isEmpty()) | 90 if (m_encoding.isEmpty()) |
| 91 decoder->setEncoding(parentFrame->document()->inputEncoding(), TextR
esourceDecoder::EncodingFromParentFrame); | 91 decoder->setEncoding(parentFrame->document()->inputEncoding().string
(), TextResourceDecoder::EncodingFromParentFrame); |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 | 94 |
| 95 PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* d
ocument) | 95 PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* d
ocument) |
| 96 { | 96 { |
| 97 OwnPtr<TextResourceDecoder> decoder = createDecoderInstance(document); | 97 OwnPtr<TextResourceDecoder> decoder = createDecoderInstance(document); |
| 98 setupEncoding(decoder.get(), document); | 98 setupEncoding(decoder.get(), document); |
| 99 return decoder.release(); | 99 return decoder.release(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void TextResourceDecoderBuilder::clear() | 102 void TextResourceDecoderBuilder::clear() |
| 103 { | 103 { |
| 104 if (!m_encodingWasChosenByUser) | 104 if (!m_encodingWasChosenByUser) |
| 105 m_encoding = nullAtom; | 105 m_encoding = nullAtom; |
| 106 } | 106 } |
| 107 | 107 |
| 108 } | 108 } |
| OLD | NEW |