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

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

Issue 1675963002: Move MaxScrollOffset to property_trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests failures Created 4 years, 10 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
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_host.h" 5 #include "cc/trees/layer_tree_host.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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 : Layer::INVALID_ID); 417 : Layer::INVALID_ID);
418 DCHECK(inner_viewport_scroll_layer_->IsContainerForFixedPositionLayers()); 418 DCHECK(inner_viewport_scroll_layer_->IsContainerForFixedPositionLayers());
419 } else { 419 } else {
420 sync_tree->ClearViewportLayers(); 420 sync_tree->ClearViewportLayers();
421 } 421 }
422 422
423 sync_tree->RegisterSelection(selection_); 423 sync_tree->RegisterSelection(selection_);
424 424
425 // Setting property trees must happen before pushing the page scale. 425 // Setting property trees must happen before pushing the page scale.
426 sync_tree->SetPropertyTrees(property_trees_); 426 sync_tree->SetPropertyTrees(property_trees_);
427 sync_tree->property_trees()->SetupInternalPointers();
427 428
428 sync_tree->PushPageScaleFromMainThread( 429 sync_tree->PushPageScaleFromMainThread(
429 page_scale_factor_, min_page_scale_factor_, max_page_scale_factor_); 430 page_scale_factor_, min_page_scale_factor_, max_page_scale_factor_);
430 sync_tree->elastic_overscroll()->PushFromMainThread(elastic_overscroll_); 431 sync_tree->elastic_overscroll()->PushFromMainThread(elastic_overscroll_);
431 if (sync_tree->IsActiveTree()) 432 if (sync_tree->IsActiveTree())
432 sync_tree->elastic_overscroll()->PushPendingToActive(); 433 sync_tree->elastic_overscroll()->PushPendingToActive();
433 434
434 sync_tree->PassSwapPromises(&swap_promise_list_); 435 sync_tree->PassSwapPromises(&swap_promise_list_);
435 436
436 sync_tree->set_top_controls_shrink_blink_size( 437 sync_tree->set_top_controls_shrink_blink_size(
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 LayerTreeHostCommon::CallFunctionForSubtree( 1577 LayerTreeHostCommon::CallFunctionForSubtree(
1577 root_layer(), [seq_num](Layer* layer) { 1578 root_layer(), [seq_num](Layer* layer) {
1578 layer->set_property_tree_sequence_number(seq_num); 1579 layer->set_property_tree_sequence_number(seq_num);
1579 }); 1580 });
1580 1581
1581 surface_id_namespace_ = proto.surface_id_namespace(); 1582 surface_id_namespace_ = proto.surface_id_namespace();
1582 next_surface_sequence_ = proto.next_surface_sequence(); 1583 next_surface_sequence_ = proto.next_surface_sequence();
1583 } 1584 }
1584 1585
1585 } // namespace cc 1586 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698