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

Side by Side Diff: Source/core/animation/EffectInput.cpp

Issue 327773004: Remove include of StyleResolverState.h from StyleResolver.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased for landing 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
« no previous file with comments | « no previous file | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/EffectInput.h" 32 #include "core/animation/EffectInput.h"
33 33
34 #include "bindings/v8/Dictionary.h" 34 #include "bindings/v8/Dictionary.h"
35 #include "core/animation/AnimationHelpers.h" 35 #include "core/animation/AnimationHelpers.h"
36 #include "core/animation/KeyframeEffectModel.h" 36 #include "core/animation/KeyframeEffectModel.h"
37 #include "core/animation/StringKeyframe.h" 37 #include "core/animation/StringKeyframe.h"
38 #include "core/css/parser/BisonCSSParser.h" 38 #include "core/css/parser/BisonCSSParser.h"
39 #include "core/css/resolver/CSSToStyleMap.h"
39 #include "core/css/resolver/StyleResolver.h" 40 #include "core/css/resolver/StyleResolver.h"
40 #include "core/dom/Element.h" 41 #include "core/dom/Element.h"
41 #include "wtf/NonCopyingSort.h" 42 #include "wtf/NonCopyingSort.h"
42 43
43 namespace WebCore { 44 namespace WebCore {
44 45
45 // FIXME: Remove this once we've removed the dependency on Element. 46 // FIXME: Remove this once we've removed the dependency on Element.
46 static bool checkDocumentAndRenderer(Element* element) 47 static bool checkDocumentAndRenderer(Element* element)
47 { 48 {
48 if (!element || !element->inActiveDocument()) 49 if (!element || !element->inActiveDocument())
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (!keyframeEffectModel->isReplaceOnly()) { 129 if (!keyframeEffectModel->isReplaceOnly()) {
129 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported."); 130 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported.");
130 return nullptr; 131 return nullptr;
131 } 132 }
132 keyframeEffectModel->forceConversionsToAnimatableValues(element); 133 keyframeEffectModel->forceConversionsToAnimatableValues(element);
133 134
134 return keyframeEffectModel; 135 return keyframeEffectModel;
135 } 136 }
136 137
137 } // namespace WebCore 138 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698