OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 13 matching lines...) Expand all Loading... |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
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 #include "public/web/WebPepperSocket.h" | 31 #include "public/web/WebPepperSocket.h" |
32 | 32 |
33 #include "web/WebPepperSocketImpl.h" | 33 #include "web/WebPepperSocketImpl.h" |
34 #include "wtf/PtrUtil.h" | |
35 #include <memory> | |
36 | 34 |
37 namespace blink { | 35 namespace blink { |
38 | 36 |
39 WebPepperSocket* WebPepperSocket::create(const WebDocument& document, WebPepperS
ocketClient* client) | 37 WebPepperSocket* WebPepperSocket::create(const WebDocument& document, WebPepperS
ocketClient* client) |
40 { | 38 { |
41 if (!client) | 39 if (!client) |
42 return 0; | 40 return 0; |
43 | 41 |
44 std::unique_ptr<WebPepperSocketImpl> websocket = wrapUnique(new WebPepperSoc
ketImpl(document, client)); | 42 OwnPtr<WebPepperSocketImpl> websocket = adoptPtr(new WebPepperSocketImpl(doc
ument, client)); |
45 if (websocket && websocket->isNull()) | 43 if (websocket && websocket->isNull()) |
46 return 0; | 44 return 0; |
47 return websocket.release(); | 45 return websocket.leakPtr(); |
48 } | 46 } |
49 | 47 |
50 } // namespace blink | 48 } // namespace blink |
OLD | NEW |