diff options
author | Michael BrĂ¼ning <michael.bruning@digia.com> | 2013-12-11 17:34:14 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-12 11:05:37 +0100 |
commit | 9bd1e4c7e850667f31c6a1333a95b5baeb9998e3 (patch) | |
tree | 94c3b28dd8a02b0c219f75bf2a0e0c80041f2f1a /Source | |
parent | 7122e75c83776f9e2fb67919971c883ebea000ae (diff) |
Apply size constraints for direct compositing also to background images.
The fact that this was not done before led to a failed WebKit assertion
in the UIProcess which caused any WebView application loading pages
with large background images (e.g. flickr.com) to crash on Windows.
Task-number: QTBUG-35208
Change-Id: Ieae76e19fc08483cbd038a7c14e06b4bd12dd681
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index 955315eef..143c7d32c 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -1447,6 +1447,14 @@ bool canCreateTiledImage(const RenderStyle* style) if (!image->isBitmapImage()) return false; +#if USE(COORDINATED_GRAPHICS) + // Direct compositing becomes slow when the images are too + // large and the UIProcess asserts if one of the dimensions + // is larger than 2000. + if (2000 < std::max(image->width(), image->height())) + return false; +#endif + return true; } |