Oilpan: add transition types to track interface objects.

Source/core/html/track/TextTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2011, 2012, 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 81 matching lines @@
 const AtomicString& TextTrack::showingKeyword()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, ended, ("showing", AtomicString::ConstructFromLiteral));
     return ended;
 }
 
 TextTrack::TextTrack(Document& document, const AtomicString& kind, const AtomicString& label, const AtomicString& language, const AtomicString& id, TextTrackType type)
     : TrackBase(TrackBase::TextTrack, label, language, id)
     , m_cues(nullptr)
     , m_regions(nullptr)
-    , m_document(&document)
-    , m_trackList(0)
+    , m_trackList(nullptr)
     , m_mode(disabledKeyword())
     , m_trackType(type)
     , m_readinessState(NotLoaded)
     , m_trackIndex(invalidTrackIndex)
     , m_renderedTrackIndex(invalidTrackIndex)
     , m_hasBeenConfigured(false)
 {
     ScriptWrappable::init(this);
     setKind(kind);
 }
 
 TextTrack::~TextTrack()
 {
-    ASSERT(!m_trackList);

[Mads Ager (chromium), 2014/04/22 13:07:15]

#if !ENABLE(OILPAN) instead of deleting?

-
-    if (m_cues) {
-        for (size_t i = 0; i < m_cues->length(); ++i)
-            m_cues->item(i)->setTrack(0);
-    }
-
-    if (m_regions) {
-        for (size_t i = 0; i < m_regions->length(); ++i)
-            m_regions->item(i)->setTrack(0);
-    }
 }
 
 bool TextTrack::isValidKindKeyword(const AtomicString& value)
 {
     if (value == subtitlesKeyword())
         return true;
     if (value == captionsKeyword())
         return true;
     if (value == descriptionsKeyword())
         return true;
@@ skipping 79 matching lines @@
     // then the activeCues attribute must return a live TextTrackCueList object ...
     // ... whose active flag was set when the script started, in text track cue
     // order. Otherwise, it must return null. When an object is returned, the
     // same object must be returned each time.
     // http://www.whatwg.org/specs/web-apps/current-work/#dom-texttrack-activecues
     if (m_cues && m_mode != disabledKeyword())
         return m_cues->activeCues();
     return 0;
 }
 
-void TextTrack::addCue(PassRefPtr<TextTrackCue> prpCue)
+void TextTrack::addCue(PassRefPtrWillBeRawPtr<TextTrackCue> prpCue)
 {
     if (!prpCue)
         return;
 
-    RefPtr<TextTrackCue> cue = prpCue;
+    RefPtrWillBeRawPtr<TextTrackCue> cue = prpCue;
 
     // TODO(93143): Add spec-compliant behavior for negative time values.
     if (std::isnan(cue->startTime()) || std::isnan(cue->endTime()) || cue->startTime() < 0 || cue->endTime() < 0)
         return;
 
     // 4.8.10.12.5 Text track API
 
     // The addCue(cue) method of TextTrack objects, when invoked, must run the following steps:
 
     // 1. If the given cue is in a text track list of cues, then remove cue from that text track
@@ skipping 51 matching lines @@
     // represents is not the text track disabled mode, then the regions
     // attribute must return a live VTTRegionList object that represents
     // the text track list of regions of the text track. Otherwise, it must
     // return null. When an object is returned, the same object must be returned
     // each time.
     if (RuntimeEnabledFeatures::webVTTRegionsEnabled() && m_mode != disabledKeyword())
         return ensureVTTRegionList();
     return 0;
 }
 
-void TextTrack::addRegion(PassRefPtr<VTTRegion> prpRegion)
+void TextTrack::addRegion(PassRefPtrWillBeRawPtr<VTTRegion> prpRegion)
 {
     if (!prpRegion)
         return;
 
-    RefPtr<VTTRegion> region = prpRegion;
+    RefPtrWillBeRawPtr<VTTRegion> region = prpRegion;
     VTTRegionList* regionList = ensureVTTRegionList();
 
     // 1. If the given region is in a text track list of regions, then remove
     // region from that text track list of regions.
     TextTrack* regionTrack = region->track();
     if (regionTrack && regionTrack != this)
         regionTrack->removeRegion(region.get(), ASSERT_NO_EXCEPTION);
 
     // 2. If the method's TextTrack object's text track list of regions contains
     // a region with the same identifier as region replace the values of that
@@ skipping 98 matching lines @@
     return m_renderedTrackIndex;
 }
 
 const AtomicString& TextTrack::interfaceName() const
 {
     return EventTargetNames::TextTrack;
 }
 
 ExecutionContext* TextTrack::executionContext() const
 {
-    return m_document;
+    HTMLMediaElement* owner = mediaElement();
+    return owner ? owner->executionContext() : 0;
 }
 
 HTMLMediaElement* TextTrack::mediaElement() const
 {
     return m_trackList ? m_trackList->owner() : 0;
 }
 
 Node* TextTrack::owner() const
 {
     return mediaElement();
 }
 
+void TextTrack::trace(Visitor* visitor)
+{
+    visitor->trace(m_cues);
+    visitor->trace(m_regions);
+    visitor->trace(m_trackList);
+    TrackBase::trace(visitor);
+}
+
 } // namespace WebCore