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

Unified Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 202523008: Simplify CompositingReasonFinder::requiresCompositingForPlugin (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix bad merge Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
index 5feab818aedb88668143f4d3809666c598adab80..44b0f6fb922301d8b3acf8bb2b6c61acc5621f25 100644
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
@@ -139,7 +139,7 @@ static bool contentLayerSupportsDirectBackgroundComposition(const RenderObject*
static inline bool isAcceleratedContents(RenderObject* renderer)
{
return isAcceleratedCanvas(renderer)
- || (renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing())
+ || (renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing())
|| renderer->isVideo();
}
@@ -527,7 +527,7 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
if (isDirectlyCompositedImage())
updateImageContents();
- if (renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing()) {
+ if (renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing()) {
PluginView* pluginView = toPluginView(toRenderWidget(renderer)->widget());
m_graphicsLayer->setContentsToPlatformLayer(pluginView->platformLayer());
} else if (renderer->node() && renderer->node()->isFrameOwnerElement() && toHTMLFrameOwnerElement(renderer->node())->contentFrame()) {
@@ -1541,7 +1541,7 @@ bool CompositedLayerMapping::paintsChildren() const
static bool isCompositedPlugin(RenderObject* renderer)
{
- return renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing();
+ return renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing();
}
static bool hasVisibleNonCompositingDescendant(RenderLayer* parent)
« no previous file with comments | « Source/core/rendering/RenderEmbeddedObject.cpp ('k') | Source/core/rendering/compositing/CompositingReasonFinder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698