Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/editing/EditingStyle.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 41 matching lines @@
 class ContainerNode;
 class Document;
 class Element;
 class HTMLElement;
 class MutableStylePropertySet;
 class Node;
 class QualifiedName;
 class ComputedStyle;
 class StylePropertySet;
 
-class EditingStyle final : public RefCountedWillBeGarbageCollectedFinalized<EditingStyle> {
+class EditingStyle final : public GarbageCollectedFinalized<EditingStyle> {
 public:
 
     enum PropertiesToInclude { AllProperties, OnlyEditingInheritableProperties, EditingPropertiesInEffect };
     enum ShouldPreserveWritingDirection { PreserveWritingDirection, DoNotPreserveWritingDirection };
     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();
 
     MutableStylePropertySet* style() { return m_mutableStyle.get(); }
     bool textDirection(WritingDirection&) const;
     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*);
     void collapseTextDecorationProperties();
     enum ShouldIgnoreTextOnlyProperties { IgnoreTextOnlyProperties, DoNotIgnoreTextOnlyProperties };
     TriState triStateOfStyle(EditingStyle*) const;
     TriState triStateOfStyle(const VisibleSelection&) const;
     bool conflictsWithInlineStyleOfElement(HTMLElement* element) const { return conflictsWithInlineStyleOfElement(element, 0, 0); }
     bool conflictsWithInlineStyleOfElement(HTMLElement* element, EditingStyle* extractedStyle, Vector<CSSPropertyID>& conflictingProperties) const
     {
         return conflictsWithInlineStyleOfElement(element, extractedStyle, &conflictingProperties);
     }
     bool conflictsWithImplicitStyleOfElement(HTMLElement*, EditingStyle* extractedStyle = nullptr, ShouldExtractMatchingStyle = DoNotExtractMatchingStyle) const;
     bool conflictsWithImplicitStyleOfAttributes(HTMLElement*) const;
     bool extractConflictingImplicitStyleOfAttributes(HTMLElement*, ShouldPreserveWritingDirection, EditingStyle* extractedStyle,
         Vector<QualifiedName>& conflictingAttributes, ShouldExtractMatchingStyle) const;
     bool styleIsPresentInComputedStyleOfNode(Node*) const;
 
     static bool elementIsStyledSpanOrHTMLEquivalent(const HTMLElement*);
 
     void prepareToApplyAt(const Position&, ShouldPreserveWritingDirection = DoNotPreserveWritingDirection);
     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);
     void removePropertiesInElementDefaultStyle(Element*);
     void addAbsolutePositioningFromElement(const Element&);
     void forceInline();
     int legacyFontSize(Document*) const;
 
     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)
     {
         return unicodeBidi == CSSValueIsolate || unicodeBidi == CSSValueWebkitIsolate || unicodeBidi == CSSValueEmbed;
     }
 
     DECLARE_TRACE();
 
 private:
     EditingStyle();
     EditingStyle(ContainerNode*, PropertiesToInclude);
     EditingStyle(const Position&, PropertiesToInclude);
     explicit EditingStyle(const StylePropertySet*);
     EditingStyle(CSSPropertyID, const String& value);
     void init(Node*, PropertiesToInclude);
     void removeTextFillAndStrokeColorsIfNeeded(const ComputedStyle*);
     void setProperty(CSSPropertyID, const String& value, bool important = false);
     void replaceFontSizeByKeywordIfPossible(const ComputedStyle*, CSSComputedStyleDeclaration*);
     void extractFontSizeDelta();
     TriState triStateOfStyle(CSSStyleDeclaration* styleToCompare, ShouldIgnoreTextOnlyProperties) const;
     bool conflictsWithInlineStyleOfElement(HTMLElement*, EditingStyle* extractedStyle, Vector<CSSPropertyID>* conflictingProperties) const;
     void mergeInlineAndImplicitStyleOfElement(Element*, CSSPropertyOverrideMode, PropertiesToInclude);
     void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
 
-    RefPtrWillBeMember<MutableStylePropertySet> m_mutableStyle;
+    Member<MutableStylePropertySet> m_mutableStyle;
     bool m_isMonospaceFont;
     float m_fontSizeDelta;
 
     friend class HTMLElementEquivalent;
     friend class HTMLAttributeEquivalent;
 };
 
 class StyleChange {
     DISALLOW_NEW();
 public:
@@ skipping 55 matching lines @@
     String m_applyFontSize;
 };
 
 // FIXME: Remove these functions or make them non-global to discourage using CSSStyleDeclaration directly.
 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);
 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID);
 
 } // namespace blink
 
 #endif // EditingStyle_h