diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-03 14:38:23 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-10-03 15:34:03 -0700 |
| commit | 834546469c79df0516956f90f5e0a9100ba1fcd5 (patch) | |
| tree | 9439ff0c8b9e03000b4c3978c919411b3e3eec22 | |
| parent | b31c03a968a578cc43e606ede80cefcd07e8ee07 (diff) | |
| download | external_webkit-834546469c79df0516956f90f5e0a9100ba1fcd5.zip external_webkit-834546469c79df0516956f90f5e0a9100ba1fcd5.tar.gz external_webkit-834546469c79df0516956f90f5e0a9100ba1fcd5.tar.bz2 | |
allow for compositing of 1x1 plugins
bug:5382635
Change-Id: I0da21245ec7808da452941a45ae5008e278f3007
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index e757080..4f4f553 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -1533,7 +1533,13 @@ bool RenderLayerCompositor::requiresCompositingForPlugin(RenderObject* renderer) // Don't go into compositing mode if height or width are zero, or size is 1x1. IntRect contentBox = pluginRenderer->contentBoxRect(); +#if PLATFORM(ANDROID) + // allow all plugins including 1x1 to be composited, so that they are drawn, + // and acquire an ANativeWindow on the UI thread + return contentBox.height() * contentBox.width() > 0; +#else return contentBox.height() * contentBox.width() > 1; +#endif } bool RenderLayerCompositor::requiresCompositingForFrame(RenderObject* renderer) const |