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