| Index: cc/layers/picture_layer.cc
|
| diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
|
| index 16e3fab96a72f1694c795a1c03287acb2b8b3f51..f844fe0a7913bd2c7b85088c1431a506154db778 100644
|
| --- a/cc/layers/picture_layer.cc
|
| +++ b/cc/layers/picture_layer.cc
|
| @@ -102,7 +102,9 @@ bool PictureLayer::Update() {
|
|
|
| gfx::Size layer_size = paint_properties().bounds;
|
|
|
| - recording_source_->SetBackgroundColor(UseTransformedRasterization() ? SK_ColorTRANSPARENT : SafeOpaqueBackgroundColor());
|
| + recording_source_->SetBackgroundColor(UseTransformedRasterization()
|
| + ? SK_ColorTRANSPARENT
|
| + : SafeOpaqueBackgroundColor());
|
| recording_source_->SetRequiresClear(
|
| !contents_opaque() &&
|
| !picture_layer_inputs_.client->FillsBoundsCompletely());
|
| @@ -276,17 +278,22 @@ bool PictureLayer::UseTransformedRasterization() const {
|
| if (!picture_layer_inputs_.allow_transformed_rasterization)
|
| return false;
|
|
|
| - const TransformTree &transform_tree = GetLayerTree()->property_trees()->transform_tree;
|
| + const TransformTree& transform_tree =
|
| + GetLayerTree()->property_trees()->transform_tree;
|
| DCHECK(!transform_tree.needs_update());
|
| - if (transform_tree.Node(transform_tree_index())->to_screen_is_potentially_animated)
|
| + if (transform_tree.Node(transform_tree_index())
|
| + ->to_screen_is_potentially_animated)
|
| return false;
|
|
|
| - const gfx::Transform& to_screen = transform_tree.ToScreen(transform_tree_index());
|
| + const gfx::Transform& to_screen =
|
| + transform_tree.ToScreen(transform_tree_index());
|
| if (!to_screen.IsScaleOrTranslation())
|
| return false;
|
|
|
| - float origin_x = to_screen.matrix().getFloat(0, 3) + offset_to_transform_parent().x();
|
| - float origin_y = to_screen.matrix().getFloat(1, 3) + offset_to_transform_parent().y();
|
| + float origin_x =
|
| + to_screen.matrix().getFloat(0, 3) + offset_to_transform_parent().x();
|
| + float origin_y =
|
| + to_screen.matrix().getFloat(1, 3) + offset_to_transform_parent().y();
|
| if (origin_x - floorf(origin_x) == 0.f && origin_y - floorf(origin_y) == 0.f)
|
| return false;
|
|
|
|
|