Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(590)

Side by Side Diff: Source/core/rendering/RenderEmbeddedObject.cpp

Issue 302083002: Always give RenderParts a RenderLayer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add win/mac needsrebaselines Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderEmbeddedObject.h ('k') | Source/core/rendering/RenderIFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 : RenderPart(element) 56 : RenderPart(element)
57 , m_showsUnavailablePluginIndicator(false) 57 , m_showsUnavailablePluginIndicator(false)
58 { 58 {
59 view()->frameView()->setIsVisuallyNonEmpty(); 59 view()->frameView()->setIsVisuallyNonEmpty();
60 } 60 }
61 61
62 RenderEmbeddedObject::~RenderEmbeddedObject() 62 RenderEmbeddedObject::~RenderEmbeddedObject()
63 { 63 {
64 } 64 }
65 65
66 LayerType RenderEmbeddedObject::layerTypeRequired() const
67 {
68 // This can't just use RenderPart::layerTypeRequired, because RenderLayerCom positor
69 // doesn't loop through RenderEmbeddedObjects the way it does frames in orde r
70 // to update the self painting bit on their RenderLayer.
71 // Also, unlike iframes, embeds don't used the usesCompositing bit on Render View
72 // in requiresAcceleratedCompositing.
73 if (requiresAcceleratedCompositing())
74 return NormalLayer;
75 return RenderPart::layerTypeRequired();
76 }
77
66 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: :PluginUnavailabilityReason pluginUnavailabilityReason) 78 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: :PluginUnavailabilityReason pluginUnavailabilityReason)
67 { 79 {
68 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); 80 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale();
69 switch (pluginUnavailabilityReason) { 81 switch (pluginUnavailabilityReason) {
70 case RenderEmbeddedObject::PluginMissing: 82 case RenderEmbeddedObject::PluginMissing:
71 return locale.queryString(blink::WebLocalizedString::MissingPluginText); 83 return locale.queryString(blink::WebLocalizedString::MissingPluginText);
72 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: 84 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy:
73 return locale.queryString(blink::WebLocalizedString::BlockedPluginText); 85 return locale.queryString(blink::WebLocalizedString::BlockedPluginText);
74 } 86 }
75 87
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 219 }
208 220
209 RenderBox* RenderEmbeddedObject::embeddedContentBox() const 221 RenderBox* RenderEmbeddedObject::embeddedContentBox() const
210 { 222 {
211 if (!node() || !widget() || !widget()->isFrameView()) 223 if (!node() || !widget() || !widget()->isFrameView())
212 return 0; 224 return 0;
213 return toFrameView(widget())->embeddedContentBox(); 225 return toFrameView(widget())->embeddedContentBox();
214 } 226 }
215 227
216 } 228 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderEmbeddedObject.h ('k') | Source/core/rendering/RenderIFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698