summaryrefslogtreecommitdiffstats
path: root/cc/playback
diff options
context:
space:
mode:
authorvollick <vollick@chromium.org>2016-01-08 20:33:36 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-09 04:34:20 +0000
commit060013352fb1695e8135bf36832477cf25d5eec2 (patch)
treef28d09688a4e9efaa873b80731832e30fb64c2b7 /cc/playback
parent63d541db1c2b2eee4cbaf4635a74a438c155d152 (diff)
downloadchromium_src-060013352fb1695e8135bf36832477cf25d5eec2.zip
chromium_src-060013352fb1695e8135bf36832477cf25d5eec2.tar.gz
chromium_src-060013352fb1695e8135bf36832477cf25d5eec2.tar.bz2
Check display_list_ in HasDiscardableImagesInRect
It turns out that this can be NULL. BUG=575623 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1575553002 Cr-Commit-Position: refs/heads/master@{#368522}
Diffstat (limited to 'cc/playback')
-rw-r--r--cc/playback/display_list_raster_source.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/playback/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc
index e94b9f6..eac4916 100644
--- a/cc/playback/display_list_raster_source.cc
+++ b/cc/playback/display_list_raster_source.cc
@@ -245,7 +245,7 @@ void DisplayListRasterSource::GetDiscardableImagesInRect(
bool DisplayListRasterSource::HasDiscardableImageInRect(
const gfx::Rect& layer_rect) const {
- return display_list_->HasDiscardableImageInRect(layer_rect);
+ return display_list_ && display_list_->HasDiscardableImageInRect(layer_rect);
}
bool DisplayListRasterSource::CoversRect(const gfx::Rect& layer_rect) const {