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

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

Issue 309763002: Remove RenderEmbeddedObject::layerTypeRequired(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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') | no next file » | 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 LayerType type = RenderPart::layerTypeRequired();
69 if (type != NoLayer)
70 return type;
71
72 return requiresAcceleratedCompositing() ? NormalLayer : NoLayer;
73 }
74
75 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: :PluginUnavailabilityReason pluginUnavailabilityReason) 66 static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: :PluginUnavailabilityReason pluginUnavailabilityReason)
76 { 67 {
77 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); 68 Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale();
78 switch (pluginUnavailabilityReason) { 69 switch (pluginUnavailabilityReason) {
79 case RenderEmbeddedObject::PluginMissing: 70 case RenderEmbeddedObject::PluginMissing:
80 return locale.queryString(blink::WebLocalizedString::MissingPluginText); 71 return locale.queryString(blink::WebLocalizedString::MissingPluginText);
81 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: 72 case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy:
82 return locale.queryString(blink::WebLocalizedString::BlockedPluginText); 73 return locale.queryString(blink::WebLocalizedString::BlockedPluginText);
83 } 74 }
84 75
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 } 207 }
217 208
218 RenderBox* RenderEmbeddedObject::embeddedContentBox() const 209 RenderBox* RenderEmbeddedObject::embeddedContentBox() const
219 { 210 {
220 if (!node() || !widget() || !widget()->isFrameView()) 211 if (!node() || !widget() || !widget()->isFrameView())
221 return 0; 212 return 0;
222 return toFrameView(widget())->embeddedContentBox(); 213 return toFrameView(widget())->embeddedContentBox();
223 } 214 }
224 215
225 } 216 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderEmbeddedObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698