| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/fetch/TextResource.h" | 6 #include "core/fetch/TextResource.h" |
| 7 | 7 |
| 8 #include "core/html/parser/TextResourceDecoder.h" | 8 #include "core/html/parser/TextResourceDecoder.h" |
| 9 #include "platform/SharedBuffer.h" | 9 #include "platform/SharedBuffer.h" |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 String TextResource::encoding() const | 28 String TextResource::encoding() const |
| 29 { | 29 { |
| 30 return m_decoder->encoding().name(); | 30 return m_decoder->encoding().name(); |
| 31 } | 31 } |
| 32 | 32 |
| 33 String TextResource::decodedText() const | 33 String TextResource::decodedText() const |
| 34 { | 34 { |
| 35 ASSERT(m_data); | 35 ASSERT(m_data); |
| 36 | 36 |
| 37 String text = m_decoder->decode(m_data->data(), encodedSize()); | 37 String text = m_decoder->decode(m_data->data(), encodedSize()); |
| 38 text = text + m_decoder->flush(); | 38 text.append(m_decoder->flush()); |
| 39 | |
| 40 return text; | 39 return text; |
| 41 } | 40 } |
| 42 | 41 |
| 43 } // namespace blink | 42 } // namespace blink |
| OLD | NEW |