Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic22a6afb0f21d6b716e17cf11d33e56fa873880e

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;
 }