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

Side by Side Diff: cc/layers/layer_impl.cc

Issue 1385123003: Delete scrollCompensationAdjustment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 4 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/layers/layer_impl.h ('k') | cc/layers/layer_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/layers/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 layer->SetTransformAndInvertibility(transform_, transform_is_invertible_); 532 layer->SetTransformAndInvertibility(transform_, transform_is_invertible_);
533 if (layer_property_changed_) 533 if (layer_property_changed_)
534 layer->NoteLayerPropertyChanged(); 534 layer->NoteLayerPropertyChanged();
535 535
536 layer->SetScrollClipLayer(scroll_clip_layer_id_); 536 layer->SetScrollClipLayer(scroll_clip_layer_id_);
537 layer->SetElementId(element_id_); 537 layer->SetElementId(element_id_);
538 layer->SetMutableProperties(mutable_properties_); 538 layer->SetMutableProperties(mutable_properties_);
539 layer->set_user_scrollable_horizontal(user_scrollable_horizontal_); 539 layer->set_user_scrollable_horizontal(user_scrollable_horizontal_);
540 layer->set_user_scrollable_vertical(user_scrollable_vertical_); 540 layer->set_user_scrollable_vertical(user_scrollable_vertical_);
541 541
542 layer->SetScrollCompensationAdjustment(scroll_compensation_adjustment_);
543
544 layer->Set3dSortingContextId(sorting_context_id_); 542 layer->Set3dSortingContextId(sorting_context_id_);
545 layer->SetNumDescendantsThatDrawContent(num_descendants_that_draw_content_); 543 layer->SetNumDescendantsThatDrawContent(num_descendants_that_draw_content_);
546 544
547 layer->SetTransformTreeIndex(transform_tree_index_); 545 layer->SetTransformTreeIndex(transform_tree_index_);
548 layer->SetClipTreeIndex(clip_tree_index_); 546 layer->SetClipTreeIndex(clip_tree_index_);
549 layer->SetEffectTreeIndex(effect_tree_index_); 547 layer->SetEffectTreeIndex(effect_tree_index_);
550 layer->SetScrollTreeIndex(scroll_tree_index_); 548 layer->SetScrollTreeIndex(scroll_tree_index_);
551 layer->set_offset_to_transform_parent(offset_to_transform_parent_); 549 layer->set_offset_to_transform_parent(offset_to_transform_parent_);
552 550
553 LayerImpl* scroll_parent = nullptr; 551 LayerImpl* scroll_parent = nullptr;
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 .layer_transforms_should_scale_layer_contents) { 1617 .layer_transforms_should_scale_layer_contents) {
1620 return default_scale; 1618 return default_scale;
1621 } 1619 }
1622 1620
1623 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( 1621 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
1624 DrawTransform(), default_scale); 1622 DrawTransform(), default_scale);
1625 return std::max(transform_scales.x(), transform_scales.y()); 1623 return std::max(transform_scales.x(), transform_scales.y());
1626 } 1624 }
1627 1625
1628 } // namespace cc 1626 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698