Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: cc/trees/layer_tree_impl.cc

Issue 2730203002: Revert of Discard compositor frames from unloaded web content (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_impl.h" 5 #include "cc/trees/layer_tree_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 last_scrolled_scroll_node_index_(ScrollTree::kInvalidNodeId), 66 last_scrolled_scroll_node_index_(ScrollTree::kInvalidNodeId),
67 overscroll_elasticity_layer_id_(Layer::INVALID_ID), 67 overscroll_elasticity_layer_id_(Layer::INVALID_ID),
68 page_scale_layer_id_(Layer::INVALID_ID), 68 page_scale_layer_id_(Layer::INVALID_ID),
69 inner_viewport_scroll_layer_id_(Layer::INVALID_ID), 69 inner_viewport_scroll_layer_id_(Layer::INVALID_ID),
70 outer_viewport_scroll_layer_id_(Layer::INVALID_ID), 70 outer_viewport_scroll_layer_id_(Layer::INVALID_ID),
71 page_scale_factor_(page_scale_factor), 71 page_scale_factor_(page_scale_factor),
72 min_page_scale_factor_(0), 72 min_page_scale_factor_(0),
73 max_page_scale_factor_(0), 73 max_page_scale_factor_(0),
74 device_scale_factor_(1.f), 74 device_scale_factor_(1.f),
75 painted_device_scale_factor_(1.f), 75 painted_device_scale_factor_(1.f),
76 content_source_id_(0),
77 elastic_overscroll_(elastic_overscroll), 76 elastic_overscroll_(elastic_overscroll),
78 layers_(new OwnedLayerImplList), 77 layers_(new OwnedLayerImplList),
79 viewport_size_invalid_(false), 78 viewport_size_invalid_(false),
80 needs_update_draw_properties_(true), 79 needs_update_draw_properties_(true),
81 needs_full_tree_sync_(true), 80 needs_full_tree_sync_(true),
82 next_activation_forces_redraw_(false), 81 next_activation_forces_redraw_(false),
83 has_ever_been_drawn_(false), 82 has_ever_been_drawn_(false),
84 handle_visibility_changed_(false), 83 handle_visibility_changed_(false),
85 have_scroll_event_handlers_(false), 84 have_scroll_event_handlers_(false),
86 event_listener_properties_(), 85 event_listener_properties_(),
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 480
482 // Active tree already shares the page_scale_factor object with pending 481 // Active tree already shares the page_scale_factor object with pending
483 // tree so only the limits need to be provided. 482 // tree so only the limits need to be provided.
484 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), 483 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(),
485 max_page_scale_factor()); 484 max_page_scale_factor());
486 target_tree->SetDeviceScaleFactor(device_scale_factor()); 485 target_tree->SetDeviceScaleFactor(device_scale_factor());
487 target_tree->set_painted_device_scale_factor(painted_device_scale_factor()); 486 target_tree->set_painted_device_scale_factor(painted_device_scale_factor());
488 target_tree->SetDeviceColorSpace(device_color_space_); 487 target_tree->SetDeviceColorSpace(device_color_space_);
489 target_tree->elastic_overscroll()->PushPendingToActive(); 488 target_tree->elastic_overscroll()->PushPendingToActive();
490 489
491 target_tree->set_content_source_id(content_source_id());
492
493 target_tree->pending_page_scale_animation_ = 490 target_tree->pending_page_scale_animation_ =
494 std::move(pending_page_scale_animation_); 491 std::move(pending_page_scale_animation_);
495 492
496 target_tree->SetViewportLayersFromIds( 493 target_tree->SetViewportLayersFromIds(
497 overscroll_elasticity_layer_id_, page_scale_layer_id_, 494 overscroll_elasticity_layer_id_, page_scale_layer_id_,
498 inner_viewport_scroll_layer_id_, outer_viewport_scroll_layer_id_); 495 inner_viewport_scroll_layer_id_, outer_viewport_scroll_layer_id_);
499 496
500 target_tree->RegisterSelection(selection_); 497 target_tree->RegisterSelection(selection_);
501 498
502 // This should match the property synchronization in 499 // This should match the property synchronization in
(...skipping 1635 matching lines...) Expand 10 before | Expand all | Expand 10 after
2138 2135
2139 void LayerTreeImpl::ResetAllChangeTracking() { 2136 void LayerTreeImpl::ResetAllChangeTracking() {
2140 layers_that_should_push_properties_.clear(); 2137 layers_that_should_push_properties_.clear();
2141 // Iterate over all layers, including masks. 2138 // Iterate over all layers, including masks.
2142 for (auto& layer : *layers_) 2139 for (auto& layer : *layers_)
2143 layer->ResetChangeTracking(); 2140 layer->ResetChangeTracking();
2144 property_trees_.ResetAllChangeTracking(); 2141 property_trees_.ResetAllChangeTracking();
2145 } 2142 }
2146 2143
2147 } // namespace cc 2144 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698