| 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 LayoutEmbeddedObject* renderer = layoutEmbeddedObject(); | 123 LayoutEmbeddedObject* layoutObject = 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 OwnPtrWillBeRawPtr<PluginPlaceholder> placeholder = nullptr; | 191 OwnPtrWillBeRawPtr<PluginPlaceholder> placeholder = nullptr; |
| 192 RefPtrWillBeRawPtr<Widget> widget = nullptr; | 192 RefPtrWillBeRawPtr<Widget> widget = nullptr; |
| 193 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) { | 193 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) { |
| 194 placeholder = frame->loader().client()->createPluginPlaceholder(document
(), KURL(), paramNames, paramValues, m_serviceType, false); | 194 placeholder = frame->loader().client()->createPluginPlaceholder(document
(), KURL(), paramNames, paramValues, m_serviceType, false); |
| 195 if (!placeholder) | 195 if (!placeholder) |
| 196 widget = frame->loader().client()->createJavaAppletWidget(this, base
URL, paramNames, paramValues); | 196 widget = frame->loader().client()->createJavaAppletWidget(this, base
URL, paramNames, paramValues); |
| 197 } | 197 } |
| 198 | 198 |
| 199 if (!placeholder && !widget) { | 199 if (!placeholder && !widget) { |
| 200 if (!renderer->showsUnavailablePluginIndicator()) | 200 if (!layoutObject->showsUnavailablePluginIndicator()) |
| 201 renderer->setPluginUnavailabilityReason(LayoutEmbeddedObject::Plugin
Missing); | 201 layoutObject->setPluginUnavailabilityReason(LayoutEmbeddedObject::Pl
uginMissing); |
| 202 setPlaceholder(nullptr); | 202 setPlaceholder(nullptr); |
| 203 } else if (placeholder) { | 203 } else if (placeholder) { |
| 204 setPlaceholder(placeholder.release()); | 204 setPlaceholder(placeholder.release()); |
| 205 } else if (widget) { | 205 } else if (widget) { |
| 206 document().setContainsPlugins(); | 206 document().setContainsPlugins(); |
| 207 setWidget(widget); | 207 setWidget(widget); |
| 208 setPlaceholder(nullptr); | 208 setPlaceholder(nullptr); |
| 209 } | 209 } |
| 210 } | 210 } |
| 211 | 211 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 233 | 233 |
| 234 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) | 234 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) |
| 235 || !document().contentSecurityPolicy()->allowPluginTypeForDocument(docum
ent(), m_serviceType, m_serviceType, url)) { | 235 || !document().contentSecurityPolicy()->allowPluginTypeForDocument(docum
ent(), m_serviceType, m_serviceType, url)) { |
| 236 layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); | 236 layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); |
| 237 return false; | 237 return false; |
| 238 } | 238 } |
| 239 return true; | 239 return true; |
| 240 } | 240 } |
| 241 | 241 |
| 242 } | 242 } |
| OLD | NEW |