| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 , m_encoding(encoding) | 49 , m_encoding(encoding) |
| 50 , m_encodingWasChosenByUser(encodingUserChoosen) | 50 , m_encodingWasChosenByUser(encodingUserChoosen) |
| 51 { | 51 { |
| 52 } | 52 } |
| 53 | 53 |
| 54 TextResourceDecoderBuilder::~TextResourceDecoderBuilder() | 54 TextResourceDecoderBuilder::~TextResourceDecoderBuilder() |
| 55 { | 55 { |
| 56 } | 56 } |
| 57 | 57 |
| 58 | 58 |
| 59 inline PassRefPtr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoder
Instance(Document* document) | 59 inline PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoder
Instance(Document* document) |
| 60 { | 60 { |
| 61 if (Frame* frame = document->frame()) { | 61 if (Frame* frame = document->frame()) { |
| 62 if (Settings* settings = frame->settings()) | 62 if (Settings* settings = frame->settings()) |
| 63 return TextResourceDecoder::create(m_mimeType, settings->defaultText
EncodingName(), settings->usesEncodingDetector()); | 63 return TextResourceDecoder::create(m_mimeType, settings->defaultText
EncodingName(), settings->usesEncodingDetector()); |
| 64 } | 64 } |
| 65 | 65 |
| 66 return TextResourceDecoder::create(m_mimeType, String()); | 66 return TextResourceDecoder::create(m_mimeType, String()); |
| 67 } | 67 } |
| 68 | 68 |
| 69 inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod
er, Document* document) | 69 inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod
er, Document* document) |
| (...skipping 15 matching lines...) Expand all Loading... |
| 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(), TextR
esourceDecoder::EncodingFromParentFrame); |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 | 94 |
| 95 PassRefPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* d
ocument) | 95 PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* d
ocument) |
| 96 { | 96 { |
| 97 RefPtr<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 = String(); | 105 m_encoding = String(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 } | 108 } |
| OLD | NEW |