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

Unified Diff: third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
diff --git a/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h b/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
index c5f84271c69564bcc52cb62575bf1df823a4c541..1648a1337686a086a7eada6861a9b4552b1fee90 100644
--- a/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
+++ b/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
@@ -46,7 +46,7 @@ namespace blink {
class SVGElement;
-class SVGAnimatedPropertyBase : public RefCountedWillBeGarbageCollectedFinalized<SVGAnimatedPropertyBase>, public ScriptWrappable {
+class SVGAnimatedPropertyBase : public GarbageCollectedFinalized<SVGAnimatedPropertyBase>, public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO_NOT_REACHED();
WTF_MAKE_NONCOPYABLE(SVGAnimatedPropertyBase);
public:
@@ -56,8 +56,8 @@ public:
virtual const SVGPropertyBase& baseValueBase() const = 0;
virtual bool isAnimating() const = 0;
- virtual PassRefPtrWillBeRawPtr<SVGPropertyBase> createAnimatedValue() = 0;
- virtual void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase>) = 0;
+ virtual RawPtr<SVGPropertyBase> createAnimatedValue() = 0;
+ virtual void setAnimatedValue(RawPtr<SVGPropertyBase>) = 0;
virtual void animationEnded();
virtual SVGParsingError setBaseValueAsString(const String&) = 0;
@@ -105,7 +105,7 @@ private:
// This raw pointer is safe since the SVG element is guaranteed to be kept
// alive by a V8 wrapper.
// See http://crbug.com/528275 for the detail.
- RawPtrWillBeUntracedMember<SVGElement> m_contextElement;
+ UntracedMember<SVGElement> m_contextElement;
const QualifiedName& m_attributeName;
};
@@ -148,14 +148,14 @@ public:
return m_baseValue->setValueAsString(value);
}
- PassRefPtrWillBeRawPtr<SVGPropertyBase> createAnimatedValue() override
+ RawPtr<SVGPropertyBase> createAnimatedValue() override
{
return m_baseValue->clone();
}
- void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase> passValue) override
+ void setAnimatedValue(RawPtr<SVGPropertyBase> passValue) override
{
- RefPtrWillBeRawPtr<SVGPropertyBase> value = passValue;
+ RawPtr<SVGPropertyBase> value = passValue;
ASSERT(value->type() == Property::classType());
m_currentValue = static_pointer_cast<Property>(value.release());
}
@@ -175,15 +175,15 @@ public:
}
protected:
- SVGAnimatedPropertyCommon(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+ SVGAnimatedPropertyCommon(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
: SVGAnimatedPropertyBase(Property::classType(), contextElement, attributeName)
, m_baseValue(initialValue)
{
}
private:
- RefPtrWillBeMember<Property> m_baseValue;
- RefPtrWillBeMember<Property> m_currentValue;
+ Member<Property> m_baseValue;
+ Member<Property> m_currentValue;
};
// Implementation of SVGAnimatedProperty which uses primitive types.
@@ -236,7 +236,7 @@ public:
}
protected:
- SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+ SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
: SVGAnimatedPropertyCommon<Property>(contextElement, attributeName, initialValue)
, m_baseValueUpdated(false)
{
@@ -252,12 +252,12 @@ protected:
template <typename Property, typename TearOffType>
class SVGAnimatedProperty<Property, TearOffType, void> : public SVGAnimatedPropertyCommon<Property> {
public:
- static PassRefPtrWillBeRawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+ static RawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
{
- return adoptRefWillBeNoop(new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
+ return (new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
}
- void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase> value) override
+ void setAnimatedValue(RawPtr<SVGPropertyBase> value) override
{
SVGAnimatedPropertyCommon<Property>::setAnimatedValue(value);
updateAnimValTearOffIfNeeded();
@@ -307,7 +307,7 @@ public:
}
protected:
- SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+ SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
: SVGAnimatedPropertyCommon<Property>(contextElement, attributeName, initialValue)
{
}
@@ -324,8 +324,8 @@ private:
// When animated:
// m_animValTearOff targets m_currentValue.
// m_baseValTearOff targets m_baseValue.
- RefPtrWillBeMember<TearOffType> m_baseValTearOff;
- RefPtrWillBeMember<TearOffType> m_animValTearOff;
+ Member<TearOffType> m_baseValTearOff;
+ Member<TearOffType> m_animValTearOff;
};
// Implementation of SVGAnimatedProperty which doesn't use tear-off value types.
@@ -334,9 +334,9 @@ private:
template <typename Property>
class SVGAnimatedProperty<Property, void, void> : public SVGAnimatedPropertyCommon<Property> {
public:
- static PassRefPtrWillBeRawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+ static RawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
{
- return adoptRefWillBeNoop(new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
+ return (new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
}
bool needsSynchronizeAttribute() override
@@ -346,7 +346,7 @@ public:
}
protected:
- SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+ SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
: SVGAnimatedPropertyCommon<Property>(contextElement, attributeName, initialValue)
{
}

Powered by Google App Engine
This is Rietveld 408576698