summaryrefslogtreecommitdiff
path: root/chromium/cc/layers/picture_layer_impl.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-09-28 18:37:14 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-09-29 07:47:06 +0000
commit0e8ff63a407fe323e215bb1a2c423c09a4747c8a (patch)
treee27e357e125d2d705bd504e1e3c8a3da1ed20f1d /chromium/cc/layers/picture_layer_impl.cc
parentc3d0bb5bb15d008606b18b865841e19cd9bb5847 (diff)
downloadqtwebengine-chromium-upstream-45.tar.gz
BASELINE: Update chromium to 45.0.2454.101upstream-45
Also adds web_cache component Change-Id: I51238ceea8ee99854cc4989ae70a4fc2fc6bedcb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'chromium/cc/layers/picture_layer_impl.cc')
-rw-r--r--chromium/cc/layers/picture_layer_impl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/cc/layers/picture_layer_impl.cc b/chromium/cc/layers/picture_layer_impl.cc
index c7076bdc1e1..90fdeb1efb4 100644
--- a/chromium/cc/layers/picture_layer_impl.cc
+++ b/chromium/cc/layers/picture_layer_impl.cc
@@ -183,7 +183,9 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass,
gfx::Rect opaque_rect = contents_opaque() ? geometry_rect : gfx::Rect();
gfx::Rect visible_geometry_rect =
scaled_occlusion.GetUnoccludedContentRect(geometry_rect);
- if (visible_geometry_rect.IsEmpty())
+ // TODO(enne): HasRecordings is a workaround for crash in crbug.com/526402.
+ // Need proper fix for when recording does not cover visible rect.
+ if (visible_geometry_rect.IsEmpty() || !raster_source_->HasRecordings())
return;
gfx::Rect quad_content_rect = shared_quad_state->visible_quad_layer_rect;