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

Side by Side Diff: third_party/WebKit/Source/core/dom/Element.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:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * (C) 2007 Eric Seidel (eric@webkit.org) 9 * (C) 2007 Eric Seidel (eric@webkit.org)
10 * 10 *
(...skipping 17 matching lines...) Expand all
28 28
29 #include <memory> 29 #include <memory>
30 #include "bindings/core/v8/Dictionary.h" 30 #include "bindings/core/v8/Dictionary.h"
31 #include "bindings/core/v8/ExceptionMessages.h" 31 #include "bindings/core/v8/ExceptionMessages.h"
32 #include "bindings/core/v8/ExceptionState.h" 32 #include "bindings/core/v8/ExceptionState.h"
33 #include "bindings/core/v8/ScrollIntoViewOptionsOrBoolean.h" 33 #include "bindings/core/v8/ScrollIntoViewOptionsOrBoolean.h"
34 #include "bindings/core/v8/V8DOMActivityLogger.h" 34 #include "bindings/core/v8/V8DOMActivityLogger.h"
35 #include "core/CSSValueKeywords.h" 35 #include "core/CSSValueKeywords.h"
36 #include "core/SVGNames.h" 36 #include "core/SVGNames.h"
37 #include "core/XMLNames.h" 37 #include "core/XMLNames.h"
38 #include "core/animation/AnimationTimeline.h"
39 #include "core/animation/CustomCompositorAnimations.h" 38 #include "core/animation/CustomCompositorAnimations.h"
40 #include "core/animation/css/CSSAnimations.h" 39 #include "core/animation/css/CSSAnimations.h"
41 #include "core/css/CSSIdentifierValue.h" 40 #include "core/css/CSSIdentifierValue.h"
42 #include "core/css/CSSPrimitiveValue.h" 41 #include "core/css/CSSPrimitiveValue.h"
43 #include "core/css/CSSStyleSheet.h" 42 #include "core/css/CSSStyleSheet.h"
44 #include "core/css/CSSValue.h" 43 #include "core/css/CSSValue.h"
45 #include "core/css/PropertySetCSSStyleDeclaration.h" 44 #include "core/css/PropertySetCSSStyleDeclaration.h"
46 #include "core/css/StylePropertySet.h" 45 #include "core/css/StylePropertySet.h"
47 #include "core/css/parser/CSSParser.h" 46 #include "core/css/parser/CSSParser.h"
48 #include "core/css/resolver/SelectorFilterParentScope.h" 47 #include "core/css/resolver/SelectorFilterParentScope.h"
(...skipping 4351 matching lines...) Expand 10 before | Expand all | Expand 10 after
4400 } 4399 }
4401 4400
4402 DEFINE_TRACE_WRAPPERS(Element) { 4401 DEFINE_TRACE_WRAPPERS(Element) {
4403 if (HasRareData()) { 4402 if (HasRareData()) {
4404 visitor->TraceWrappers(GetElementRareData()); 4403 visitor->TraceWrappers(GetElementRareData());
4405 } 4404 }
4406 ContainerNode::TraceWrappers(visitor); 4405 ContainerNode::TraceWrappers(visitor);
4407 } 4406 }
4408 4407
4409 } // namespace blink 4408 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698