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

Side by Side Diff: Source/web/WebHelperPluginImpl.cpp

Issue 222203007: Conversion of more places in Blink to use WebLocalFrame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebFrameImpl.cpp ('k') | Source/web/WebLeakDetector.cpp » ('j') | 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 26 matching lines...) Expand all
37 #include "core/html/HTMLObjectElement.h" 37 #include "core/html/HTMLObjectElement.h"
38 #include "core/loader/FrameLoader.h" 38 #include "core/loader/FrameLoader.h"
39 #include "core/loader/FrameLoaderClient.h" 39 #include "core/loader/FrameLoaderClient.h"
40 40
41 using namespace WebCore; 41 using namespace WebCore;
42 42
43 namespace blink { 43 namespace blink {
44 44
45 DEFINE_TYPE_CASTS(WebHelperPluginImpl, WebHelperPlugin, plugin, true, true); 45 DEFINE_TYPE_CASTS(WebHelperPluginImpl, WebHelperPlugin, plugin, true, true);
46 46
47 WebHelperPlugin* WebHelperPlugin::create(const WebString& pluginType, WebFrame* frame) 47 WebHelperPlugin* WebHelperPlugin::create(const WebString& pluginType, WebLocalFr ame* frame)
48 { 48 {
49 OwnPtr<WebHelperPlugin> plugin = adoptPtr<WebHelperPlugin>(new WebHelperPlug inImpl()); 49 OwnPtr<WebHelperPlugin> plugin = adoptPtr<WebHelperPlugin>(new WebHelperPlug inImpl());
50 if (!toWebHelperPluginImpl(plugin.get())->initialize(pluginType, toWebFrameI mpl(frame))) 50 if (!toWebHelperPluginImpl(plugin.get())->initialize(pluginType, toWebFrameI mpl(frame)))
51 return 0; 51 return 0;
52 return plugin.leakPtr(); 52 return plugin.leakPtr();
53 } 53 }
54 54
55 WebHelperPluginImpl::WebHelperPluginImpl() 55 WebHelperPluginImpl::WebHelperPluginImpl()
56 : m_destructionTimer(this, &WebHelperPluginImpl::reallyDestroy) 56 : m_destructionTimer(this, &WebHelperPluginImpl::reallyDestroy)
57 { 57 {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 104
105 WebPlugin* WebHelperPluginImpl::getPlugin() 105 WebPlugin* WebHelperPluginImpl::getPlugin()
106 { 106 {
107 ASSERT(m_pluginContainer); 107 ASSERT(m_pluginContainer);
108 ASSERT(m_pluginContainer->plugin()); 108 ASSERT(m_pluginContainer->plugin());
109 return m_pluginContainer->plugin(); 109 return m_pluginContainer->plugin();
110 } 110 }
111 111
112 } // namespace blink 112 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebFrameImpl.cpp ('k') | Source/web/WebLeakDetector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698