[Oilpan]: Make StylePropertySet fully garbage collected.

Source/core/css/StylePropertySet.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 23 matching lines @@
 
 class CSSRule;
 class CSSStyleDeclaration;
 class Element;
 class ImmutableStylePropertySet;
 class KURL;
 class MutableStylePropertySet;
 class StylePropertyShorthand;
 class StyleSheetContents;
 
-class StylePropertySet : public RefCountedWillBeRefCountedGarbageCollected<StylePropertySet> {
+class StylePropertySet : public RefCountedWillBeGarbageCollectedFinalized<StylePropertySet> {

[haraken, 2014/05/08 11:43:45]

I think you can now make StylePropertySet GarbageCollected (not
GarbageCollectedFinalized), and remove finalizeGarbageCollected(). However,
let's do that in a follow-up CL.

[wibling-chromium, 2014/05/08 12:38:55]

Yes, that seems right.

     friend class PropertyReference;
 public:
 
 #if ENABLE(OILPAN)
     // When oilpan is enabled override the finalize method to dispatch to the subclasses'
     // destructor. This can be removed once the MutableStylePropertySet's OwnPtr is moved
     // to the heap.
     void finalizeGarbageCollectedObject();
 #else
     // Override RefCounted's deref() to ensure operator delete is called on
@@ skipping 45 matching lines @@
 
     bool propertyIsImportant(CSSPropertyID) const;
     CSSPropertyID getPropertyShorthand(CSSPropertyID) const;
     bool isPropertyImplicit(CSSPropertyID) const;
 
     PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyBlockProperties() const;
 
     CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
 
     PassRefPtrWillBeRawPtr<MutableStylePropertySet> mutableCopy() const;
-    PassRefPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
+    PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
 
     PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyPropertiesInSet(const Vector<CSSPropertyID>&) const;
 
     String asText() const;
 
     bool isMutable() const { return m_isMutable; }
 
     bool hasFailedOrCanceledSubresources() const;
 
     static unsigned averageSizeInBytes();
@@ skipping 26 matching lines @@
     unsigned m_cssParserMode : 3;
     mutable unsigned m_isMutable : 1;
     unsigned m_arraySize : 28;
 
     friend class PropertySetCSSStyleDeclaration;
 };
 
 class ImmutableStylePropertySet : public StylePropertySet {
 public:
     ~ImmutableStylePropertySet();
-    static PassRefPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
+    static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
 
     unsigned propertyCount() const { return m_arraySize; }
 
     const RawPtrWillBeMember<CSSValue>* valueArray() const;
     const StylePropertyMetadata* metadataArray() const;
     int findPropertyIndex(CSSPropertyID) const;
 
     void traceAfterDispatch(Visitor*);
 
     void* operator new(std::size_t, void* location)
@@ skipping 12 matching lines @@
     return reinterpret_cast<const RawPtrWillBeMember<CSSValue>*>(const_cast<const void**>(&(this->m_storage)));
 }
 
 inline const StylePropertyMetadata* ImmutableStylePropertySet::metadataArray() const
 {
     return reinterpret_cast<const StylePropertyMetadata*>(&reinterpret_cast<const char*>(&(this->m_storage))[m_arraySize * sizeof(RawPtrWillBeMember<CSSValue>)]);
 }
 
 DEFINE_TYPE_CASTS(ImmutableStylePropertySet, StylePropertySet, set, !set->isMutable(), !set.isMutable());
 
-inline ImmutableStylePropertySet* toImmutableStylePropertySet(const RefPtr<StylePropertySet>& set)
-{
-    return toImmutableStylePropertySet(set.get());
-}
-
 class MutableStylePropertySet : public StylePropertySet {
 public:
     ~MutableStylePropertySet() { }
     static PassRefPtrWillBeRawPtr<MutableStylePropertySet> create(CSSParserMode = HTMLQuirksMode);
     static PassRefPtrWillBeRawPtr<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
 
     unsigned propertyCount() const { return m_propertyVector.size(); }
 
     void addParsedProperties(const WillBeHeapVector<CSSProperty, 256>&);
     void addParsedProperty(const CSSProperty&);
@@ skipping 35 matching lines @@
     CSSProperty* findCSSPropertyWithID(CSSPropertyID);
     OwnPtrWillBeMember<PropertySetCSSStyleDeclaration> m_cssomWrapper;
 
     friend class StylePropertySet;
 
     WillBeHeapVector<CSSProperty, 4> m_propertyVector;
 };
 
 DEFINE_TYPE_CASTS(MutableStylePropertySet, StylePropertySet, set, set->isMutable(), set.isMutable());
 
-inline MutableStylePropertySet* toMutableStylePropertySet(const RefPtr<StylePropertySet>& set)
+inline MutableStylePropertySet* toMutableStylePropertySet(const RefPtrWillBeRawPtr<StylePropertySet>& set)

[zerny-chromium, 2014/05/08 12:22:26]

I wonder why the implicit conversion from Persistent/Member to RawPtr is not
sufficient to avoid the two definitions below.

[wibling-chromium, 2014/05/08 12:46:41]

The problem is the compiler gets confused if there is not an exact match since
the DEFINE_TYPE_CASTS above declares a pointer version
toMutableStylePropertySet(StylePropertySet* set). I am getting

../../third_party/WebKit/Source/core/css/StyleRule.cpp:340:13: error: call to
'toMutableStylePropertySet' is ambiguous
    return *toMutableStylePropertySet(m_properties);
            ^~~~~~~~~~~~~~~~~~~~~~~~~
../../third_party/WebKit/Source/core/css/StylePropertySet.h:243:1: note:
candidate function
DEFINE_TYPE_CASTS(MutableStylePropertySet, StylePropertySet, set,
set->isMutable(), set.isMutable());
^
../../third_party/WebKit/Source/wtf/Assertions.h:368:18: note: expanded from
macro 'DEFINE_TYPE_CASTS'
inline thisType* to##thisType(argumentType* argumentName) \
                 ^
<scratch space>:43:1: note: expanded from here
toMutableStylePropertySet
^
../../third_party/WebKit/Source/core/css/StylePropertySet.h:243:1: note:
candidate function
../../third_party/WebKit/Source/wtf/Assertions.h:373:24: note: expanded from
macro 'DEFINE_TYPE_CASTS'
inline const thisType* to##thisType(const argumentType* argumentName) \
                       ^
<scratch space>:47:1: note: expanded from here
toMutableStylePropertySet
^
../../third_party/WebKit/Source/core/css/StylePropertySet.h:245:33: note:
candidate function
inline MutableStylePropertySet* toMutableStylePropertySet(const
RefPtrWillBeRawPtr<StylePropertySet>& set)
                                ^
../../third_party/WebKit/Source/core/css/StyleRule.cpp:436:13: error: call to
'toMutableStylePropertySet' is ambiguous
    return *toMutableStylePropertySet(m_properties);
            ^~~~~~~~~~~~~~~~~~~~~~~~~
../../third_party/WebKit/Source/core/css/StylePropertySet.h:243:1: note:
candidate function
DEFINE_TYPE_CASTS(MutableStylePropertySet, StylePropertySet, set,
set->isMutable(), set.isMutable());
^
../../third_party/WebKit/Source/wtf/Assertions.h:368:18: note: expanded from
macro 'DEFINE_TYPE_CASTS'
inline thisType* to##thisType(argumentType* argumentName) \
                 ^
<scratch space>:43:1: note: expanded from here
toMutableStylePropertySet
^

 {
     return toMutableStylePropertySet(set.get());
 }
+
+inline MutableStylePropertySet* toMutableStylePropertySet(const Persistent<StylePropertySet>& set)
+{
+    return toMutableStylePropertySet(set.get());
+}
+
+inline MutableStylePropertySet* toMutableStylePropertySet(const Member<StylePropertySet>& set)
+{
+    return toMutableStylePropertySet(set.get());
+}
 
 inline const StylePropertyMetadata& StylePropertySet::PropertyReference::propertyMetadata() const
 {
     if (m_propertySet.isMutable())
         return toMutableStylePropertySet(m_propertySet).m_propertyVector.at(m_index).metadata();
     return toImmutableStylePropertySet(m_propertySet).metadataArray()[m_index];
 }
 
 inline const CSSValue* StylePropertySet::PropertyReference::propertyValue() const
 {
@@ skipping 30 matching lines @@
 inline int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const
 {
     if (m_isMutable)
         return toMutableStylePropertySet(this)->findPropertyIndex(propertyID);
     return toImmutableStylePropertySet(this)->findPropertyIndex(propertyID);
 }
 
 } // namespace WebCore
 
 #endif // StylePropertySet_h