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 20 matching lines...) Expand all Loading... |
31 #ifndef WebBlobData_h | 31 #ifndef WebBlobData_h |
32 #define WebBlobData_h | 32 #define WebBlobData_h |
33 | 33 |
34 #include "WebNonCopyable.h" | 34 #include "WebNonCopyable.h" |
35 #include "WebPrivateOwnPtr.h" | 35 #include "WebPrivateOwnPtr.h" |
36 #include "WebString.h" | 36 #include "WebString.h" |
37 #include "WebThreadSafeData.h" | 37 #include "WebThreadSafeData.h" |
38 #include "WebURL.h" | 38 #include "WebURL.h" |
39 | 39 |
40 #if INSIDE_BLINK | 40 #if INSIDE_BLINK |
41 #include <memory> | 41 #include "wtf/OwnPtr.h" |
| 42 #include "wtf/PassOwnPtr.h" |
42 #endif | 43 #endif |
43 | 44 |
44 namespace blink { | 45 namespace blink { |
45 | 46 |
46 class BlobData; | 47 class BlobData; |
47 | 48 |
48 class WebBlobData : public WebNonCopyable { | 49 class WebBlobData : public WebNonCopyable { |
49 public: | 50 public: |
50 struct Item { | 51 struct Item { |
51 enum { TypeData, TypeFile, TypeBlob, TypeFileSystemURL } type; | 52 enum { TypeData, TypeFile, TypeBlob, TypeFileSystemURL } type; |
(...skipping 18 matching lines...) Expand all Loading... |
70 // index is out of bounds. | 71 // index is out of bounds. |
71 // This call is single use only per index. The memory ownership is | 72 // This call is single use only per index. The memory ownership is |
72 // transfered to the result in the case of memory items. A second call with | 73 // transfered to the result in the case of memory items. A second call with |
73 // the same index will result in null data. | 74 // the same index will result in null data. |
74 // TODO(dmurph): change the name to 'takeItemAt' | 75 // TODO(dmurph): change the name to 'takeItemAt' |
75 BLINK_PLATFORM_EXPORT bool itemAt(size_t index, Item& result) const; | 76 BLINK_PLATFORM_EXPORT bool itemAt(size_t index, Item& result) const; |
76 | 77 |
77 BLINK_PLATFORM_EXPORT WebString contentType() const; | 78 BLINK_PLATFORM_EXPORT WebString contentType() const; |
78 | 79 |
79 #if INSIDE_BLINK | 80 #if INSIDE_BLINK |
80 BLINK_PLATFORM_EXPORT WebBlobData(std::unique_ptr<BlobData>); | 81 BLINK_PLATFORM_EXPORT WebBlobData(WTF::PassOwnPtr<BlobData>); |
81 BLINK_PLATFORM_EXPORT WebBlobData& operator=(std::unique_ptr<BlobData>); | 82 BLINK_PLATFORM_EXPORT WebBlobData& operator=(WTF::PassOwnPtr<BlobData>); |
82 BLINK_PLATFORM_EXPORT operator std::unique_ptr<BlobData>(); | 83 BLINK_PLATFORM_EXPORT operator WTF::PassOwnPtr<BlobData>(); |
83 #endif | 84 #endif |
84 | 85 |
85 private: | 86 private: |
86 WebPrivateOwnPtr<BlobData> m_private; | 87 WebPrivateOwnPtr<BlobData> m_private; |
87 }; | 88 }; |
88 | 89 |
89 } // namespace blink | 90 } // namespace blink |
90 | 91 |
91 #endif // WebBlobData_h | 92 #endif // WebBlobData_h |
OLD | NEW |