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

Unified Diff: third_party/WebKit/Source/core/animation/InterpolationEnvironment.h

Issue 2567453002: Revert of Make InvalidatableInterpolation's InterpolationTypes decided at effect application time (Closed)
Patch Set: Created 4 years 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
Index: third_party/WebKit/Source/core/animation/InterpolationEnvironment.h
diff --git a/third_party/WebKit/Source/core/animation/InterpolationEnvironment.h b/third_party/WebKit/Source/core/animation/InterpolationEnvironment.h
index 61d76add65e9a2bc2949e2ed977a794166c3f401..cfae242d7e5c58b58082ff03fcd850476777fd96 100644
--- a/third_party/WebKit/Source/core/animation/InterpolationEnvironment.h
+++ b/third_party/WebKit/Source/core/animation/InterpolationEnvironment.h
@@ -5,7 +5,6 @@
#ifndef InterpolationEnvironment_h
#define InterpolationEnvironment_h
-#include "core/animation/InterpolationTypesMap.h"
#include "platform/heap/Handle.h"
#include "wtf/Allocator.h"
@@ -19,24 +18,14 @@
STACK_ALLOCATED();
public:
- explicit InterpolationEnvironment(const InterpolationTypesMap& map,
- StyleResolverState& state)
- : m_interpolationTypesMap(map),
- m_state(&state),
- m_svgElement(nullptr),
- m_svgBaseValue(nullptr) {}
+ explicit InterpolationEnvironment(StyleResolverState& state)
+ : m_state(&state), m_svgElement(nullptr), m_svgBaseValue(nullptr) {}
- explicit InterpolationEnvironment(const InterpolationTypesMap& map,
- SVGElement& svgElement,
+ explicit InterpolationEnvironment(SVGElement& svgElement,
const SVGPropertyBase& svgBaseValue)
- : m_interpolationTypesMap(map),
- m_state(nullptr),
+ : m_state(nullptr),
m_svgElement(&svgElement),
m_svgBaseValue(&svgBaseValue) {}
-
- const InterpolationTypesMap& interpolationTypesMap() const {
- return m_interpolationTypesMap;
- }
StyleResolverState& state() {
DCHECK(m_state);
@@ -62,7 +51,6 @@
}
private:
- const InterpolationTypesMap& m_interpolationTypesMap;
StyleResolverState* m_state;
Member<SVGElement> m_svgElement;
Member<const SVGPropertyBase> m_svgBaseValue;

Powered by Google App Engine
This is Rietveld 408576698