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

Unified Diff: Source/web/WebPluginContainerImpl.cpp

Issue 322193002: Don't do a style recalc when updating the composited layer of a plugin. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix assert 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebPluginContainerImpl.cpp
diff --git a/Source/web/WebPluginContainerImpl.cpp b/Source/web/WebPluginContainerImpl.cpp
index e3881dca90fa35233aa035f62cf71710b12d1d3d..1c6725a11be9118e918d1c31d4143e9b09133922 100644
--- a/Source/web/WebPluginContainerImpl.cpp
+++ b/Source/web/WebPluginContainerImpl.cpp
@@ -65,6 +65,7 @@
#include "core/plugins/PluginOcclusionSupport.h"
#include "core/rendering/HitTestResult.h"
#include "core/rendering/RenderBox.h"
+#include "core/rendering/RenderLayer.h"
#include "platform/HostWindow.h"
#include "platform/KeyboardCodes.h"
#include "platform/PlatformGestureEvent.h"
@@ -288,20 +289,27 @@ void WebPluginContainerImpl::setWebLayer(WebLayer* layer)
if (m_webLayer == layer)
return;
- // If anyone of the layers is null we need to switch between hardware
- // and software compositing.
- if (!m_webLayer || !layer) {
- m_element->setNeedsCompositingUpdate();
- // Trigger a style recalc so we update the
- // requiresAcceleratedCompositingForExternalReasons bit in
- // RenderStyle and thus give the plugin a NormalLayer RenderLayer.
- m_element->setNeedsStyleRecalc(LocalStyleChange);
- }
if (m_webLayer)
GraphicsLayer::unregisterContentsLayer(m_webLayer);
if (layer)
GraphicsLayer::registerContentsLayer(layer);
+
+ // If anyone of the layers is null we need to switch between hardware
esprehn 2014/06/10 21:14:37 "any one" or "either"
+ // and software compositing.
+ bool needsCompositingUpdate = !m_webLayer || !layer;
+
m_webLayer = layer;
+
+ if (!needsCompositingUpdate)
+ return;
+
+ m_element->setNeedsCompositingUpdate();
+ // Being composited or not affects the self painting layer bit
+ // on the RenderLayer.
+ if (RenderPart* renderer = m_element->renderPart()) {
+ ASSERT(renderer->hasLayer());
+ renderer->layer()->updateSelfPaintingLayer();
+ }
}
bool WebPluginContainerImpl::supportsPaginatedPrint() const
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698