OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv
ed. |
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 return layoutPart(); | 113 return layoutPart(); |
114 } | 114 } |
115 | 115 |
116 void HTMLAppletElement::updateWidgetInternal() | 116 void HTMLAppletElement::updateWidgetInternal() |
117 { | 117 { |
118 setNeedsWidgetUpdate(false); | 118 setNeedsWidgetUpdate(false); |
119 // FIXME: This should ASSERT isFinishedParsingChildren() instead. | 119 // FIXME: This should ASSERT isFinishedParsingChildren() instead. |
120 if (!isFinishedParsingChildren()) | 120 if (!isFinishedParsingChildren()) |
121 return; | 121 return; |
122 | 122 |
123 RenderEmbeddedObject* renderer = renderEmbeddedObject(); | 123 LayoutEmbeddedObject* renderer = layoutEmbeddedObject(); |
124 | 124 |
125 LocalFrame* frame = document().frame(); | 125 LocalFrame* frame = document().frame(); |
126 ASSERT(frame); | 126 ASSERT(frame); |
127 | 127 |
128 Vector<String> paramNames; | 128 Vector<String> paramNames; |
129 Vector<String> paramValues; | 129 Vector<String> paramValues; |
130 | 130 |
131 const AtomicString& codeBase = getAttribute(codebaseAttr); | 131 const AtomicString& codeBase = getAttribute(codebaseAttr); |
132 if (!codeBase.isNull()) { | 132 if (!codeBase.isNull()) { |
133 KURL codeBaseURL = document().completeURL(codeBase); | 133 KURL codeBaseURL = document().completeURL(codeBase); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 OwnPtrWillBeRawPtr<PluginPlaceholder> placeholder = nullptr; | 186 OwnPtrWillBeRawPtr<PluginPlaceholder> placeholder = nullptr; |
187 RefPtrWillBeRawPtr<Widget> widget = nullptr; | 187 RefPtrWillBeRawPtr<Widget> widget = nullptr; |
188 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) { | 188 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) { |
189 placeholder = frame->loader().client()->createPluginPlaceholder(document
(), KURL(), paramNames, paramValues, m_serviceType, false); | 189 placeholder = frame->loader().client()->createPluginPlaceholder(document
(), KURL(), paramNames, paramValues, m_serviceType, false); |
190 if (!placeholder) | 190 if (!placeholder) |
191 widget = frame->loader().client()->createJavaAppletWidget(this, base
URL, paramNames, paramValues); | 191 widget = frame->loader().client()->createJavaAppletWidget(this, base
URL, paramNames, paramValues); |
192 } | 192 } |
193 | 193 |
194 if (!placeholder && !widget) { | 194 if (!placeholder && !widget) { |
195 if (!renderer->showsUnavailablePluginIndicator()) | 195 if (!renderer->showsUnavailablePluginIndicator()) |
196 renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::Plugin
Missing); | 196 renderer->setPluginUnavailabilityReason(LayoutEmbeddedObject::Plugin
Missing); |
197 setPlaceholder(nullptr); | 197 setPlaceholder(nullptr); |
198 } else if (placeholder) { | 198 } else if (placeholder) { |
199 setPlaceholder(placeholder.release()); | 199 setPlaceholder(placeholder.release()); |
200 } else if (widget) { | 200 } else if (widget) { |
201 document().setContainsPlugins(); | 201 document().setContainsPlugins(); |
202 setWidget(widget); | 202 setWidget(widget); |
203 setPlaceholder(nullptr); | 203 setPlaceholder(nullptr); |
204 } | 204 } |
205 } | 205 } |
206 | 206 |
(...skipping 14 matching lines...) Expand all Loading... |
221 | 221 |
222 bool HTMLAppletElement::canEmbedURL(const KURL& url) const | 222 bool HTMLAppletElement::canEmbedURL(const KURL& url) const |
223 { | 223 { |
224 if (!document().securityOrigin()->canDisplay(url)) { | 224 if (!document().securityOrigin()->canDisplay(url)) { |
225 FrameLoader::reportLocalLoadFailed(document().frame(), url.string()); | 225 FrameLoader::reportLocalLoadFailed(document().frame(), url.string()); |
226 return false; | 226 return false; |
227 } | 227 } |
228 | 228 |
229 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) | 229 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) |
230 || !document().contentSecurityPolicy()->allowPluginType(m_serviceType, m
_serviceType, url)) { | 230 || !document().contentSecurityPolicy()->allowPluginType(m_serviceType, m
_serviceType, url)) { |
231 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); | 231 layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); |
232 return false; | 232 return false; |
233 } | 233 } |
234 return true; | 234 return true; |
235 } | 235 } |
236 | 236 |
237 } | 237 } |
OLD | NEW |