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

Unified Diff: third_party/WebKit/Source/core/inspector/LayoutEditor.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/inspector/LayoutEditor.h
diff --git a/third_party/WebKit/Source/core/inspector/LayoutEditor.h b/third_party/WebKit/Source/core/inspector/LayoutEditor.h
index 279d7fe16f53ac4f7254ce2831f6f1b04e0987d7..91c4fc5fd51c9f42c9b1cd17fc59d4011852ad4c 100644
--- a/third_party/WebKit/Source/core/inspector/LayoutEditor.h
+++ b/third_party/WebKit/Source/core/inspector/LayoutEditor.h
@@ -23,12 +23,11 @@ class InspectorCSSAgent;
class InspectorDOMAgent;
class ScriptController;
-class CORE_EXPORT LayoutEditor final : public NoBaseWillBeGarbageCollectedFinalized<LayoutEditor> {
- USING_FAST_MALLOC_WILL_BE_REMOVED(LayoutEditor);
+class CORE_EXPORT LayoutEditor final : public GarbageCollectedFinalized<LayoutEditor> {
public:
- static PassOwnPtrWillBeRawPtr<LayoutEditor> create(Element* element, InspectorCSSAgent* cssAgent, InspectorDOMAgent* domAgent, ScriptController* scriptController)
+ static RawPtr<LayoutEditor> create(Element* element, InspectorCSSAgent* cssAgent, InspectorDOMAgent* domAgent, ScriptController* scriptController)
{
- return adoptPtrWillBeNoop(new LayoutEditor(element, cssAgent, domAgent, scriptController));
+ return new LayoutEditor(element, cssAgent, domAgent, scriptController);
}
~LayoutEditor();
@@ -46,7 +45,7 @@ public:
private:
LayoutEditor(Element*, InspectorCSSAgent*, InspectorDOMAgent*, ScriptController*);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> getPropertyCSSValue(CSSPropertyID) const;
+ RawPtr<CSSPrimitiveValue> getPropertyCSSValue(CSSPropertyID) const;
PassOwnPtr<protocol::DictionaryValue> createValueDescription(const String&);
void appendAnchorFor(protocol::ListValue*, const String&, const String&);
bool setCSSPropertyValueInCurrentRule(const String&);
@@ -55,17 +54,17 @@ private:
PassOwnPtr<protocol::DictionaryValue> currentSelectorInfo(CSSStyleDeclaration*) const;
bool growInside(String propertyName, CSSPrimitiveValue*);
- RefPtrWillBeMember<Element> m_element;
- RawPtrWillBeMember<InspectorCSSAgent> m_cssAgent;
- RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;
- RawPtrWillBeMember<ScriptController> m_scriptController;
+ Member<Element> m_element;
+ Member<InspectorCSSAgent> m_cssAgent;
+ Member<InspectorDOMAgent> m_domAgent;
+ Member<ScriptController> m_scriptController;
CSSPropertyID m_changingProperty;
float m_propertyInitialValue;
float m_factor;
CSSPrimitiveValue::UnitType m_valueUnitType;
bool m_isDirty;
- WillBeHeapVector<RefPtrWillBeMember<CSSStyleDeclaration>> m_matchedStyles;
+ HeapVector<Member<CSSStyleDeclaration>> m_matchedStyles;
HashMap<String, bool> m_growsInside;
unsigned m_currentRuleIndex;
};

Powered by Google App Engine
This is Rietveld 408576698