| 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 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" | |
| 36 #include "WebString.h" | 35 #include "WebString.h" |
| 37 #include "WebThreadSafeData.h" | 36 #include "WebThreadSafeData.h" |
| 38 #include "WebURL.h" | 37 #include "WebURL.h" |
| 39 | 38 |
| 40 #if INSIDE_BLINK | 39 #if INSIDE_BLINK |
| 41 #include <memory> | 40 #include <memory> |
| 42 #endif | 41 #endif |
| 43 | 42 |
| 44 namespace blink { | 43 namespace blink { |
| 45 | 44 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 76 | 75 |
| 77 BLINK_PLATFORM_EXPORT WebString contentType() const; | 76 BLINK_PLATFORM_EXPORT WebString contentType() const; |
| 78 | 77 |
| 79 #if INSIDE_BLINK | 78 #if INSIDE_BLINK |
| 80 BLINK_PLATFORM_EXPORT WebBlobData(std::unique_ptr<BlobData>); | 79 BLINK_PLATFORM_EXPORT WebBlobData(std::unique_ptr<BlobData>); |
| 81 BLINK_PLATFORM_EXPORT WebBlobData& operator=(std::unique_ptr<BlobData>); | 80 BLINK_PLATFORM_EXPORT WebBlobData& operator=(std::unique_ptr<BlobData>); |
| 82 BLINK_PLATFORM_EXPORT operator std::unique_ptr<BlobData>(); | 81 BLINK_PLATFORM_EXPORT operator std::unique_ptr<BlobData>(); |
| 83 #endif | 82 #endif |
| 84 | 83 |
| 85 private: | 84 private: |
| 86 WebPrivateOwnPtr<BlobData> m_private; | 85 std::unique_ptr<BlobData> m_private; |
| 87 }; | 86 }; |
| 88 | 87 |
| 89 } // namespace blink | 88 } // namespace blink |
| 90 | 89 |
| 91 #endif // WebBlobData_h | 90 #endif // WebBlobData_h |
| OLD | NEW |