| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 3 * (C) 2000 Simon Hausmann <hausmann@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, 2010 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 RenderEmbeddedObject::~RenderEmbeddedObject() | 64 RenderEmbeddedObject::~RenderEmbeddedObject() |
| 65 { | 65 { |
| 66 } | 66 } |
| 67 | 67 |
| 68 LayerType RenderEmbeddedObject::layerTypeRequired() const | 68 LayerType RenderEmbeddedObject::layerTypeRequired() const |
| 69 { | 69 { |
| 70 LayerType type = RenderPart::layerTypeRequired(); | 70 LayerType type = RenderPart::layerTypeRequired(); |
| 71 if (type != NoLayer) | 71 if (type != NoLayer) |
| 72 return type; | 72 return type; |
| 73 | 73 |
| 74 return allowsAcceleratedCompositing() ? NormalLayer : NoLayer; | 74 return requiresAcceleratedCompositing() ? NormalLayer : NoLayer; |
| 75 } | |
| 76 | |
| 77 bool RenderEmbeddedObject::allowsAcceleratedCompositing() const | |
| 78 { | |
| 79 return widget() && widget()->isPluginView() && toPluginView(widget())->platf
ormLayer(); | |
| 80 } | 75 } |
| 81 | 76 |
| 82 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject:
:PluginUnavailabilityReason pluginUnavailabilityReason) | 77 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject:
:PluginUnavailabilityReason pluginUnavailabilityReason) |
| 83 { | 78 { |
| 84 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); | 79 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); |
| 85 switch (pluginUnavailabilityReason) { | 80 switch (pluginUnavailabilityReason) { |
| 86 case RenderEmbeddedObject::PluginMissing: | 81 case RenderEmbeddedObject::PluginMissing: |
| 87 return locale.queryString(blink::WebLocalizedString::MissingPluginText); | 82 return locale.queryString(blink::WebLocalizedString::MissingPluginText); |
| 88 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: | 83 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: |
| 89 return locale.queryString(blink::WebLocalizedString::BlockedPluginText); | 84 return locale.queryString(blink::WebLocalizedString::BlockedPluginText); |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 { | 240 { |
| 246 return false; | 241 return false; |
| 247 } | 242 } |
| 248 | 243 |
| 249 bool RenderEmbeddedObject::canHaveChildren() const | 244 bool RenderEmbeddedObject::canHaveChildren() const |
| 250 { | 245 { |
| 251 return false; | 246 return false; |
| 252 } | 247 } |
| 253 | 248 |
| 254 } | 249 } |
| OLD | NEW |