| Index: cc/layers/picture_layer.cc
|
| diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
|
| index 1cfe1f1d8480a9cd6fac8d1723fa105bb5eca72d..80d36d80331cff59f10eb7e669c5842c80a0ce9b 100644
|
| --- a/cc/layers/picture_layer.cc
|
| +++ b/cc/layers/picture_layer.cc
|
| @@ -79,20 +79,23 @@ void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
|
|
|
| void PictureLayer::SetLayerTreeHost(LayerTreeHost* host) {
|
| Layer::SetLayerTreeHost(host);
|
| - if (host) {
|
| - if (!recording_source_) {
|
| - if (host->settings().use_display_lists) {
|
| - recording_source_.reset(new DisplayListRecordingSource);
|
| - } else {
|
| - recording_source_.reset(
|
| - new PicturePile(host->settings().minimum_contents_scale,
|
| - host->settings().default_tile_grid_size));
|
| - }
|
| + if (!host)
|
| + return;
|
| +
|
| + if (!recording_source_) {
|
| + if (host->settings().use_display_lists) {
|
| + recording_source_.reset(new DisplayListRecordingSource);
|
| + } else {
|
| + recording_source_.reset(
|
| + new PicturePile(host->settings().minimum_contents_scale,
|
| + host->settings().default_tile_grid_size));
|
| }
|
| - recording_source_->DidMoveToNewCompositor();
|
| - recording_source_->SetSlowdownRasterScaleFactor(
|
| - host->debug_state().slow_down_raster_scale_factor);
|
| }
|
| + recording_source_->DidMoveToNewCompositor();
|
| + recording_source_->SetSlowdownRasterScaleFactor(
|
| + host->debug_state().slow_down_raster_scale_factor);
|
| +
|
| + DCHECK(host->settings().raster_enabled);
|
| }
|
|
|
| void PictureLayer::SetNeedsDisplayRect(const gfx::Rect& layer_rect) {
|
|
|