MediaSource must use ref-counting to handle pending activity counting.

Source/modules/mediasource/MediaSource.h

 /*
  * Copyright (C) 2013 Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 
 namespace blink {
 class WebSourceBuffer;
 }
 
 namespace WebCore {
 
 class ExceptionState;
 class GenericEventQueue;
 
+// FIXME: Oilpan: Change this to RefCountedGarbageCollectedWillBeGarbageCollectedFinalized
+// if MediaSource stops using ActiveDOMObject::setPendingActivity.
 class MediaSource FINAL
-    : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaSource>
+    : public RefCountedGarbageCollected<MediaSource>
     , public HTMLMediaSource
     , public ActiveDOMObject
     , public EventTargetWithInlineData
     , public ScriptWrappable {
-    DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<MediaSource>);
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<MediaSource>);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaSource);
 public:
     static const AtomicString& openKeyword();
     static const AtomicString& closedKeyword();
     static const AtomicString& endedKeyword();
 
     static MediaSource* create(ExecutionContext*);
     virtual ~MediaSource();
 
     // MediaSource.idl methods
     SourceBufferList* sourceBuffers() { return m_sourceBuffers.get(); }
     SourceBufferList* activeSourceBuffers() { return m_activeSourceBuffers.get(); }
     SourceBuffer* addSourceBuffer(const String& type, ExceptionState&);
     void removeSourceBuffer(SourceBuffer*, ExceptionState&);
     void setDuration(double, ExceptionState&);
     const AtomicString& readyState() const { return m_readyState; }
     void endOfStream(const AtomicString& error, ExceptionState&);
     void endOfStream(ExceptionState&);
     static bool isTypeSupported(const String& type);
 
         // HTMLMediaSource
     virtual bool attachToElement(HTMLMediaElement*) OVERRIDE;
     virtual void setWebMediaSourceAndOpen(PassOwnPtr<blink::WebMediaSource>) OVERRIDE;
     virtual void close() OVERRIDE;
     virtual bool isClosed() const OVERRIDE;
     virtual double duration() const OVERRIDE;
     virtual PassRefPtr<TimeRanges> buffered() const OVERRIDE;
+#if !ENABLE(OILPAN)
     virtual void refHTMLMediaSource() OVERRIDE { ref(); }
     virtual void derefHTMLMediaSource() OVERRIDE { deref(); }
+#endif
 
     // EventTarget interface
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
     // ActiveDOMObject interface
     virtual bool hasPendingActivity() const OVERRIDE;
     virtual void stop() OVERRIDE;
 
     // URLRegistrable interface
@@ skipping 31 matching lines @@
     // FIXME: oilpan: This should become a Member. For now, m_attachedElement will be cleared by the HTMLMediaElement destructor.
     HTMLMediaElement* m_attachedElement;
 
     Member<SourceBufferList> m_sourceBuffers;
     Member<SourceBufferList> m_activeSourceBuffers;
 };
 
 } // namespace WebCore
 
 #endif