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 23 matching lines...) Expand all Loading... | |
34 #include "bindings/v8/ExceptionStatePlaceholder.h" | 34 #include "bindings/v8/ExceptionStatePlaceholder.h" |
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/fileapi/File.h" | 37 #include "core/fileapi/File.h" |
38 #include "core/fileapi/FileError.h" | 38 #include "core/fileapi/FileError.h" |
39 #include "core/fileapi/FileReader.h" | 39 #include "core/fileapi/FileReader.h" |
40 #include "core/frame/LocalFrame.h" | 40 #include "core/frame/LocalFrame.h" |
41 #include "core/html/VoidCallback.h" | 41 #include "core/html/VoidCallback.h" |
42 #include "core/html/parser/TextResourceDecoder.h" | 42 #include "core/html/parser/TextResourceDecoder.h" |
43 #include "core/inspector/InspectorState.h" | 43 #include "core/inspector/InspectorState.h" |
44 #include "core/page/Page.h" | |
sof
2014/06/06 20:32:41
Why is this needed now? (just trying to understand
jam
2014/06/09 19:09:33
because I removed it from LocalFileSystem.h
| |
44 #include "modules/filesystem/DOMFileSystem.h" | 45 #include "modules/filesystem/DOMFileSystem.h" |
45 #include "modules/filesystem/DirectoryEntry.h" | 46 #include "modules/filesystem/DirectoryEntry.h" |
46 #include "modules/filesystem/DirectoryReader.h" | 47 #include "modules/filesystem/DirectoryReader.h" |
47 #include "modules/filesystem/EntriesCallback.h" | 48 #include "modules/filesystem/EntriesCallback.h" |
48 #include "modules/filesystem/Entry.h" | 49 #include "modules/filesystem/Entry.h" |
49 #include "modules/filesystem/EntryCallback.h" | 50 #include "modules/filesystem/EntryCallback.h" |
50 #include "modules/filesystem/ErrorCallback.h" | 51 #include "modules/filesystem/ErrorCallback.h" |
51 #include "modules/filesystem/FileCallback.h" | 52 #include "modules/filesystem/FileCallback.h" |
52 #include "modules/filesystem/FileEntry.h" | 53 #include "modules/filesystem/FileEntry.h" |
53 #include "modules/filesystem/FileSystemCallbacks.h" | 54 #include "modules/filesystem/FileSystemCallbacks.h" |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
720 LocalFrame* localFrame = toLocalFrame(frame); | 721 LocalFrame* localFrame = toLocalFrame(frame); |
721 if (localFrame->document() && localFrame->document()->securityOrigin()-> isSameSchemeHostPort(origin)) | 722 if (localFrame->document() && localFrame->document()->securityOrigin()-> isSameSchemeHostPort(origin)) |
722 return localFrame->document(); | 723 return localFrame->document(); |
723 } | 724 } |
724 | 725 |
725 *error = "No frame is available for the request"; | 726 *error = "No frame is available for the request"; |
726 return 0; | 727 return 0; |
727 } | 728 } |
728 | 729 |
729 } // namespace WebCore | 730 } // namespace WebCore |
OLD | NEW |