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

Unified Diff: third_party/WebKit/Source/core/dom/ElementRareData.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, 9 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/dom/ElementRareData.h
diff --git a/third_party/WebKit/Source/core/dom/ElementRareData.h b/third_party/WebKit/Source/core/dom/ElementRareData.h
index 06782122245440e1232f8717b6a025e723eea06f..82bba1140b51fae54f6784bbea0c3f9c5bdc8d5b 100644
--- a/third_party/WebKit/Source/core/dom/ElementRareData.h
+++ b/third_party/WebKit/Source/core/dom/ElementRareData.h
@@ -52,7 +52,7 @@ public:
~ElementRareData();
- void setPseudoElement(PseudoId, PassRefPtrWillBeRawPtr<PseudoElement>);
+ void setPseudoElement(PseudoId, RawPtr<PseudoElement>);
PseudoElement* pseudoElement(PseudoId) const;
short tabIndex() const { return m_tabindex; }
@@ -81,14 +81,14 @@ public:
}
NamedNodeMap* attributeMap() const { return m_attributeMap.get(); }
- void setAttributeMap(PassOwnPtrWillBeRawPtr<NamedNodeMap> attributeMap) { m_attributeMap = attributeMap; }
+ void setAttributeMap(RawPtr<NamedNodeMap> attributeMap) { m_attributeMap = attributeMap; }
ComputedStyle* ensureComputedStyle() const { return m_computedStyle.get(); }
void setComputedStyle(PassRefPtr<ComputedStyle> computedStyle) { m_computedStyle = computedStyle; }
void clearComputedStyle() { m_computedStyle = nullptr; }
ClassList* classList() const { return m_classList.get(); }
- void setClassList(PassRefPtrWillBeRawPtr<ClassList> classList) { m_classList = classList.leakRef(); }
+ void setClassList(RawPtr<ClassList> classList) { m_classList = classList.leakRef(); }
void clearClassListValueForQuirksMode()
{
if (!m_classList)
@@ -97,7 +97,7 @@ public:
}
DatasetDOMStringMap* dataset() const { return m_dataset.get(); }
- void setDataset(PassOwnPtrWillBeRawPtr<DatasetDOMStringMap> dataset) { m_dataset = dataset; }
+ void setDataset(RawPtr<DatasetDOMStringMap> dataset) { m_dataset = dataset; }
LayoutSize minimumSizeForResizing() const { return m_minimumSizeForResizing; }
void setMinimumSizeForResizing(LayoutSize size) { m_minimumSizeForResizing = size; }
@@ -118,7 +118,7 @@ public:
void decrementCompositorProxiedProperties(uint32_t properties);
CompositorProxiedPropertySet* proxiedPropertyCounts() const { return m_proxiedProperties.get(); }
- void setCustomElementDefinition(PassRefPtrWillBeRawPtr<CustomElementDefinition> definition) { m_customElementDefinition = definition; }
+ void setCustomElementDefinition(RawPtr<CustomElementDefinition> definition) { m_customElementDefinition = definition; }
CustomElementDefinition* customElementDefinition() const { return m_customElementDefinition.get(); }
AttrNodeList& ensureAttrNodeList();
@@ -144,24 +144,24 @@ private:
LayoutSize m_minimumSizeForResizing;
IntSize m_savedLayerScrollOffset;
- OwnPtrWillBeMember<DatasetDOMStringMap> m_dataset;
- OwnPtrWillBeMember<ElementShadow> m_shadow;
- RawPtrWillBeMember<ClassList> m_classList;
- OwnPtrWillBeMember<NamedNodeMap> m_attributeMap;
- OwnPtrWillBeMember<AttrNodeList> m_attrNodeList;
- OwnPtrWillBeMember<InlineCSSStyleDeclaration> m_cssomWrapper;
+ Member<DatasetDOMStringMap> m_dataset;
+ Member<ElementShadow> m_shadow;
+ Member<ClassList> m_classList;
+ Member<NamedNodeMap> m_attributeMap;
+ Member<AttrNodeList> m_attrNodeList;
+ Member<InlineCSSStyleDeclaration> m_cssomWrapper;
OwnPtr<CompositorProxiedPropertySet> m_proxiedProperties;
- PersistentWillBeMember<ElementAnimations> m_elementAnimations;
- PersistentWillBeMember<NodeIntersectionObserverData> m_intersectionObserverData;
+ Member<ElementAnimations> m_elementAnimations;
+ Member<NodeIntersectionObserverData> m_intersectionObserverData;
RefPtr<ComputedStyle> m_computedStyle;
- RefPtrWillBeMember<CustomElementDefinition> m_customElementDefinition;
+ Member<CustomElementDefinition> m_customElementDefinition;
- RefPtrWillBeMember<PseudoElement> m_generatedBefore;
- RefPtrWillBeMember<PseudoElement> m_generatedAfter;
- RefPtrWillBeMember<PseudoElement> m_generatedFirstLetter;
- RefPtrWillBeMember<PseudoElement> m_backdrop;
+ Member<PseudoElement> m_generatedBefore;
+ Member<PseudoElement> m_generatedAfter;
+ Member<PseudoElement> m_generatedFirstLetter;
+ Member<PseudoElement> m_backdrop;
explicit ElementRareData(LayoutObject*);
};
@@ -208,7 +208,7 @@ inline void ElementRareData::clearPseudoElements()
setPseudoElement(PseudoIdFirstLetter, nullptr);
}
-inline void ElementRareData::setPseudoElement(PseudoId pseudoId, PassRefPtrWillBeRawPtr<PseudoElement> element)
+inline void ElementRareData::setPseudoElement(PseudoId pseudoId, RawPtr<PseudoElement> element)
{
switch (pseudoId) {
case PseudoIdBefore:
« no previous file with comments | « third_party/WebKit/Source/core/dom/ElementDataCache.cpp ('k') | third_party/WebKit/Source/core/dom/ElementRareData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698