OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 29 matching lines...) Expand all Loading... |
40 namespace WTF { template <typename T> class PassOwnPtr; } | 40 namespace WTF { template <typename T> class PassOwnPtr; } |
41 #endif | 41 #endif |
42 | 42 |
43 namespace WebKit { | 43 namespace WebKit { |
44 | 44 |
45 class WebBlobDataPrivate; | 45 class WebBlobDataPrivate; |
46 | 46 |
47 class WebBlobData { | 47 class WebBlobData { |
48 public: | 48 public: |
49 struct Item { | 49 struct Item { |
50 enum { TypeData, TypeFile, TypeBlob, TypeURL } type; | 50 enum { TypeData, TypeFile, TypeBlob, TypeFileSystemURL } type; |
51 WebThreadSafeData data; | 51 WebThreadSafeData data; |
52 WebString filePath; | 52 WebString filePath; |
53 WebURL url; // For TypeBlob or TypeURL. | 53 WebURL fileSystemURL; |
| 54 WebString blobUUID; |
54 long long offset; | 55 long long offset; |
55 long long length; // -1 means go to the end of the file/blob. | 56 long long length; // -1 means go to the end of the file/blob. |
56 double expectedModificationTime; // 0.0 means that the time is not set. | 57 double expectedModificationTime; // 0.0 means that the time is not set. |
57 | |
58 // FIXME: deprecate this. | |
59 WebURL blobURL; | |
60 }; | 58 }; |
61 | 59 |
62 ~WebBlobData() { reset(); } | 60 ~WebBlobData() { reset(); } |
63 | 61 |
64 WebBlobData() : m_private(0) { } | 62 WebBlobData() : m_private(0) { } |
65 | 63 |
66 WEBKIT_EXPORT void initialize(); | 64 WEBKIT_EXPORT void initialize(); |
67 WEBKIT_EXPORT void reset(); | 65 WEBKIT_EXPORT void reset(); |
68 | 66 |
69 bool isNull() const { return !m_private; } | 67 bool isNull() const { return !m_private; } |
(...skipping 18 matching lines...) Expand all Loading... |
88 private: | 86 private: |
89 #if WEBKIT_IMPLEMENTATION | 87 #if WEBKIT_IMPLEMENTATION |
90 void assign(const WTF::PassOwnPtr<WebCore::BlobData>&); | 88 void assign(const WTF::PassOwnPtr<WebCore::BlobData>&); |
91 #endif | 89 #endif |
92 WebBlobDataPrivate* m_private; | 90 WebBlobDataPrivate* m_private; |
93 }; | 91 }; |
94 | 92 |
95 } // namespace WebKit | 93 } // namespace WebKit |
96 | 94 |
97 #endif // WebBlobData_h | 95 #endif // WebBlobData_h |
OLD | NEW |