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

Unified Diff: third_party/WebKit/Source/core/editing/EditingStyle.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/editing/EditingStyle.h
diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.h b/third_party/WebKit/Source/core/editing/EditingStyle.h
index c98e6bd65290be9ddef9a5e0b0086949e1c817cd..db494e887cb035939313086d27422900904741f0 100644
--- a/third_party/WebKit/Source/core/editing/EditingStyle.h
+++ b/third_party/WebKit/Source/core/editing/EditingStyle.h
@@ -59,7 +59,7 @@ class QualifiedName;
class ComputedStyle;
class StylePropertySet;
-class EditingStyle final : public RefCountedWillBeGarbageCollectedFinalized<EditingStyle> {
+class EditingStyle final : public GarbageCollectedFinalized<EditingStyle> {
public:
enum PropertiesToInclude { AllProperties, OnlyEditingInheritableProperties, EditingPropertiesInEffect };
@@ -67,29 +67,29 @@ public:
enum ShouldExtractMatchingStyle { ExtractMatchingStyle, DoNotExtractMatchingStyle };
static float NoFontDelta;
- static PassRefPtrWillBeRawPtr<EditingStyle> create()
+ static RawPtr<EditingStyle> create()
{
- return adoptRefWillBeNoop(new EditingStyle());
+ return new EditingStyle();
}
- static PassRefPtrWillBeRawPtr<EditingStyle> create(ContainerNode* node, PropertiesToInclude propertiesToInclude = OnlyEditingInheritableProperties)
+ static RawPtr<EditingStyle> create(ContainerNode* node, PropertiesToInclude propertiesToInclude = OnlyEditingInheritableProperties)
{
- return adoptRefWillBeNoop(new EditingStyle(node, propertiesToInclude));
+ return new EditingStyle(node, propertiesToInclude);
}
- static PassRefPtrWillBeRawPtr<EditingStyle> create(const Position& position, PropertiesToInclude propertiesToInclude = OnlyEditingInheritableProperties)
+ static RawPtr<EditingStyle> create(const Position& position, PropertiesToInclude propertiesToInclude = OnlyEditingInheritableProperties)
{
- return adoptRefWillBeNoop(new EditingStyle(position, propertiesToInclude));
+ return new EditingStyle(position, propertiesToInclude);
}
- static PassRefPtrWillBeRawPtr<EditingStyle> create(const StylePropertySet* style)
+ static RawPtr<EditingStyle> create(const StylePropertySet* style)
{
- return adoptRefWillBeNoop(new EditingStyle(style));
+ return new EditingStyle(style);
}
- static PassRefPtrWillBeRawPtr<EditingStyle> create(CSSPropertyID propertyID, const String& value)
+ static RawPtr<EditingStyle> create(CSSPropertyID propertyID, const String& value)
{
- return adoptRefWillBeNoop(new EditingStyle(propertyID, value));
+ return new EditingStyle(propertyID, value);
}
~EditingStyle();
@@ -99,9 +99,9 @@ public:
bool isEmpty() const;
void overrideWithStyle(const StylePropertySet*);
void clear();
- PassRefPtrWillBeRawPtr<EditingStyle> copy() const;
- PassRefPtrWillBeRawPtr<EditingStyle> extractAndRemoveBlockProperties();
- PassRefPtrWillBeRawPtr<EditingStyle> extractAndRemoveTextDirection();
+ RawPtr<EditingStyle> copy() const;
+ RawPtr<EditingStyle> extractAndRemoveBlockProperties();
+ RawPtr<EditingStyle> extractAndRemoveTextDirection();
void removeBlockProperties();
void removeStyleAddedByElement(Element*);
void removeStyleConflictingWithStyleOfElement(Element*);
@@ -126,8 +126,8 @@ public:
void mergeTypingStyle(Document*);
enum CSSPropertyOverrideMode { OverrideValues, DoNotOverrideValues };
void mergeInlineStyleOfElement(HTMLElement*, CSSPropertyOverrideMode, PropertiesToInclude = AllProperties);
- static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForAnnotatedSerialization(ContainerNode* context);
- static PassRefPtrWillBeRawPtr<EditingStyle> wrappingStyleForSerialization(ContainerNode* context);
+ static RawPtr<EditingStyle> wrappingStyleForAnnotatedSerialization(ContainerNode* context);
+ static RawPtr<EditingStyle> wrappingStyleForSerialization(ContainerNode* context);
void mergeStyleFromRules(Element*);
void mergeStyleFromRulesForSerialization(Element*);
void removeStyleFromRulesAndContext(Element*, ContainerNode* context);
@@ -139,7 +139,7 @@ public:
float fontSizeDelta() const { return m_fontSizeDelta; }
bool hasFontSizeDelta() const { return m_fontSizeDelta != NoFontDelta; }
- static PassRefPtrWillBeRawPtr<EditingStyle> styleAtSelectionStart(const VisibleSelection&, bool shouldUseBackgroundColorInEffect = false);
+ static RawPtr<EditingStyle> styleAtSelectionStart(const VisibleSelection&, bool shouldUseBackgroundColorInEffect = false);
static WritingDirection textDirectionForSelection(const VisibleSelection&, EditingStyle* typingStyle, bool& hasNestedOrMultipleEmbeddings);
static bool isEmbedOrIsolate(CSSValueID unicodeBidi)
{
@@ -164,7 +164,7 @@ private:
void mergeInlineAndImplicitStyleOfElement(Element*, CSSPropertyOverrideMode, PropertiesToInclude);
void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
- RefPtrWillBeMember<MutableStylePropertySet> m_mutableStyle;
+ Member<MutableStylePropertySet> m_mutableStyle;
bool m_isMonospaceFont;
float m_fontSizeDelta;

Powered by Google App Engine
This is Rietveld 408576698