Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Side by Side Diff: third_party/WebKit/Source/web/WebPepperSocket.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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>
34 36
35 namespace blink { 37 namespace blink {
36 38
37 WebPepperSocket* WebPepperSocket::create(const WebDocument& document, WebPepperS ocketClient* client) 39 WebPepperSocket* WebPepperSocket::create(const WebDocument& document, WebPepperS ocketClient* client)
38 { 40 {
39 if (!client) 41 if (!client)
40 return 0; 42 return 0;
41 43
42 OwnPtr<WebPepperSocketImpl> websocket = adoptPtr(new WebPepperSocketImpl(doc ument, client)); 44 std::unique_ptr<WebPepperSocketImpl> websocket = wrapUnique(new WebPepperSoc ketImpl(document, client));
43 if (websocket && websocket->isNull()) 45 if (websocket && websocket->isNull())
44 return 0; 46 return 0;
45 return websocket.leakPtr(); 47 return websocket.release();
46 } 48 }
47 49
48 } // namespace blink 50 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebPagePopupImpl.cpp ('k') | third_party/WebKit/Source/web/WebPepperSocketChannelClientProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698