cc/layers/contents_scaling_layer.cc - Issue 1101823002: CC Animations: Make LayerAnimationController creation optional

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/contents_scaling_layer.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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 side-by-side diff with in-line comments

Download patch

« cc/blink/web_layer_impl.cc ('K') | « cc/layers/contents_scaling_layer.h ('k') | cc/layers/contents_scaling_layer_unittest.cc » ('j') | chrome/browser/android/compositor/layer/content_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/layers/contents_scaling_layer.cc

diff --git a/cc/layers/contents_scaling_layer.cc b/cc/layers/contents_scaling_layer.cc

index b44830f5fa70cef857df1daa4b20905603e51152..c50575bedb12fe9559b374a0fbeeb51207050732 100644

--- a/cc/layers/contents_scaling_layer.cc

+++ b/cc/layers/contents_scaling_layer.cc

@@ -14,9 +14,11 @@ gfx::Size ContentsScalingLayer::ComputeContentBoundsForScale(

return gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale_x, scale_y));

}

-ContentsScalingLayer::ContentsScalingLayer()

- : last_update_contents_scale_x_(0.f),

- last_update_contents_scale_y_(0.f) {}

+ContentsScalingLayer::ContentsScalingLayer(const LayerSettings& settings)

+ : Layer(settings),

+ last_update_contents_scale_x_(0.f),

+ last_update_contents_scale_y_(0.f) {

ContentsScalingLayer::~ContentsScalingLayer() {

}