Chromium Code Reviews| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 59 { | 59 { |
| 60 view()->frameView()->setIsVisuallyNonEmpty(); | 60 view()->frameView()->setIsVisuallyNonEmpty(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 RenderEmbeddedObject::~RenderEmbeddedObject() | 63 RenderEmbeddedObject::~RenderEmbeddedObject() |
| 64 { | 64 { |
| 65 } | 65 } |
| 66 | 66 |
| 67 LayerType RenderEmbeddedObject::layerTypeRequired() const | 67 LayerType RenderEmbeddedObject::layerTypeRequired() const |
| 68 { | 68 { |
| 69 LayerType type = RenderPart::layerTypeRequired(); | 69 // This just use RenderPart::layerTypeRequired, because RenderLayerComposito r |
|
esprehn
2014/06/03 03:49:17
typo, -> uses
esprehn
2014/06/03 03:49:17
typo, -> uses
| |
| 70 if (type != NoLayer) | 70 // doesn't loop through RenderEmbeddedObjects the way it does frames in orde r |
| 71 return type; | 71 // to update the self painting bit on their RenderLayer. |
| 72 | 72 if (requiresAcceleratedCompositing()) |
| 73 return requiresAcceleratedCompositing() ? NormalLayer : NoLayer; | 73 return NormalLayer; |
| 74 return RenderPart::layerTypeRequired(); | |
| 74 } | 75 } |
| 75 | 76 |
| 76 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: :PluginUnavailabilityReason pluginUnavailabilityReason) | 77 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: :PluginUnavailabilityReason pluginUnavailabilityReason) |
| 77 { | 78 { |
| 78 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); | 79 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); |
| 79 switch (pluginUnavailabilityReason) { | 80 switch (pluginUnavailabilityReason) { |
| 80 case RenderEmbeddedObject::PluginMissing: | 81 case RenderEmbeddedObject::PluginMissing: |
| 81 return locale.queryString(blink::WebLocalizedString::MissingPluginText); | 82 return locale.queryString(blink::WebLocalizedString::MissingPluginText); |
| 82 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: | 83 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: |
| 83 return locale.queryString(blink::WebLocalizedString::BlockedPluginText); | 84 return locale.queryString(blink::WebLocalizedString::BlockedPluginText); |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 } | 218 } |
| 218 | 219 |
| 219 RenderBox* RenderEmbeddedObject::embeddedContentBox() const | 220 RenderBox* RenderEmbeddedObject::embeddedContentBox() const |
| 220 { | 221 { |
| 221 if (!node() || !widget() || !widget()->isFrameView()) | 222 if (!node() || !widget() || !widget()->isFrameView()) |
| 222 return 0; | 223 return 0; |
| 223 return toFrameView(widget())->embeddedContentBox(); | 224 return toFrameView(widget())->embeddedContentBox(); |
| 224 } | 225 } |
| 225 | 226 |
| 226 } | 227 } |
| OLD | NEW |