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

Side by Side Diff: third_party/WebKit/public/web/WebHelperPlugin.h

Issue 2041263002: Remove the use of OwnedPtrDeleter in WebHelperPlugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert to PS1. 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
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 16 matching lines...) Expand all
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 WebHelperPlugin_h 31 #ifndef WebHelperPlugin_h
32 #define WebHelperPlugin_h 32 #define WebHelperPlugin_h
33 33
34 #include "../platform/WebCommon.h" 34 #include "../platform/WebCommon.h"
35 #include "WebFrame.h" 35 #include "WebFrame.h"
36 36
37 #if INSIDE_BLINK
38 #include <memory>
39 #endif
40
37 namespace blink { 41 namespace blink {
38 42
39 class WebPlugin; 43 class WebPlugin;
40 class WebString; 44 class WebString;
41 45
42 class WebHelperPlugin { 46 class WebHelperPlugin {
43 public: 47 public:
44 // May return null if initialization fails. If the returned pointer is 48 // May return null if initialization fails. If the returned pointer is
45 // non-null, the caller must free it by calling destroy(). 49 // non-null, the caller must free it by calling destroy().
46 BLINK_EXPORT static WebHelperPlugin* create(const WebString& PluginType, Web LocalFrame*); 50 BLINK_EXPORT static WebHelperPlugin* create(const WebString& PluginType, Web LocalFrame*);
47 51
48 // Returns a WebPlugin corresponding to the instantiated plugin. This will 52 // Returns a WebPlugin corresponding to the instantiated plugin. This will
49 // never return null. 53 // never return null.
50 virtual WebPlugin* getPlugin() = 0; 54 virtual WebPlugin* getPlugin() = 0;
51 55
52 // Initiates destruction of the WebHelperPlugin. 56 // Initiates destruction of the WebHelperPlugin.
53 virtual void destroy() = 0; 57 virtual void destroy() = 0;
54 58
55 protected: 59 protected:
56 virtual ~WebHelperPlugin() { } 60 virtual ~WebHelperPlugin() { }
57 }; 61 };
58 62
59 } // namespace blink 63 #if INSIDE_BLINK
60 64 struct WebHelperPluginDeleter {
61 namespace WTF { 65 void operator()(WebHelperPlugin* plugin)
62
63 template<typename T> struct OwnedPtrDeleter;
64 template<> struct OwnedPtrDeleter<blink::WebHelperPlugin> {
65 static void deletePtr(blink::WebHelperPlugin* plugin)
66 { 66 {
67 if (plugin) 67 if (plugin)
68 plugin->destroy(); 68 plugin->destroy();
69 } 69 }
70 }; 70 };
71 71
72 } // namespace WTF 72 using WebHelperPluginUniquePtr = std::unique_ptr<WebHelperPlugin, WebHelperPlugi nDeleter>;
73 #endif
74
75 } // namespace blink
73 76
74 #endif 77 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698