| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 RefPtr<ArrayBuffer> buffer = m_reader->arrayBufferResult(); | 484 RefPtr<ArrayBuffer> buffer = m_reader->arrayBufferResult(); |
| 485 | 485 |
| 486 if (!m_readAsText) { | 486 if (!m_readAsText) { |
| 487 String result = base64Encode(static_cast<char*>(buffer->data()), buffer-
>byteLength()); | 487 String result = base64Encode(static_cast<char*>(buffer->data()), buffer-
>byteLength()); |
| 488 reportResult(static_cast<FileError::ErrorCode>(0), &result, 0); | 488 reportResult(static_cast<FileError::ErrorCode>(0), &result, 0); |
| 489 return; | 489 return; |
| 490 } | 490 } |
| 491 | 491 |
| 492 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType
, m_charset, true); | 492 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType
, m_charset, true); |
| 493 String result = decoder->decode(static_cast<char*>(buffer->data()), buffer->
byteLength()); | 493 String result = decoder->decode(static_cast<char*>(buffer->data()), buffer->
byteLength()); |
| 494 result.append(decoder->flush()); | 494 result = result + decoder->flush(); |
| 495 m_charset = decoder->encoding().name(); | 495 m_charset = decoder->encoding().name(); |
| 496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset); | 496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset); |
| 497 } | 497 } |
| 498 | 498 |
| 499 class DeleteEntryRequest : public RefCounted<DeleteEntryRequest> { | 499 class DeleteEntryRequest : public RefCounted<DeleteEntryRequest> { |
| 500 public: | 500 public: |
| 501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback>
requestCallback, const KURL& url) | 501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback>
requestCallback, const KURL& url) |
| 502 { | 502 { |
| 503 return adoptRef(new DeleteEntryRequest(requestCallback, url)); | 503 return adoptRef(new DeleteEntryRequest(requestCallback, url)); |
| 504 } | 504 } |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().t
raverseNext()) { | 720 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().t
raverseNext()) { |
| 721 if (frame->document() && frame->document()->securityOrigin()->isSameSche
meHostPort(origin)) | 721 if (frame->document() && frame->document()->securityOrigin()->isSameSche
meHostPort(origin)) |
| 722 return frame->document(); | 722 return frame->document(); |
| 723 } | 723 } |
| 724 | 724 |
| 725 *error = "No frame is available for the request"; | 725 *error = "No frame is available for the request"; |
| 726 return 0; | 726 return 0; |
| 727 } | 727 } |
| 728 | 728 |
| 729 } // namespace WebCore | 729 } // namespace WebCore |
| OLD | NEW |