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