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

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

Issue 2712343003: Rename FrameLoaderClient* to LocalFrameClient* in web/ (Closed)
Patch Set: Created 3 years, 9 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) 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 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 "web/WebHelperPluginImpl.h" 31 #include "web/WebHelperPluginImpl.h"
32 32
33 #include "core/frame/LocalFrameClient.h"
33 #include "core/html/HTMLObjectElement.h" 34 #include "core/html/HTMLObjectElement.h"
34 #include "core/loader/FrameLoader.h" 35 #include "core/loader/FrameLoader.h"
35 #include "core/loader/FrameLoaderClient.h"
36 #include "public/web/WebPlugin.h" 36 #include "public/web/WebPlugin.h"
37 #include "web/WebLocalFrameImpl.h" 37 #include "web/WebLocalFrameImpl.h"
38 #include "web/WebPluginContainerImpl.h" 38 #include "web/WebPluginContainerImpl.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 DEFINE_TYPE_CASTS(WebHelperPluginImpl, WebHelperPlugin, plugin, true, true); 42 DEFINE_TYPE_CASTS(WebHelperPluginImpl, WebHelperPlugin, plugin, true, true);
43 43
44 WebHelperPlugin* WebHelperPlugin::create(const WebString& pluginType, 44 WebHelperPlugin* WebHelperPlugin::create(const WebString& pluginType,
45 WebLocalFrame* frame) { 45 WebLocalFrame* frame) {
(...skipping 15 matching lines...) Expand all
61 61
62 m_objectElement = 62 m_objectElement =
63 HTMLObjectElement::create(*frame->frame()->document(), false); 63 HTMLObjectElement::create(*frame->frame()->document(), false);
64 Vector<String> attributeNames; 64 Vector<String> attributeNames;
65 Vector<String> attributeValues; 65 Vector<String> attributeValues;
66 DCHECK(frame->frame()->document()->url().isValid()); 66 DCHECK(frame->frame()->document()->url().isValid());
67 m_pluginContainer = 67 m_pluginContainer =
68 toWebPluginContainerImpl(frame->frame()->loader().client()->createPlugin( 68 toWebPluginContainerImpl(frame->frame()->loader().client()->createPlugin(
69 m_objectElement.get(), frame->frame()->document()->url(), 69 m_objectElement.get(), frame->frame()->document()->url(),
70 attributeNames, attributeValues, pluginType, false, 70 attributeNames, attributeValues, pluginType, false,
71 FrameLoaderClient::AllowDetachedPlugin)); 71 LocalFrameClient::AllowDetachedPlugin));
72 72
73 if (!m_pluginContainer) 73 if (!m_pluginContainer)
74 return false; 74 return false;
75 75
76 // Getting a placeholder plugin is also failure, since it's not the plugin the 76 // Getting a placeholder plugin is also failure, since it's not the plugin the
77 // caller needed. 77 // caller needed.
78 return !getPlugin()->isPlaceholder(); 78 return !getPlugin()->isPlaceholder();
79 } 79 }
80 80
81 void WebHelperPluginImpl::reallyDestroy(TimerBase*) { 81 void WebHelperPluginImpl::reallyDestroy(TimerBase*) {
(...skipping 12 matching lines...) Expand all
94 m_destructionTimer.startOneShot(0, BLINK_FROM_HERE); 94 m_destructionTimer.startOneShot(0, BLINK_FROM_HERE);
95 } 95 }
96 96
97 WebPlugin* WebHelperPluginImpl::getPlugin() { 97 WebPlugin* WebHelperPluginImpl::getPlugin() {
98 DCHECK(m_pluginContainer); 98 DCHECK(m_pluginContainer);
99 DCHECK(m_pluginContainer->plugin()); 99 DCHECK(m_pluginContainer->plugin());
100 return m_pluginContainer->plugin(); 100 return m_pluginContainer->plugin();
101 } 101 }
102 102
103 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebHelperPluginImpl.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698