third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp - Issue 2948193002: Merge AnimationTimeline and DocumentTimeline

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2948193002: Merge AnimationTimeline and DocumentTimeline (Closed)

Patch Set: Fix rebase error Created 3 years, 5 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:

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)	3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)

4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)	4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)

5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.	5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.

6 * All rights reserved.	6 * All rights reserved.

7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>	7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>

8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>	8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>

9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.	9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.

10 * (http://www.torchmobile.com/)	10 * (http://www.torchmobile.com/)

(...skipping 16 matching lines...) Expand all Loading...
27 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	27 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

28 * Boston, MA 02110-1301, USA.	28 * Boston, MA 02110-1301, USA.

29 */	29 */

30	30

31 #include "core/css/resolver/StyleResolver.h"	31 #include "core/css/resolver/StyleResolver.h"

32	32

33 #include "core/CSSPropertyNames.h"	33 #include "core/CSSPropertyNames.h"

34 #include "core/HTMLNames.h"	34 #include "core/HTMLNames.h"

35 #include "core/MediaTypeNames.h"	35 #include "core/MediaTypeNames.h"

36 #include "core/StylePropertyShorthand.h"	36 #include "core/StylePropertyShorthand.h"

37 #include "core/animation/AnimationTimeline.h"

38 #include "core/animation/CSSInterpolationEnvironment.h"	37 #include "core/animation/CSSInterpolationEnvironment.h"

39 #include "core/animation/CSSInterpolationTypesMap.h"	38 #include "core/animation/CSSInterpolationTypesMap.h"

40 #include "core/animation/ElementAnimations.h"	39 #include "core/animation/ElementAnimations.h"

41 #include "core/animation/InvalidatableInterpolation.h"	40 #include "core/animation/InvalidatableInterpolation.h"

42 #include "core/animation/KeyframeEffect.h"	41 #include "core/animation/KeyframeEffect.h"

43 #include "core/animation/LegacyStyleInterpolation.h"	42 #include "core/animation/LegacyStyleInterpolation.h"

44 #include "core/animation/TransitionInterpolation.h"	43 #include "core/animation/TransitionInterpolation.h"

45 #include "core/animation/animatable/AnimatableValue.h"	44 #include "core/animation/animatable/AnimatableValue.h"

46 #include "core/animation/css/CSSAnimatableValueFactory.h"	45 #include "core/animation/css/CSSAnimatableValueFactory.h"

47 #include "core/animation/css/CSSAnimations.h"	46 #include "core/animation/css/CSSAnimations.h"

(...skipping 1976 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2024	2023

2025 DEFINE_TRACE(StyleResolver) {	2024 DEFINE_TRACE(StyleResolver) {

2026 visitor->Trace(matched_properties_cache_);	2025 visitor->Trace(matched_properties_cache_);

2027 visitor->Trace(selector_filter_);	2026 visitor->Trace(selector_filter_);

2028 visitor->Trace(style_sharing_lists_);	2027 visitor->Trace(style_sharing_lists_);

2029 visitor->Trace(document_);	2028 visitor->Trace(document_);

2030 visitor->Trace(tracker_);	2029 visitor->Trace(tracker_);

2031 }	2030 }

2032	2031

2033 } // namespace blink	2032 } // namespace blink

OLD	NEW