diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:37:48 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:38:52 +0200 |
commit | 89e2486a48b739f8d771d69ede5a6a1b244a10fc (patch) | |
tree | 503b1a7812cf97d93704c32437eb5f62dc1a1ff9 /Source/WebCore/rendering/RenderLayerBacking.cpp | |
parent | 625f028249cb37c55bbbd153f3902afd0b0756d9 (diff) | |
download | qtwebkit-89e2486a48b739f8d771d69ede5a6a1b244a10fc.tar.gz |
Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)
New snapshot with prospective Mountain Lion build fix
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerBacking.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index 9886fb319..57b83e352 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -381,8 +381,7 @@ bool RenderLayerBacking::updateGraphicsLayerConfiguration() if (isDirectlyCompositedImage()) updateImageContents(); - if ((renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing()) - || (renderer->isApplet() && toRenderApplet(renderer)->allowsAcceleratedCompositing())) { + if (renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing()) { PluginViewBase* pluginViewBase = static_cast<PluginViewBase*>(toRenderWidget(renderer)->widget()); m_graphicsLayer->setContentsToMedia(pluginViewBase->platformLayer()); } @@ -599,7 +598,10 @@ void RenderLayerBacking::updateGraphicsLayerGeometry() } m_foregroundLayer->setPosition(foregroundPosition); - m_foregroundLayer->setSize(foregroundSize); + if (foregroundSize != m_foregroundLayer->size()) { + m_foregroundLayer->setSize(foregroundSize); + m_foregroundLayer->setNeedsDisplay(); + } m_foregroundLayer->setOffsetFromRenderer(foregroundOffset); } |