| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 { | 76 { |
| 77 return attribute.name() == codebaseAttr || attribute.name() == objectAttr | 77 return attribute.name() == codebaseAttr || attribute.name() == objectAttr |
| 78 || HTMLPlugInElement::isURLAttribute(attribute); | 78 || HTMLPlugInElement::isURLAttribute(attribute); |
| 79 } | 79 } |
| 80 | 80 |
| 81 bool HTMLAppletElement::hasLegalLinkAttribute(const QualifiedName& name) const | 81 bool HTMLAppletElement::hasLegalLinkAttribute(const QualifiedName& name) const |
| 82 { | 82 { |
| 83 return name == codebaseAttr || HTMLPlugInElement::hasLegalLinkAttribute(name
); | 83 return name == codebaseAttr || HTMLPlugInElement::hasLegalLinkAttribute(name
); |
| 84 } | 84 } |
| 85 | 85 |
| 86 bool HTMLAppletElement::layoutObjectIsNeeded(const LayoutStyle& style) | 86 bool HTMLAppletElement::layoutObjectIsNeeded(const ComputedStyle& style) |
| 87 { | 87 { |
| 88 if (!fastHasAttribute(codeAttr) && !hasOpenShadowRoot()) | 88 if (!fastHasAttribute(codeAttr) && !hasOpenShadowRoot()) |
| 89 return false; | 89 return false; |
| 90 return HTMLPlugInElement::layoutObjectIsNeeded(style); | 90 return HTMLPlugInElement::layoutObjectIsNeeded(style); |
| 91 } | 91 } |
| 92 | 92 |
| 93 LayoutObject* HTMLAppletElement::createLayoutObject(const LayoutStyle& style) | 93 LayoutObject* HTMLAppletElement::createLayoutObject(const ComputedStyle& style) |
| 94 { | 94 { |
| 95 if (!canEmbedJava() || hasOpenShadowRoot()) | 95 if (!canEmbedJava() || hasOpenShadowRoot()) |
| 96 return LayoutObject::createObject(this, style); | 96 return LayoutObject::createObject(this, style); |
| 97 | 97 |
| 98 if (usePlaceholderContent()) | 98 if (usePlaceholderContent()) |
| 99 return new LayoutBlockFlow(this); | 99 return new LayoutBlockFlow(this); |
| 100 | 100 |
| 101 return new LayoutApplet(this); | 101 return new LayoutApplet(this); |
| 102 } | 102 } |
| 103 | 103 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 | 228 |
| 229 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) | 229 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) |
| 230 || !document().contentSecurityPolicy()->allowPluginTypeForDocument(docum
ent(), m_serviceType, m_serviceType, url)) { | 230 || !document().contentSecurityPolicy()->allowPluginTypeForDocument(docum
ent(), m_serviceType, m_serviceType, url)) { |
| 231 layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObje
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 |