Skip to content

Commit

Permalink
cc: Remove legacy update loop
Browse files Browse the repository at this point in the history
Now that impl-side painting is always on, using_only_property_trees is
always true on the main thread, so the old update loop can be removed.

Because the old update loop is not on any more, several tiled layer unit
tests start failing due to prioritization and partial updates.  Since
tiled layer is on the way out, this CL just removes the whole unit test
file.

R=danakj,vmpstr
BUG=413479
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1188853002

Cr-Commit-Position: refs/heads/master@{#334877}
  • Loading branch information
quisquous authored and Commit bot committed Jun 17, 2015
1 parent 39568f1 commit 01c33ea
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 1,666 deletions.
1 change: 0 additions & 1 deletion cc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,6 @@ test("cc_unittests") {
"layers/texture_layer_impl_unittest.cc",
"layers/texture_layer_unittest.cc",
"layers/tiled_layer_impl_unittest.cc",
"layers/tiled_layer_unittest.cc",
"layers/ui_resource_layer_impl_unittest.cc",
"layers/ui_resource_layer_unittest.cc",
"layers/video_frame_provider_client_impl_unittest.cc",
Expand Down
1 change: 0 additions & 1 deletion cc/cc_tests.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
'layers/texture_layer_impl_unittest.cc',
'layers/texture_layer_unittest.cc',
'layers/tiled_layer_impl_unittest.cc',
'layers/tiled_layer_unittest.cc',
'layers/ui_resource_layer_impl_unittest.cc',
'layers/ui_resource_layer_unittest.cc',
'layers/video_frame_provider_client_impl_unittest.cc',
Expand Down
12 changes: 2 additions & 10 deletions cc/layers/layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1153,16 +1153,8 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
layer->SetBackgroundColor(background_color_);
layer->SetBounds(use_paint_properties ? paint_properties_.bounds
: bounds_);

// TODO(enne): This is needed because CDP does this. Once main thread CDP
// goes away, content scale / bounds can be removed.
if (layer_tree_host()->using_only_property_trees()) {
layer->SetContentsScale(1.f, 1.f);
layer->SetContentBounds(bounds());
} else {
layer->SetContentBounds(content_bounds());
layer->SetContentsScale(contents_scale_x(), contents_scale_y());
}
layer->SetContentsScale(1.f, 1.f);
layer->SetContentBounds(bounds());

if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots())
layer->SetDebugInfo(TakeDebugInfo());
Expand Down
8 changes: 2 additions & 6 deletions cc/layers/painted_scrollbar_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,8 @@ void PaintedScrollbarLayer::UpdateInternalContentScale() {
->settings()
.layer_transforms_should_scale_layer_contents) {
gfx::Transform transform;
if (layer_tree_host()->using_only_property_trees()) {
transform = DrawTransformFromPropertyTrees(
this, layer_tree_host()->property_trees()->transform_tree);
} else {
transform = draw_transform();
}
transform = DrawTransformFromPropertyTrees(
this, layer_tree_host()->property_trees()->transform_tree);

gfx::Vector2dF transform_scales =
MathUtil::ComputeTransform2dScaleComponents(transform, scale);
Expand Down
Loading

0 comments on commit 01c33ea

Please sign in to comment.