ui/compositor/test/test_layer_animation_delegate.h - Issue 311783002: Revert r274404 and r274409:

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/compositor/test/test_layer_animation_delegate.h

Issue 311783002: Revert r274404 and r274409: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #ifndef UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_	5 #ifndef UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_

6 #define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_	6 #define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_

7	7

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "ui/compositor/layer_animation_delegate.h"	9 #include "ui/compositor/layer_animation_delegate.h"

10 #include "ui/gfx/rect.h"	10 #include "ui/gfx/rect.h"

(...skipping 21 matching lines...) Expand all Loading...
32 virtual gfx::Transform GetTransformForAnimation() const OVERRIDE;	32 virtual gfx::Transform GetTransformForAnimation() const OVERRIDE;

33 virtual float GetOpacityForAnimation() const OVERRIDE;	33 virtual float GetOpacityForAnimation() const OVERRIDE;

34 virtual bool GetVisibilityForAnimation() const OVERRIDE;	34 virtual bool GetVisibilityForAnimation() const OVERRIDE;

35 virtual float GetBrightnessForAnimation() const OVERRIDE;	35 virtual float GetBrightnessForAnimation() const OVERRIDE;

36 virtual float GetGrayscaleForAnimation() const OVERRIDE;	36 virtual float GetGrayscaleForAnimation() const OVERRIDE;

37 virtual SkColor GetColorForAnimation() const OVERRIDE;	37 virtual SkColor GetColorForAnimation() const OVERRIDE;

38 virtual float GetDeviceScaleFactor() const OVERRIDE;	38 virtual float GetDeviceScaleFactor() const OVERRIDE;

39 virtual void AddThreadedAnimation(	39 virtual void AddThreadedAnimation(

40 scoped_ptr<cc::Animation> animation) OVERRIDE;	40 scoped_ptr<cc::Animation> animation) OVERRIDE;

41 virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE;	41 virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE;

42 virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE;

43	42

44 private:	43 private:

45 gfx::Rect bounds_;	44 gfx::Rect bounds_;

46 gfx::Transform transform_;	45 gfx::Transform transform_;

47 float opacity_;	46 float opacity_;

48 bool visibility_;	47 bool visibility_;

49 float brightness_;	48 float brightness_;

50 float grayscale_;	49 float grayscale_;

51 SkColor color_;	50 SkColor color_;

52	51

53 // Allow copy and assign.	52 // Allow copy and assign.

54 };	53 };

55	54

56 } // namespace ui	55 } // namespace ui

57	56

58 #endif // UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_	57 #endif // UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_

OLD	NEW

« no previous file with comments | « ui/compositor/layer_unittest.cc ('k') | ui/compositor/test/test_layer_animation_delegate.cc » ('j') | no next file with comments »