| 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 24 matching lines...) Expand all Loading... |
| 35 #include "core/dom/DOMImplementation.h" | 35 #include "core/dom/DOMImplementation.h" |
| 36 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 37 #include "core/events/Event.h" | 37 #include "core/events/Event.h" |
| 38 #include "core/fileapi/File.h" | 38 #include "core/fileapi/File.h" |
| 39 #include "core/fileapi/FileError.h" | 39 #include "core/fileapi/FileError.h" |
| 40 #include "core/fileapi/FileReader.h" | 40 #include "core/fileapi/FileReader.h" |
| 41 #include "core/frame/LocalFrame.h" | 41 #include "core/frame/LocalFrame.h" |
| 42 #include "core/html/VoidCallback.h" | 42 #include "core/html/VoidCallback.h" |
| 43 #include "core/html/parser/TextResourceDecoder.h" | 43 #include "core/html/parser/TextResourceDecoder.h" |
| 44 #include "core/inspector/InspectorState.h" | 44 #include "core/inspector/InspectorState.h" |
| 45 #include "heap/Handle.h" |
| 45 #include "modules/filesystem/DOMFileSystem.h" | 46 #include "modules/filesystem/DOMFileSystem.h" |
| 46 #include "modules/filesystem/DirectoryEntry.h" | 47 #include "modules/filesystem/DirectoryEntry.h" |
| 47 #include "modules/filesystem/DirectoryReader.h" | 48 #include "modules/filesystem/DirectoryReader.h" |
| 48 #include "modules/filesystem/EntriesCallback.h" | 49 #include "modules/filesystem/EntriesCallback.h" |
| 49 #include "modules/filesystem/Entry.h" | 50 #include "modules/filesystem/Entry.h" |
| 50 #include "modules/filesystem/EntryCallback.h" | 51 #include "modules/filesystem/EntryCallback.h" |
| 51 #include "modules/filesystem/ErrorCallback.h" | 52 #include "modules/filesystem/ErrorCallback.h" |
| 52 #include "modules/filesystem/FileCallback.h" | 53 #include "modules/filesystem/FileCallback.h" |
| 53 #include "modules/filesystem/FileEntry.h" | 54 #include "modules/filesystem/FileEntry.h" |
| 54 #include "modules/filesystem/FileSystemCallbacks.h" | 55 #include "modules/filesystem/FileSystemCallbacks.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 toFileEntry(entry)->file(successCallback.release(), errorCallback.release())
; | 464 toFileEntry(entry)->file(successCallback.release(), errorCallback.release())
; |
| 464 | 465 |
| 465 m_reader = FileReader::create(entry->filesystem()->executionContext()); | 466 m_reader = FileReader::create(entry->filesystem()->executionContext()); |
| 466 m_mimeType = MIMETypeRegistry::getMIMETypeForPath(entry->name()); | 467 m_mimeType = MIMETypeRegistry::getMIMETypeForPath(entry->name()); |
| 467 | 468 |
| 468 return true; | 469 return true; |
| 469 } | 470 } |
| 470 | 471 |
| 471 bool FileContentRequest::didGetFile(File* file) | 472 bool FileContentRequest::didGetFile(File* file) |
| 472 { | 473 { |
| 473 RefPtr<Blob> blob = file->slice(m_start, m_end); | 474 RefPtrWillBeRawPtr<Blob> blob = file->slice(m_start, m_end); |
| 474 m_reader->setOnload(this); | 475 m_reader->setOnload(this); |
| 475 m_reader->setOnerror(this); | 476 m_reader->setOnerror(this); |
| 476 | 477 |
| 477 m_reader->readAsArrayBuffer(blob.get(), IGNORE_EXCEPTION); | 478 m_reader->readAsArrayBuffer(blob.get(), IGNORE_EXCEPTION); |
| 478 return true; | 479 return true; |
| 479 } | 480 } |
| 480 | 481 |
| 481 void FileContentRequest::didRead() | 482 void FileContentRequest::didRead() |
| 482 { | 483 { |
| 483 RefPtr<ArrayBuffer> buffer = m_reader->arrayBufferResult(); | 484 RefPtr<ArrayBuffer> buffer = m_reader->arrayBufferResult(); |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t
raverseNext()) { | 718 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t
raverseNext()) { |
| 718 if (frame->document() && frame->document()->securityOrigin()->isSameSche
meHostPort(origin)) | 719 if (frame->document() && frame->document()->securityOrigin()->isSameSche
meHostPort(origin)) |
| 719 return frame->document(); | 720 return frame->document(); |
| 720 } | 721 } |
| 721 | 722 |
| 722 *error = "No frame is available for the request"; | 723 *error = "No frame is available for the request"; |
| 723 return 0; | 724 return 0; |
| 724 } | 725 } |
| 725 | 726 |
| 726 } // namespace WebCore | 727 } // namespace WebCore |
| OLD | NEW |