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

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

Issue 2245053002: Fix UB with LayerTreeImpl::PassSwapPromises usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use std::vector::clear instead Created 4 years, 4 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_host.cc ('k') | no next file » | 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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 // offsets when UpdateViewportContainerSizes is called from e.g. 419 // offsets when UpdateViewportContainerSizes is called from e.g.
420 // PushTopControls 420 // PushTopControls
421 target_tree->UpdatePropertyTreesForBoundsDelta(); 421 target_tree->UpdatePropertyTreesForBoundsDelta();
422 422
423 if (next_activation_forces_redraw_) { 423 if (next_activation_forces_redraw_) {
424 target_tree->ForceRedrawNextActivation(); 424 target_tree->ForceRedrawNextActivation();
425 next_activation_forces_redraw_ = false; 425 next_activation_forces_redraw_ = false;
426 } 426 }
427 427
428 target_tree->PassSwapPromises(std::move(swap_promise_list_)); 428 target_tree->PassSwapPromises(std::move(swap_promise_list_));
429 swap_promise_list_.clear();
429 430
430 target_tree->set_top_controls_shrink_blink_size( 431 target_tree->set_top_controls_shrink_blink_size(
431 top_controls_shrink_blink_size_); 432 top_controls_shrink_blink_size_);
432 target_tree->set_top_controls_height(top_controls_height_); 433 target_tree->set_top_controls_height(top_controls_height_);
433 target_tree->PushTopControls(nullptr); 434 target_tree->PushTopControls(nullptr);
434 435
435 // Active tree already shares the page_scale_factor object with pending 436 // Active tree already shares the page_scale_factor object with pending
436 // tree so only the limits need to be provided. 437 // tree so only the limits need to be provided.
437 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), 438 target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(),
438 max_page_scale_factor()); 439 max_page_scale_factor());
(...skipping 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after
2065 2066
2066 void LayerTreeImpl::ResetAllChangeTracking() { 2067 void LayerTreeImpl::ResetAllChangeTracking() {
2067 layers_that_should_push_properties_.clear(); 2068 layers_that_should_push_properties_.clear();
2068 // Iterate over all layers, including masks and replicas. 2069 // Iterate over all layers, including masks and replicas.
2069 for (auto& layer : *layers_) 2070 for (auto& layer : *layers_)
2070 layer->ResetChangeTracking(); 2071 layer->ResetChangeTracking();
2071 property_trees_.ResetAllChangeTracking(); 2072 property_trees_.ResetAllChangeTracking();
2072 } 2073 }
2073 2074
2074 } // namespace cc 2075 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698