| 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 6a38c4148fc1d504222f9df91949522c70108e2c..e22f9edcda397af042aa32f9feac3b9a011152c9 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;
|
| PassRefPtr<JSONObject> createValueDescription(const String&);
|
| void appendAnchorFor(JSONArray*, const String&, const String&);
|
| bool setCSSPropertyValueInCurrentRule(const String&);
|
| @@ -55,17 +54,17 @@ private:
|
| PassRefPtr<JSONObject> 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;
|
| };
|
|
|