| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 { | 94 { |
| 95 if (!canEmbedJava() || hasAuthorShadowRoot()) | 95 if (!canEmbedJava() || hasAuthorShadowRoot()) |
| 96 return LayoutObject::createObject(this, style); | 96 return LayoutObject::createObject(this, style); |
| 97 | 97 |
| 98 if (usePlaceholderContent()) | 98 if (usePlaceholderContent()) |
| 99 return new RenderBlockFlow(this); | 99 return new RenderBlockFlow(this); |
| 100 | 100 |
| 101 return new LayoutApplet(this); | 101 return new LayoutApplet(this); |
| 102 } | 102 } |
| 103 | 103 |
| 104 RenderPart* HTMLAppletElement::renderPartForJSBindings() const | 104 LayoutPart* HTMLAppletElement::layoutPartForJSBindings() const |
| 105 { | 105 { |
| 106 if (!canEmbedJava()) | 106 if (!canEmbedJava()) |
| 107 return nullptr; | 107 return nullptr; |
| 108 return HTMLPlugInElement::renderPartForJSBindings(); | 108 return HTMLPlugInElement::layoutPartForJSBindings(); |
| 109 } | 109 } |
| 110 | 110 |
| 111 RenderPart* HTMLAppletElement::existingRenderPart() const | 111 LayoutPart* HTMLAppletElement::existingLayoutPart() const |
| 112 { | 112 { |
| 113 return renderPart(); | 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 RenderEmbeddedObject* renderer = renderEmbeddedObject(); |
| (...skipping 104 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()->allowPluginType(m_serviceType, m
_serviceType, url)) { | 230 || !document().contentSecurityPolicy()->allowPluginType(m_serviceType, m
_serviceType, url)) { |
| 231 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); | 231 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje
ct::PluginBlockedByContentSecurityPolicy); |
| 232 return false; | 232 return false; |
| 233 } | 233 } |
| 234 return true; | 234 return true; |
| 235 } | 235 } |
| 236 | 236 |
| 237 } | 237 } |
| OLD | NEW |