Prepare SMILTimeContainer for oilpan

Source/core/svg/SVGElementRareData.h

 /*
  * Copyright (C) Research In Motion Limited 2010. 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 25 matching lines @@
     WTF_MAKE_NONCOPYABLE(SVGElementRareData); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     SVGElementRareData(SVGElement* owner)
 #if ENABLE(OILPAN)
         : m_owner(owner)
         , m_cursorElement(nullptr)
 #else
         : m_cursorElement(nullptr)
 #endif
         , m_cursorImageValue(nullptr)
-        , m_correspondingElement(0)
+        , m_correspondingElement(nullptr)
         , m_instancesUpdatesBlocked(false)
         , m_useOverrideComputedStyle(false)
         , m_needsOverrideComputedStyleUpdate(false)
     {
     }
 
     typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<const SVGElement>, RawPtrWillBeMember<SVGElementRareData> > SVGElementRareDataMap;
 
     static SVGElementRareDataMap& rareDataMap()
     {
@@ skipping 49 matching lines @@
     }
 
     bool useOverrideComputedStyle() const { return m_useOverrideComputedStyle; }
     void setUseOverrideComputedStyle(bool value) { m_useOverrideComputedStyle = value; }
     void setNeedsOverrideComputedStyleUpdate() { m_needsOverrideComputedStyleUpdate = true; }
 
     void trace(Visitor* visitor)
     {
         visitor->trace(m_animatedSMILStyleProperties);
         visitor->trace(m_elementInstances);
+        visitor->trace(m_correspondingElement);
         visitor->registerWeakMembers<SVGElementRareData, &SVGElementRareData::processWeakMembers>(this);
     }
 
     void processWeakMembers(Visitor* visitor)
     {
 #if ENABLE(OILPAN)
         if (!visitor->isAlive(m_owner)) {
             // If the owning SVGElement is dead this raraData element will be collected ASAP.
             // The owning SVGElement will also be automatically removed from the SVGCursorElement's
             // HashSet so no need to call out and clear anything.
@@ skipping 17 matching lines @@
             }
             m_cursorImageValue = nullptr;
         }
         ASSERT(!m_cursorElement || visitor->isAlive(m_cursorElement));
         ASSERT(!m_cursorImageValue || visitor->isAlive(m_cursorImageValue));
 #endif
     }
 
 private:
 #if ENABLE(OILPAN)
     RawPtrWillBeWeakMember<SVGElement> m_owner;

[haraken, 2014/05/26 08:27:27]

This can be a WeakMember since it's only for oilpan builds.

[kouhei (in TOK), 2014/05/26 08:55:28]

Done.

 #endif
     WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> > m_elementInstances;
     RawPtrWillBeWeakMember<SVGCursorElement> m_cursorElement;
     RawPtrWillBeWeakMember<CSSCursorImageValue> m_cursorImageValue;
-    SVGElement* m_correspondingElement;
+    RawPtrWillBeMember<SVGElement> m_correspondingElement;

[haraken, 2014/05/26 08:27:27]

Just to confirm: This should be a WeakMember conceptually, but doesn't need to
be weak because it's explicitly cleared out. Right?

[haraken, 2014/05/26 08:43:28]

Discussed offline. This is a strong member both conceptually and practically. So
using a member completely makes sense.

What we don't still understand is why this is not a RefPtr in the pre-oilpan
world, but this seems to be an actual bug (kouhei is saying that there are crash
reports about it).

     bool m_instancesUpdatesBlocked : 1;
     bool m_useOverrideComputedStyle : 1;
     bool m_needsOverrideComputedStyleUpdate : 1;
     RefPtrWillBeMember<MutableStylePropertySet> m_animatedSMILStyleProperties;
     RefPtr<RenderStyle> m_overrideComputedStyle;
 };
 
 }
 
 #endif