Attachment #183831 for bug #107046

View Details Raw Unified Return to Bug 107046

| Differences between



2013-01-21  Eric Carlson  <eric.carlson@apple.com>

        Support non-WebVTT cues from in-band text tracks
        https://bugs.webkit.org/show_bug.cgi?id=107046

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt: Add new files.
        * GNUmakefile.list.am: Ditto.
        * Target.pri: Ditto.
        * WebCore.gypi: Ditto.
        * WebCore.vcproj/WebCore.vcproj: Ditto.
        * WebCore.xcodeproj/project.pbxproj: Ditto.

        * html/shadow/MediaControlElements.cpp:
        (WebCore::MediaControlTextTrackContainerElement::updateDisplay): Pass video size to getDisplayTree.

        * html/track/InbandTextTrack.cpp:
        (WebCore::InbandTextTrack::addGenericCue): New, create a generic cue if it doesn't already exist.
        (WebCore::InbandTextTrack::addWebVTTCue): Renamed from addCue.
        * html/track/InbandTextTrack.h:

        * html/track/TextTrack.cpp:
        (WebCore::TextTrack::hasCue): Moved from InbandTextTrack.cpp, use operator == instead of inline
            comparison so derived TextTrackCues can be compared.
        * html/track/TextTrack.h:

        * html/track/TextTrackCue.cpp:
        (WebCore::TextTrackCueBox::applyCSSProperties): Interface change.
        (WebCore::TextTrackCue::TextTrackCue): Don't create the display tree in the constructor, it may
            never be needed.
        (WebCore::TextTrackCue::createDisplayTree): New, create the display tree.
        (WebCore::TextTrackCue::displayTreeInternal): Display tree accessor, allows it to be created lazily.
        (WebCore::TextTrackCue::setAlign): Alignment -> CueAlignment.
        (WebCore::TextTrackCue::setIsActive): Use displayTreeInternal().
        (WebCore::TextTrackCue::getDisplayTree): Use displayTreeInternal(), pass video size to applyCSSProperties.
        (WebCore::TextTrackCue::removeDisplayTree): Use displayTreeInternal().
        (WebCore::TextTrackCue::operator==): New.
        * html/track/TextTrackCue.h:
        (WebCore::TextTrackCue::getAlignment): Alignment -> CueAlignment.
        (WebCore::TextTrackCue::operator!=): New.
        (WebCore::TextTrackCue::cueType): New, cue type identified needed by operator==.
        (WebCore::TextTrackCue::ownerDocument): New.

        * html/track/TextTrackCueGeneric.cpp: Added.
        (WebCore::TextTrackCueGenericBox::create):
        (WebCore::TextTrackCueGenericBox::TextTrackCueGenericBox):
        (WebCore::TextTrackCueGenericBox::applyCSSProperties):
        (WebCore:::TextTrackCue):
        (WebCore::TextTrackCueGeneric::createDisplayTree):
        (WebCore::TextTrackCueGeneric::operator==):
        * html/track/TextTrackCueGeneric.h: Added.
        (WebCore::TextTrackCueGeneric::create):
        (WebCore::TextTrackCueGeneric::~TextTrackCueGeneric):
        (WebCore::TextTrackCueGeneric::baseFontSizeRelativeToVideoHeight):
        (WebCore::TextTrackCueGeneric::setBaseFontSizeRelativeToVideoHeight):
        (WebCore::TextTrackCueGeneric::fontSizeMultiplier):
        (WebCore::TextTrackCueGeneric::setFontSizeMultiplier):
        (WebCore::TextTrackCueGeneric::fontName):
        (WebCore::TextTrackCueGeneric::setFontName):
        (WebCore::TextTrackCueGeneric::operator!=):
        (WebCore::TextTrackCueGeneric::cueType):

        * platform/graphics/InbandTextTrackPrivateClient.h:
        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
        (WebCore::InbandTextTrackPrivateAVF::processCueAttributes): Copy cue attributes into GenericCueData
            struct instead of trying to convert to WebVTT settings string. Process font size,font base
            size, font name, and vertical layout attributes,
        (WebCore::InbandTextTrackPrivateAVF::processCue): Create separate cues for each attributed
            string in the array because each one can be at a different screen location.
        (WebCore::InbandTextTrackPrivateAVF::resetCueValues):
        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
        (InbandTextTrackPrivateAVF):

        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
        (WebCore::MediaPlayerPrivateAVFoundation::seekCompleted): Reset any partially accumulated cues
            delivered since the seek was started.
        (WebCore::MediaPlayerPrivateAVFoundation::addGenericCue): Renamed from flushCurrentCue.
        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:

        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Whitespace cleanup.
        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Ditto.
        (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): Tell legible output to deliver cues
            without any additional styling needed by the internal renderer.
        (WebCore::MediaPlayerPrivateAVFoundationObjC::processTextTracks):
        (WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTrack): Do nothing if asked to change
            to the track that is already current.
        (-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):
            Check to make sure that the client callback isn't NULL.

2013-01-21  Vladislav Kaznacheev  <kaznacheev@chromium.org>

        [Inspector] Layout Elements panel in a single column when docked right.

Lines 1581-1586 set(WebCore_SOURCES Source/WebCore/CMakeLists.txt_sec1
- Source/WebCore/CMakeLists.txt +1 lines
1581	html/track/LoadableTextTrack.cpp	1581	html/track/LoadableTextTrack.cpp
1582	html/track/TextTrack.cpp	1582	html/track/TextTrack.cpp
1583	html/track/TextTrackCue.cpp	1583	html/track/TextTrackCue.cpp
		1584	html/track/TextTrackCueGeneric.cpp
1584	html/track/TextTrackCueList.cpp	1585	html/track/TextTrackCueList.cpp
1585	html/track/TextTrackList.cpp	1586	html/track/TextTrackList.cpp
1586	html/track/TrackBase.cpp	1587	html/track/TrackBase.cpp

Lines 3672-3677 webcore_sources += \ Source/WebCore/GNUmakefile.list.am_sec1
- Source/WebCore/GNUmakefile.list.am +2 lines
3672	Source/WebCore/html/track/TextTrack.h \	3672	Source/WebCore/html/track/TextTrack.h \
3673	Source/WebCore/html/track/TextTrackCue.cpp \	3673	Source/WebCore/html/track/TextTrackCue.cpp \
3674	Source/WebCore/html/track/TextTrackCue.h \	3674	Source/WebCore/html/track/TextTrackCue.h \
		3675	Source/WebCore/html/track/TextTrackCueGeneric.cpp \
		3676	Source/WebCore/html/track/TextTrackCueGeneric.h \
3675	Source/WebCore/html/track/TextTrackCueList.cpp \	3677	Source/WebCore/html/track/TextTrackCueList.cpp \
3676	Source/WebCore/html/track/TextTrackCueList.h \	3678	Source/WebCore/html/track/TextTrackCueList.h \
3677	Source/WebCore/html/track/TextTrackList.cpp \	3679	Source/WebCore/html/track/TextTrackList.cpp \

Lines 1915-1920 HEADERS += \ Source/WebCore/Target.pri_sec1
- Source/WebCore/Target.pri +1 lines
1915	html/track/LoadableTextTrack.h \	1915	html/track/LoadableTextTrack.h \
1916	html/track/TextTrack.h \	1916	html/track/TextTrack.h \
1917	html/track/TextTrackCue.h \	1917	html/track/TextTrackCue.h \
		1918	html/track/TextTrackCueGeneric.h \
1918	html/track/TextTrackCueList.h \	1919	html/track/TextTrackCueList.h \
1919	html/track/TextTrackList.h \	1920	html/track/TextTrackList.h \
1920	html/track/TrackBase.h \	1921	html/track/TrackBase.h \

Lines 3457-3462 Source/WebCore/WebCore.gypi_sec1
- Source/WebCore/WebCore.gypi +2 lines
3457	'html/track/TextTrack.h',	3457	'html/track/TextTrack.h',
3458	'html/track/TextTrackCue.cpp',	3458	'html/track/TextTrackCue.cpp',
3459	'html/track/TextTrackCue.h',	3459	'html/track/TextTrackCue.h',
		3460	'html/track/TextTrackCueGeneric.cpp',
		3461	'html/track/TextTrackCueGeneric.h',
3460	'html/track/TextTrackCueList.cpp',	3462	'html/track/TextTrackCueList.cpp',
3461	'html/track/TextTrackCueList.h',	3463	'html/track/TextTrackCueList.h',
3462	'html/track/TextTrackList.cpp',	3464	'html/track/TextTrackList.cpp',

Lines 65265-65270 Source/WebCore/WebCore.vcproj/WebCore.vcproj_sec1
- Source/WebCore/WebCore.vcproj/WebCore.vcproj +8 lines
65265	>	65265	>
65266	</File>	65266	</File>
65267	<File	65267	<File
		65268	RelativePath="..\html\track\TextTrackCueGeneric.cpp"
		65269	>
		65270	</File>
		65271	<File
		65272	RelativePath="..\html\track\TextTrackCueGeneric.h"
		65273	>
		65274	</File>
		65275	<File
65268	RelativePath="..\html\track\TextTrackCueList.cpp"	65276	RelativePath="..\html\track\TextTrackCueList.cpp"
65269	>	65277	>
65270	</File>	65278	</File>

Lines 3819-3824 void HTMLMediaElement::clearMediaPlayer( Source/WebCore/html/HTMLMediaElement.cpp_sec1
- Source/WebCore/html/HTMLMediaElement.cpp +5 lines
3819		3819
3820	m_pendingLoadFlags &= ~flags;	3820	m_pendingLoadFlags &= ~flags;
3821	m_loadState = WaitingForSource;	3821	m_loadState = WaitingForSource;
		3822
		3823	#if ENABLE(VIDEO_TRACK)
		3824	if (m_textTracks)
		3825	configureTextTrackDisplay();
		3826	#endif
3822	}	3827	}
3823		3828
3824	bool HTMLMediaElement::canSuspend() const	3829	bool HTMLMediaElement::canSuspend() const



        if (!cue->track() || !cue->track()->isRendered())
            continue;

        RefPtr<TextTrackCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size());

        if (displayBox->hasChildNodes() && !contains(static_cast<Node*>(displayBox.get())))
            // Note: the display tree of a cue is removed when the active flag of the cue is unset.
            m_cueContainer->appendChild(displayBox, ASSERT_NO_EXCEPTION, false);



#include "Document.h"
#include "Event.h"
#include "InbandTextTrackPrivate.h"
#include "Logging.h"
#include "MediaPlayer.h"
#include "TextTrackCueGeneric.h"
#include "TextTrackCueList.h"
#include <math.h>
#include <wtf/UnusedParam.h>

namespace WebCore {

    return m_private->textTrackIndex();
}

void InbandTextTrack::addGenericCue(InbandTextTrackPrivate* trackPrivate, GenericCueData* cueData)
{
    UNUSED_PARAM(trackPrivate);
    ASSERT(trackPrivate == m_private);

    RefPtr<TextTrackCueGeneric> cue = TextTrackCueGeneric::create(scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
    cue->setId(id);
    cue->setCueSettings(settings);
    cue->setTrack(this);

    cue->setId(cueData->id());
    cue->setBaseFontSizeRelativeToVideoHeight(cueData->baseFontSize());
    cue->setFontSizeMultiplier(cueData->relativeFontSize());
    cue->setFontName(cueData->fontName());

    ExceptionCode ec;
    if (cueData->position() > 0)
        cue->setPosition(lround(cueData->position()), ec);
    if (cueData->line() > 0)
        cue->setLine(lround(cueData->line()), ec);
    if (cueData->size() > 0)
        cue->setSize(lround(cueData->size()), ec);
    if (cueData->align() == GenericCueData::Start)
        cue->setAlign(ASCIILiteral("start"), ec);
    else if (cueData->align() == GenericCueData::Middle)
        cue->setAlign(ASCIILiteral("middle"), ec);
    else if (cueData->align() == GenericCueData::End)
        cue->setAlign(ASCIILiteral("end"), ec);
    cue->setSnapToLines(false);

    if (hasCue(cue.get())) {
        LOG(Media, "InbandTextTrack::addGenericCue ignoring already added cue: start=%.2f, end=%.2f, content=\"%s\"\n",
            cueData->startTime(), cueData->endTime(), cueData->content().utf8().data());
        return;
    }

    addCue(cue);
}

void InbandTextTrack::addWebVTTCue(InbandTextTrackPrivate* trackPrivate, double start, double end, const String& id, const String& content, const String& settings)
{
    UNUSED_PARAM(trackPrivate);
    ASSERT(trackPrivate == m_private);

    RefPtr<TextTrackCue> cue = TextTrackCue::create(scriptExecutionContext(), start, end, content);
    cue->setId(id);
    cue->setCueSettings(settings);
    if (!cues()->length())
        return false;

    size_t searchStart = 0;
    size_t searchEnd = cues()->length();

    while (1) {
        ASSERT(searchStart <= cues()->length());
        ASSERT(searchEnd <= cues()->length());
        
        TextTrackCue* cue;
        
        // Cues in the TextTrackCueList are maintained in start time order.
        if (searchStart == searchEnd) {
            if (!searchStart)
                return false;
            
            cue = cues()->item(searchStart - 1);
            if (!cue)
                return false;
            if (cue->startTime() != startTime)
                return false;
            if (cue->endTime() != endTime)
                return false;
            if (cue->text() != content)
                return false;
            if (cue->cueSettings() != settings)
                return false;
            if (cue->id() != id)
                return false;
            
            return true;
        }
        
        size_t index = (searchStart + searchEnd) / 2;
        cue = cues()->item(index);
        if (startTime < cue->startTime() || (startTime == cue->startTime() && endTime > cue->endTime()))
            searchEnd = index;
        else
            searchStart = index + 1;
    }
    
    if (hasCue(cue.get()))
        return;

    addCue(cue);
}

} // namespace WebCore



/*
 * Copyright (C) 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

private:
    InbandTextTrack(ScriptExecutionContext*, TextTrackClient*, PassRefPtr<InbandTextTrackPrivate>);

    virtual void addGenericCue(InbandTextTrackPrivate*, GenericCueData*) OVERRIDE;
    virtual void addWebVTTCue(InbandTextTrackPrivate*, double, double, const String&, const String&, const String&) OVERRIDE;

    RefPtr<InbandTextTrackPrivate> m_private;
};



/*
 * 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

    return m_renderedTrackIndex;
}

bool TextTrack::hasCue(TextTrackCue* cue)
{
    if (cue->startTime() < 0 || cue->endTime() < 0)
        return false;
    
    if (!m_cues || !m_cues->length())
        return false;
    
    size_t searchStart = 0;
    size_t searchEnd = m_cues->length();
    
    while (1) {
        ASSERT(searchStart <= m_cues->length());
        ASSERT(searchEnd <= m_cues->length());
        
        TextTrackCue* existingCue;
        
        // Cues in the TextTrackCueList are maintained in start time order.
        if (searchStart == searchEnd) {
            if (!searchStart)
                return false;

            // If there is more than one cue with the same start time, back up to first one so we
            // consider all of them.
            while (searchStart >= 2 && cue->startTime() == m_cues->item(searchStart - 2)->startTime())
                --searchStart;
            
            bool firstCompare = true;
            while (1) {
                if (!firstCompare)
                    ++searchStart;
                firstCompare = false;
                if (searchStart > m_cues->length())
                    return false;

                existingCue = m_cues->item(searchStart - 1);
                if (!existingCue || cue->startTime() > existingCue->startTime())
                    return false;

                if (*existingCue != *cue)
                    continue;
                
                return true;
            }
        }
        
        size_t index = (searchStart + searchEnd) / 2;
        existingCue = m_cues->item(index);
        if (cue->startTime() < existingCue->startTime() || (cue->startTime() == existingCue->startTime() && cue->endTime() > existingCue->endTime()))
            searchEnd = index;
        else
            searchStart = index + 1;
    }
    
    ASSERT_NOT_REACHED();
    return false;
}

} // namespace WebCore

#endif



/*
 * 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


    void addCue(PassRefPtr<TextTrackCue>);
    void removeCue(TextTrackCue*, ExceptionCode&);
    bool hasCue(TextTrackCue*);

    void cueWillChange(TextTrackCue*);
    void cueDidChange(TextTrackCue*);



/*
 * 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

    return m_cue;
}

void TextTrackCueBox::applyCSSProperties(const IntSize&)
{
    // FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916


    , m_snapToLines(true)
    , m_allDocumentNodes(HTMLDivElement::create(static_cast<Document*>(context)))
    , m_displayTreeShouldChange(true)
    , m_displayTree(TextTrackCueBox::create(static_cast<Document*>(m_scriptExecutionContext), this))
{
    ASSERT(m_scriptExecutionContext->isDocument());


{
}

PassRefPtr<TextTrackCueBox> TextTrackCue::createDisplayTree()
{
    return TextTrackCueBox::create(ownerDocument(), this);
}

PassRefPtr<TextTrackCueBox> TextTrackCue::displayTreeInternal()
{
    if (!m_displayTree)
        m_displayTree = createDisplayTree();
    return m_displayTree;
}

void TextTrackCue::cueWillChange()
{
    if (m_track)

    // match for the new value, if any. If none of the values match, then the user
    // agent must instead throw a SyntaxError exception.
    
    CueAlignment alignment = m_cueAlignment;
    if (value == startKeyword())
        alignment = Start;
    else if (value == middleKeyword())


    if (!active) {
        // Remove the display tree as soon as the cue becomes inactive.
        displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
        m_displayTree->remove(ec);
    }
}


    m_allDocumentNodes->appendChild(referenceTree);
}

PassRefPtr<TextTrackCueBox> TextTrackCue::getDisplayTree(const IntSize& videoSize)
{
    RefPtr<TextTrackCueBox> displayTree = displayTreeInternal();
    if (!m_displayTreeShouldChange || !track()->isRendered())
        return displayTree;

    // 10.1 - 10.10
    calculateDisplayParameters();

    // 10.11. Apply the terms of the CSS specifications to nodes within the
    // following constraints, thus obtaining a set of CSS boxes positioned
    // relative to an initial containing block:
    displayTree->removeChildren();

    // The document tree is the tree of WebVTT Node Objects rooted at nodes.



    // Note: This is contained by default in m_allDocumentNodes.
    m_allDocumentNodes->setPseudo(allNodesShadowPseudoId());
    displayTree->appendChild(m_allDocumentNodes, ASSERT_NO_EXCEPTION, true);

    // FIXME(BUG 79916): Runs of children of WebVTT Ruby Objects that are not
    // WebVTT Ruby Text Objects must be wrapped in anonymous boxes whose

    // is no line breaking opportunity. (Thus, normally text wraps as needed,
    // but if there is a particularly long word, it does not overflow as it
    // normally would in CSS, it is instead forcibly wrapped at the box's edge.)
    displayTree->applyCSSProperties(videoSize);

    m_displayTreeShouldChange = false;

    // 10.15. Let cue's text track cue display state have the CSS boxes in
    // boxes.
    return displayTree;
}

void TextTrackCue::removeDisplayTree()
{
    displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
}

std::pair<double, double> TextTrackCue::getPositionCoordinates() const

    return &m_eventTargetData;
}

bool TextTrackCue::operator==(const TextTrackCue& cue) const
{
    if (cueType() != cue.cueType())
        return false;

    if (m_endTime != cue.endTime())
        return false;
    if (m_startTime != cue.startTime())
        return false;
    if (m_content != cue.text())
        return false;
    if (m_settings != cue.cueSettings())
        return false;
    if (m_id != cue.id())
        return false;
    if (m_textPosition != cue.position())
        return false;
    if (m_linePosition != cue.line())
        return false;
    if (m_cueSize != cue.size())
        return false;
    if (align() != cue.align())
        return false;
    
    return true;
}

} // namespace WebCore

#endif



/*
 * Copyright (C) 2011 Google Inc.  All rights reserved.
 * Copyright (C) 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

    }

    TextTrackCue* getCue() const;
    virtual void applyCSSProperties(const IntSize& videoSize);

    static const AtomicString& textTrackCueBoxShadowPseudoId();

protected:
    TextTrackCueBox(Document*, TextTrackCue*);

    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;

    void setSnapToLines(bool);

    int line() const { return m_linePosition; }
    virtual void setLine(int, ExceptionCode&);

    int position() const { return m_textPosition; }
    virtual void setPosition(int, ExceptionCode&);

    int size() const { return m_cueSize; }
    virtual void setSize(int, ExceptionCode&);

    const String& align() const;
    void setAlign(const String&, ExceptionCode&);

    bool isActive();
    void setIsActive(bool);

    PassRefPtr<TextTrackCueBox> getDisplayTree(const IntSize& videoSize);
    void updateDisplayTree(float);
    void removeDisplayTree();
    void markFutureAndPastNodes(ContainerNode*, double, double);

    };
    WritingDirection getWritingDirection() const { return m_writingDirection; }

    enum CueAlignment {
        Start,
        Middle,
        End
    };
    CueAlignment getAlignment() const { return m_cueAlignment; }

    virtual bool operator==(const TextTrackCue&) const;
    virtual bool operator!=(const TextTrackCue& cue) const
    {
        return !(*this == cue);
    }
    
    enum CueType {
        Generic,
        WebVTT
    };
    virtual CueType cueType() const { return WebVTT; }

    DEFINE_ATTRIBUTE_EVENT_LISTENER(enter);
    DEFINE_ATTRIBUTE_EVENT_LISTENER(exit);


    virtual EventTargetData* eventTargetData();
    virtual EventTargetData* ensureEventTargetData();

private:
    TextTrackCue(ScriptExecutionContext*, double start, double end, const String& content);

    Document* ownerDocument() { return static_cast<Document*>(m_scriptExecutionContext); }

    virtual PassRefPtr<TextTrackCueBox> createDisplayTree();
    PassRefPtr<TextTrackCueBox> displayTreeInternal();

private:
    std::pair<double, double> getPositionCoordinates() const;
    void parseSettings(const String&);



    WritingDirection m_writingDirection;

    CueAlignment m_cueAlignment;
    Alignment m_cueAlignment;

    RefPtr<DocumentFragment> m_webVTTNodeTree;
    TextTrack* m_track;



/*
 * 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:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"

#if ENABLE(VIDEO_TRACK)

#include "TextTrackCueGeneric.h"

#include "CSSPropertyNames.h"
#include "CSSValueKeywords.h"
#include "HTMLDivElement.h"
#include "HTMLNames.h"
#include "InbandTextTrackPrivateClient.h"
#include "RenderObject.h"
#include "RenderTextTrackCue.h"
#include "ScriptExecutionContext.h"
#include "TextTrackCue.h"

namespace WebCore {

class TextTrackCueGenericBoxElement : public TextTrackCueBox {
public:
    static PassRefPtr<TextTrackCueGenericBoxElement> create(Document* document, TextTrackCueGeneric* cue)
    {
        return adoptRef(new TextTrackCueGenericBoxElement(document, cue));
    }
    
    virtual void applyCSSProperties(const IntSize&) OVERRIDE;
    
private:
    TextTrackCueGenericBoxElement(Document*, TextTrackCue*);
};

TextTrackCueGenericBoxElement::TextTrackCueGenericBoxElement(Document* document, TextTrackCue* cue)
    : TextTrackCueBox(document, cue)
{
}

void TextTrackCueGenericBoxElement::applyCSSProperties(const IntSize& videoSize)
{
    setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
    setInlineStyleProperty(CSSPropertyUnicodeBidi, CSSValueWebkitPlaintext);
    
    TextTrackCueGeneric* cue = static_cast<TextTrackCueGeneric*>(getCue());

    if (cue->useDefaultPosition()) {
        setInlineStyleProperty(CSSPropertyBottom, "0");
        setInlineStyleProperty(CSSPropertyMarginBottom, 1.0, CSSPrimitiveValue::CSS_PERCENTAGE);
    } else {
        setInlineStyleProperty(CSSPropertyLeft, static_cast<float>(cue->position()), CSSPrimitiveValue::CSS_PERCENTAGE);
        setInlineStyleProperty(CSSPropertyTop, static_cast<float>(cue->line()), CSSPrimitiveValue::CSS_PERCENTAGE);
    }

    float size = static_cast<float>(cue->getCSSSize());
    if (cue->getWritingDirection() == TextTrackCue::Horizontal) {
        setInlineStyleProperty(CSSPropertyDirection, CSSValueLtr);
        setInlineStyleProperty(CSSPropertyWidth, size, CSSPrimitiveValue::CSS_PERCENTAGE);
        setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto);
    } else {
        setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto);
        setInlineStyleProperty(CSSPropertyHeight, size,  CSSPrimitiveValue::CSS_PERCENTAGE);
    }

    if (cue->baseFontSizeRelativeToVideoHeight()) {
        double fontSize = videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100;
        if (cue->fontSizeMultiplier())
            fontSize *= cue->fontSizeMultiplier() / 100;
        setInlineStyleProperty(CSSPropertyFontSize, String::number(fontSize) + "px");
    }

    if (cue->getAlignment() == TextTrackCue::Start)
        setInlineStyleProperty(CSSPropertyTextAlign, CSSValueStart);
    else if (cue->getAlignment() == TextTrackCue::End)
        setInlineStyleProperty(CSSPropertyTextAlign, CSSValueEnd);
    else
        setInlineStyleProperty(CSSPropertyTextAlign, CSSValueCenter);

    setInlineStyleProperty(CSSPropertyWebkitWritingMode, cue->getCSSWritingMode(), false);
    setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePreWrap);
    setInlineStyleProperty(CSSPropertyWordBreak, CSSValueNormal);
}

TextTrackCueGeneric::TextTrackCueGeneric(ScriptExecutionContext* context, double start, double end, const String& content)
    : TextTrackCue(context, start, end, content)
    , m_baseFontSizeRelativeToVideoHeight(0)
    , m_fontSizeMultiplier(0)
    , m_defaultPosition(true)
{
}

PassRefPtr<TextTrackCueBox> TextTrackCueGeneric::createDisplayTree()
{
    return TextTrackCueGenericBoxElement::create(ownerDocument(), this);
}

void TextTrackCueGeneric::setLine(int line, ExceptionCode& ec)
{
    m_defaultPosition = false;
    TextTrackCue::setLine(line, ec);
}

void TextTrackCueGeneric::setPosition(int position, ExceptionCode& ec)
{
    m_defaultPosition = false;
    TextTrackCue::setPosition(position, ec);
}

bool TextTrackCueGeneric::operator==(const TextTrackCue& cue) const
{
    if (cue.cueType() != TextTrackCue::Generic)
        return false;

    const TextTrackCueGeneric* other = static_cast<const TextTrackCueGeneric*>(&cue);

    if (m_baseFontSizeRelativeToVideoHeight != other->baseFontSizeRelativeToVideoHeight())
        return false;
    if (m_fontSizeMultiplier != other->fontSizeMultiplier())
        return false;
    if (m_fontName != other->fontName())
        return false;

    return TextTrackCue::operator==(cue);
}
    
} // namespace WebCore

#endif



/*
 * 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:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef TextTrackCueGeneric_h
#define TextTrackCueGeneric_h

#if ENABLE(VIDEO_TRACK)

#include "HTMLElement.h"
#include "TextTrackCue.h"
#include <wtf/RefCounted.h>

namespace WebCore {

class GenericCueData;

// A "generic" cue is a non-WebVTT cue, so it is not positioned/sized with the WebVTT logic.
class TextTrackCueGeneric : public TextTrackCue {
public:
    static PassRefPtr<TextTrackCueGeneric> create(ScriptExecutionContext* context, double start, double end, const String& content)
    {
        return adoptRef(new TextTrackCueGeneric(context, start, end, content));
    }
    
    virtual ~TextTrackCueGeneric() { }

    virtual PassRefPtr<TextTrackCueBox> createDisplayTree() OVERRIDE;

    virtual void setLine(int, ExceptionCode&) OVERRIDE;
    virtual void setPosition(int, ExceptionCode&) OVERRIDE;

    bool useDefaultPosition() const { return m_defaultPosition; }
    
    double baseFontSizeRelativeToVideoHeight() const { return m_baseFontSizeRelativeToVideoHeight; }
    void setBaseFontSizeRelativeToVideoHeight(double size) { m_baseFontSizeRelativeToVideoHeight = size; }

    double fontSizeMultiplier() const { return m_fontSizeMultiplier; }
    void setFontSizeMultiplier(double size) { m_fontSizeMultiplier = size; }

    String fontName() const { return m_fontName; }
    void setFontName(String name) { m_fontName = name; }

    virtual bool operator==(const TextTrackCue&) const OVERRIDE;
    virtual bool operator!=(const TextTrackCue& cue) const OVERRIDE
    {
        return !(*this == cue);
    }

    virtual TextTrackCue::CueType cueType() const OVERRIDE { return TextTrackCue::Generic; }

private:
    TextTrackCueGeneric(ScriptExecutionContext*, double start, double end, const String&);
    
    double m_baseFontSizeRelativeToVideoHeight;
    double m_fontSizeMultiplier;
    String m_fontName;
    bool m_defaultPosition;
};

} // namespace WebCore

#endif
#endif



/*
 * Copyright (C) 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

#ifndef InbandTextTrackPrivateClient_h
#define InbandTextTrackPrivateClient_h

#include <wtf/Noncopyable.h>
#include <wtf/text/WTFString.h>

#if ENABLE(VIDEO_TRACK)


class InbandTextTrackPrivate;

class GenericCueData {
    WTF_MAKE_NONCOPYABLE(GenericCueData); WTF_MAKE_FAST_ALLOCATED;
public:
    GenericCueData()
        : m_startTime(0)
        , m_endTime(0)
        , m_line(-1)
        , m_position(-1)
        , m_size(-1)
        , m_align(None)
        , m_baseFontSize(0)
        , m_relativeFontSize(0)
    {
    }
    virtual ~GenericCueData() { }

    double startTime() const { return m_startTime; }
    void setStartTime(double startTime) { m_startTime = startTime; }

    double endTime() const { return m_endTime; }
    void setEndTime(double endTime) { m_endTime = endTime; }

    String id() const { return m_id; }
    void setId(String id) { m_id = id; }

    String content() const { return m_content; }
    void setContent(String content) { m_content = content; }

    double line() const { return m_line; }
    void setLine(double line) { m_line = line; }

    double position() const { return m_position; }
    void setPosition(double position) { m_position = position; }

    double size() const { return m_size; }
    void setSize(double size) { m_size = size; }

    enum Alignment {
        None,
        Start,
        Middle,
        End
    };
    Alignment align() const { return m_align; }
    void setAlign(Alignment align) { m_align = align; }

    String fontName() const { return m_fontName; }
    void setFontName(String fontName) { m_fontName = fontName; }

    double baseFontSize() const { return m_baseFontSize; }
    void setBaseFontSize(double baseFontSize) { m_baseFontSize = baseFontSize; }

    double relativeFontSize() const { return m_relativeFontSize; }
    void setRelativeFontSize(double relativeFontSize) { m_relativeFontSize = relativeFontSize; }
    
private:

    double m_startTime;
    double m_endTime;
    String m_id;
    String m_content;
    double m_line;
    double m_position;
    double m_size;
    Alignment m_align;
    String m_fontName;
    double m_baseFontSize;
    double m_relativeFontSize;
};

class InbandTextTrackPrivateClient {
public:
    virtual ~InbandTextTrackPrivateClient() { }
    
    virtual void addWebVTTCue(InbandTextTrackPrivate*, double /*start*/, double /*end*/, const String& /*id*/, const String& /*content*/, const String& /*settings*/) = 0;
    virtual void addGenericCue(InbandTextTrackPrivate*, GenericCueData*) = 0;
};

} // namespace WebCore

Lines 1-5 Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec1
- Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp -29 / +108 lines
1	/*	1	/*
2	* Copyright (C) 2012 Apple Inc. All rights reserved.	2	* Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 29-34 Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec2
29		29
30	#include "InbandTextTrackPrivateAVF.h"	30	#include "InbandTextTrackPrivateAVF.h"
31		31
		32	#include "InbandTextTrackPrivateClient.h"
32	#include "Logging.h"	33	#include "Logging.h"
33	#include "MediaPlayerPrivateAVFoundation.h"	34	#include "MediaPlayerPrivateAVFoundation.h"
34	#include "SoftLinking.h"	35	#include "SoftLinking.h"
Lines 36-41 Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec3
36	#include <wtf/UnusedParam.h>	37	#include <wtf/UnusedParam.h>
37	#include <wtf/text/CString.h>	38	#include <wtf/text/CString.h>
38	#include <wtf/text/WTFString.h>	39	#include <wtf/text/WTFString.h>
		40	#include <wtf/unicode/CharacterNames.h>
39		41
40	SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)	42	SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)
41		43
Lines 52-57 SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec4
52	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextMarkupAttribute_VerticalLayout, CFStringRef)	54	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextMarkupAttribute_VerticalLayout, CFStringRef)
53	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextVerticalLayout_LeftToRight, CFStringRef)	55	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextVerticalLayout_LeftToRight, CFStringRef)
54	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextVerticalLayout_RightToLeft, CFStringRef)	56	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextVerticalLayout_RightToLeft, CFStringRef)
		57	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight, CFStringRef)
		58	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextMarkupAttribute_RelativeFontSize, CFStringRef)
		59	SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kCMTextMarkupAttribute_FontFamilyName, CFStringRef)
55		60
56	#define kCMTextMarkupAttribute_Alignment getkCMTextMarkupAttribute_Alignment()	61	#define kCMTextMarkupAttribute_Alignment getkCMTextMarkupAttribute_Alignment()
57	#define kCMTextMarkupAlignmentType_Start getkCMTextMarkupAlignmentType_Start()	62	#define kCMTextMarkupAlignmentType_Start getkCMTextMarkupAlignmentType_Start()
Lines 66-71 SOFT_LINK_POINTER_OPTIONAL(CoreMedia, kC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec5
66	#define kCMTextMarkupAttribute_VerticalLayout getkCMTextMarkupAttribute_VerticalLayout()	71	#define kCMTextMarkupAttribute_VerticalLayout getkCMTextMarkupAttribute_VerticalLayout()
67	#define kCMTextVerticalLayout_LeftToRight getkCMTextVerticalLayout_LeftToRight()	72	#define kCMTextVerticalLayout_LeftToRight getkCMTextVerticalLayout_LeftToRight()
68	#define kCMTextVerticalLayout_RightToLeft getkCMTextVerticalLayout_RightToLeft()	73	#define kCMTextVerticalLayout_RightToLeft getkCMTextVerticalLayout_RightToLeft()
		74	#define kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight getkCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight()
		75	#define kCMTextMarkupAttribute_RelativeFontSize getkCMTextMarkupAttribute_RelativeFontSize()
		76	#define kCMTextMarkupAttribute_FontFamilyName getkCMTextMarkupAttribute_FontFamilyName()
69		77
70	using namespace std;	78	using namespace std;
71		79
Lines 84-90 InbandTextTrackPrivateAVF::~InbandTextTr Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec6
84	disconnect();	92	disconnect();
85	}	93	}
86		94
87	void InbandTextTrackPrivateAVF::processCueAttributes(CFAttributedStringRef attributedString, StringBuilder& content, StringBuilder& settings)	95	void InbandTextTrackPrivateAVF::processCueAttributes(CFAttributedStringRef attributedString, GenericCueData* cueData)
88	{	96	{
89	// Some of the attributes we translate into per-cue WebVTT settings are are repeated on each part of an attributed string so only	97	// Some of the attributes we translate into per-cue WebVTT settings are are repeated on each part of an attributed string so only
90	// process the first instance of each.	98	// process the first instance of each.
Lines 93-102 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec7
93	Position = 1 << 1,	101	Position = 1 << 1,
94	Size = 1 << 2,	102	Size = 1 << 2,
95	Vertical = 1 << 3,	103	Vertical = 1 << 3,
96	Align = 1 << 4	104	Align = 1 << 4,
		105	FontName = 1 << 5
97	};	106	};
98	unsigned processed = 0;	107	unsigned processed = 0;
99		108
		109	StringBuilder content;
100	String attributedStringValue = CFAttributedStringGetString(attributedString);	110	String attributedStringValue = CFAttributedStringGetString(attributedString);
101	CFIndex length = attributedStringValue.length();	111	CFIndex length = attributedStringValue.length();
102	if (!length)	112	if (!length)
Lines 110-115 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec8
110	continue;	120	continue;
111		121
112	StringBuilder tagStart;	122	StringBuilder tagStart;
		123	CFStringRef valueString;
113	String tagEnd;	124	String tagEnd;
114	CFIndex attributeCount = CFDictionaryGetCount(attributes);	125	CFIndex attributeCount = CFDictionaryGetCount(attributes);
115	Vector<const void*> keys(attributeCount);	126	Vector<const void*> keys(attributeCount);
Lines 123-129 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec9
123	continue;	134	continue;
124		135
125	if (CFStringCompare(key, kCMTextMarkupAttribute_Alignment, 0) == kCFCompareEqualTo) {	136	if (CFStringCompare(key, kCMTextMarkupAttribute_Alignment, 0) == kCFCompareEqualTo) {
126	CFStringRef valueString = static_cast<CFStringRef>(value);	137	valueString = static_cast<CFStringRef>(value);
127	if (CFGetTypeID(valueString) != CFStringGetTypeID() \|\| !CFStringGetLength(valueString))	138	if (CFGetTypeID(valueString) != CFStringGetTypeID() \|\| !CFStringGetLength(valueString))
128	continue;	139	continue;
129	if (processed & Align)	140	if (processed & Align)
Lines 131-141 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec10
131	processed \|= Align;	142	processed \|= Align;
132		143
133	if (CFStringCompare(valueString, kCMTextMarkupAlignmentType_Start, 0) == kCFCompareEqualTo)	144	if (CFStringCompare(valueString, kCMTextMarkupAlignmentType_Start, 0) == kCFCompareEqualTo)
134	settings.append("align:start ");	145	cueData->setAlign(GenericCueData::Start);
135	else if (CFStringCompare(valueString, kCMTextMarkupAlignmentType_Middle, 0) == kCFCompareEqualTo)	146	else if (CFStringCompare(valueString, kCMTextMarkupAlignmentType_Middle, 0) == kCFCompareEqualTo)
136	settings.append("align:middle ");	147	cueData->setAlign(GenericCueData::Middle);
137	else if (CFStringCompare(valueString, kCMTextMarkupAlignmentType_End, 0) == kCFCompareEqualTo)	148	else if (CFStringCompare(valueString, kCMTextMarkupAlignmentType_End, 0) == kCFCompareEqualTo)
138	settings.append("align:end ");	149	cueData->setAlign(GenericCueData::End);
139	else	150	else
140	ASSERT_NOT_REACHED();	151	ASSERT_NOT_REACHED();
141		152
Lines 170-178 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec11
170	}	181	}
171		182
172	if (CFStringCompare(key, kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection, 0) == kCFCompareEqualTo) {	183	if (CFStringCompare(key, kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection, 0) == kCFCompareEqualTo) {
173	// Ignore the line position if the attributes also specify "size" so we keep WebVTT's default line logic
174	if (CFDictionaryGetValue(attributes, kCMTextMarkupAttribute_WritingDirectionSizePercentage))
175	continue;
176	if (CFGetTypeID(value) != CFNumberGetTypeID())	184	if (CFGetTypeID(value) != CFNumberGetTypeID())
177	continue;	185	continue;
178	if (processed & Line)	186	if (processed & Line)
Lines 180-188 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec12
180	processed \|= Line;	188	processed \|= Line;
181		189
182	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);	190	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);
183	double position;	191	double line;
184	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &position);	192	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &line);
185	settings.append(String::format("line:%ld%% ", lrint(position)));	193	cueData->setLine(line);
186	continue;	194	continue;
187	}	195	}
188		196
Lines 196-202 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec13
196	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);	204	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);
197	double position;	205	double position;
198	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &position);	206	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &position);
199	settings.append(String::format("position:%ld%% ", lrint(position)));	207	cueData->setPosition(position);
200	continue;	208	continue;
201	}	209	}
202		210
Lines 208-223 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec14
208	processed \|= Size;	216	processed \|= Size;
209		217
210	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);	218	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);
211	double position;	219	double size;
212	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &position);	220	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &size);
213	settings.append(String::format("size:%ld%% ", lrint(position)));	221	cueData->setSize(size);
		222	continue;
		223	}
		224
		225	if (CFStringCompare(key, kCMTextMarkupAttribute_VerticalLayout, 0) == kCFCompareEqualTo) {
		226	valueString = static_cast<CFStringRef>(value);
		227	if (CFGetTypeID(valueString) != CFStringGetTypeID() \|\| !CFStringGetLength(valueString))
		228	continue;
		229
		230	if (CFStringCompare(valueString, kCMTextVerticalLayout_LeftToRight, 0) == kCFCompareEqualTo)
		231	tagStart.append(leftToRightMark);
		232	else if (CFStringCompare(valueString, kCMTextVerticalLayout_RightToLeft, 0) == kCFCompareEqualTo)
		233	tagStart.append(rightToLeftMark);
		234	continue;
		235	}
		236
		237	if (CFStringCompare(key, kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight, 0) == kCFCompareEqualTo) {
		238	if (CFGetTypeID(value) != CFNumberGetTypeID())
		239	continue;
		240
		241	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);
		242	double baseFontSize;
		243	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &baseFontSize);
		244	cueData->setBaseFontSize(baseFontSize);
		245	continue;
		246	}
		247
		248	if (CFStringCompare(key, kCMTextMarkupAttribute_RelativeFontSize, 0) == kCFCompareEqualTo) {
		249	if (CFGetTypeID(value) != CFNumberGetTypeID())
		250	continue;
		251
		252	CFNumberRef valueNumber = static_cast<CFNumberRef>(value);
		253	double relativeFontSize;
		254	CFNumberGetValue(valueNumber, kCFNumberFloat64Type, &relativeFontSize);
		255	cueData->setRelativeFontSize(relativeFontSize);
		256	continue;
		257	}
		258
		259	if (CFStringCompare(key, kCMTextMarkupAttribute_FontFamilyName, 0) == kCFCompareEqualTo) {
		260	valueString = static_cast<CFStringRef>(value);
		261	if (CFGetTypeID(valueString) != CFStringGetTypeID() \|\| !CFStringGetLength(valueString))
		262	continue;
		263	if (processed & FontName)
		264	continue;
		265	processed \|= FontName;
		266
		267	cueData->setFontName(valueString);
214	continue;	268	continue;
215	}	269	}
216	}	270	}
		271
217	content.append(tagStart);	272	content.append(tagStart);
218	content.append(attributedStringValue.substring(effectiveRange.location, effectiveRange.length));	273	content.append(attributedStringValue.substring(effectiveRange.location, effectiveRange.length));
219	content.append(tagEnd);	274	content.append(tagEnd);
220	}	275	}
		276
		277	if (content.length())
		278	cueData->setContent(content.toString());
221	}	279	}
222		280
223	void InbandTextTrackPrivateAVF::processCue(CFArrayRef attributedStrings, double time)	281	void InbandTextTrackPrivateAVF::processCue(CFArrayRef attributedStrings, double time)
Lines 228-248 void InbandTextTrackPrivateAVF::processC Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec15
228	if (m_havePartialCue) {	286	if (m_havePartialCue) {
229	// Cues do not have an explicit duration, they are displayed until the next "cue" (which might be empty) is emitted.	287	// Cues do not have an explicit duration, they are displayed until the next "cue" (which might be empty) is emitted.
230	m_currentCueEndTime = time;	288	m_currentCueEndTime = time;
231	LOG(Media, "InbandTextTrackPrivateAVF::processCue flushing cue: start=%.2f, end=%.2f, settings=\"%s\", content=\"%s\" \n",	289
232	m_currentCueStartTime, m_currentCueEndTime,	290	if (m_currentCueEndTime >= m_currentCueStartTime) {
233	m_currentCueSettings.toString().utf8().data(), m_currentCueContent.toString().utf8().data());	291	for (size_t i = 0; i < m_cues.size(); i++) {
234	m_player->flushCurrentCue(this);	292
		293	GenericCueData* cueData = m_cues[i].get();
		294
		295	LOG(Media, "InbandTextTrackPrivateAVF::processCue flushing cue: start=%.2f, end=%.2f, content=\"%s\" \n",
		296	m_currentCueStartTime, m_currentCueEndTime, cueData->content().utf8().data());
		297
		298	if (!cueData->content().length())
		299	continue;
		300
		301	cueData->setStartTime(m_currentCueStartTime);
		302	cueData->setEndTime(m_currentCueEndTime);
		303
		304	// AVFoundation cue "position" is to the center of the text so adjust relative to the edge because we will use it to
		305	// set CSS "left".
		306	if (cueData->position() >= 0 && cueData->size() > 0)
		307	cueData->setPosition(cueData->position() - cueData->size() / 2);
		308
		309	m_player->addGenericCue(this, cueData);
		310	}
		311	} else
		312	LOG(Media, "InbandTextTrackPrivateAVF::processCue negative length cue(s) ignored: start=%.2f, end=%.2f\n", m_currentCueStartTime, m_currentCueEndTime);
		313
235	resetCueValues();	314	resetCueValues();
236	}	315	}
237		316
238	CFIndex count = CFArrayGetCount(attributedStrings);	317	CFIndex count = CFArrayGetCount(attributedStrings);
		318	if (!count)
		319	return;
		320
239	for (CFIndex i = 0; i < count; i++) {	321	for (CFIndex i = 0; i < count; i++) {
240	CFAttributedStringRef attributedString = static_cast<CFAttributedStringRef>(CFArrayGetValueAtIndex(attributedStrings, i));	322	CFAttributedStringRef attributedString = static_cast<CFAttributedStringRef>(CFArrayGetValueAtIndex(attributedStrings, i));
241		323
242	if (!attributedString \|\| !CFAttributedStringGetLength(attributedString))	324	if (!attributedString \|\| !CFAttributedStringGetLength(attributedString))
243	continue;	325	continue;
244		326
245	processCueAttributes(attributedString, m_currentCueContent, m_currentCueSettings);	327	m_cues.append(adoptPtr(new GenericCueData));
		328	processCueAttributes(attributedString, m_cues[i].get());
246	m_currentCueStartTime = time;	329	m_currentCueStartTime = time;
247	m_havePartialCue = true;	330	m_havePartialCue = true;
248	}	331	}
Lines 256-272 void InbandTextTrackPrivateAVF::disconne Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp_sec16
256		339
257	void InbandTextTrackPrivateAVF::resetCueValues()	340	void InbandTextTrackPrivateAVF::resetCueValues()
258	{	341	{
259	if (m_havePartialCue && !m_currentCueEndTime) {	342	if (m_havePartialCue && !m_currentCueEndTime)
260	LOG(Media, "InbandTextTrackPrivateAVF::resetCueValues flushing data for cue: start=%.2f, end=%.2f, settings=\"%s\", content=\"%s\" \n",	343	LOG(Media, "InbandTextTrackPrivateAVF::resetCueValues flushing data for cues: start=%.2f\n", m_currentCueStartTime);
261	m_currentCueStartTime, m_currentCueEndTime, m_currentCueSettings.toString().utf8().data(), m_currentCueContent.toString().utf8().data());
262	}
263		344
		345	m_cues.resize(0);
264	m_havePartialCue = false;	346	m_havePartialCue = false;
265	m_currentCueId = String();
266	m_currentCueStartTime = 0;	347	m_currentCueStartTime = 0;
267	m_currentCueEndTime = 0;	348	m_currentCueEndTime = 0;
268	m_currentCueSettings.clear();
269	m_currentCueContent.clear();
270	}	349	}
271		350
272	void InbandTextTrackPrivateAVF::setMode(InbandTextTrackPrivate::Mode newMode)	351	void InbandTextTrackPrivateAVF::setMode(InbandTextTrackPrivate::Mode newMode)



/*
 * Copyright (C) 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

namespace WebCore {

class MediaPlayerPrivateAVFoundation;
class GenericCueData;

class InbandTextTrackPrivateAVF : public InbandTextTrackPrivate {
public:
    ~InbandTextTrackPrivateAVF();

    String id() const { return m_currentCueId; }
    double start() const { return m_currentCueStartTime; }
    double end() const { return m_currentCueEndTime; }
    String settings() { return m_currentCueSettings.toString(); }
    String content() { return m_currentCueContent.toString(); }

    ~InbandTextTrackPrivateAVF();

    void resetCueValues();

    virtual void setMode(InbandTextTrackPrivate::Mode) OVERRIDE;


    bool hasBeenReported() const { return m_hasBeenReported; }
    void setHasBeenReported(bool reported) { m_hasBeenReported = reported; }

    void processCue(CFArrayRef, double);
    void resetCueValues();

protected:
    InbandTextTrackPrivateAVF(MediaPlayerPrivateAVFoundation*);

    void processCueAttributes(CFAttributedStringRef, GenericCueData*);

    String m_currentCueId;
    double m_currentCueStartTime;
    double m_currentCueEndTime;

    Vector<OwnPtr<GenericCueData> > m_cues;

    MediaPlayerPrivateAVFoundation* m_player;
    int m_index;



    LOG(Media, "MediaPlayerPrivateAVFoundation::seekCompleted(%p) - finished = %d", this, finished);
    UNUSED_PARAM(finished);

#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
    if (currentTrack())
        currentTrack()->resetCueValues();
#endif

    m_seekTo = MediaPlayer::invalidTime();
    updateStates();
    m_player->timeChanged();

}

#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
void MediaPlayerPrivateAVFoundation::addGenericCue(InbandTextTrackPrivateAVF* track, GenericCueData* cueData)
{
    if (!track->client())
        return;

    LOG(Media, "MediaPlayerPrivateAVFoundation::addGenericCue(%p) - adding cue for time %.2f", this, cueData->startTime());
    track->client()->addGenericCue(track, cueData);
        LOG(Media, "MediaPlayerPrivateAVFoundation::flushCurrentCue(%p) - already have cue for time %.2f", this, track->start());
        return;
    }

    LOG(Media, "MediaPlayerPrivateAVFoundation::flushCurrentCue(%p) - adding cue for time %.2f", this, track->start());
    track->client()->addCue(track, track->start(), track->end(), track->id(), track->content(), track->settings());
}

void MediaPlayerPrivateAVFoundation::configureInbandTracks()



namespace WebCore {

class InbandTextTrackPrivateAVF;
class GenericCueData;

class MediaPlayerPrivateAVFoundation : public MediaPlayerPrivateInterface {
public:

    void clearMainThreadPendingFlag();

#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
    void addGenericCue(InbandTextTrackPrivateAVF*, GenericCueData*);
    void trackModeChanged();
#endif




SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVMediaTypeSubtitle, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, NSString *)

#define AVPlayerItemLegibleOutput getAVPlayerItemLegibleOutputClass()
#define AVMediaSelectionGroup getAVMediaSelectionGroupClass()

#define AVMediaCharacteristicLegible getAVMediaCharacteristicLegible()
#define AVMediaTypeSubtitle getAVMediaTypeSubtitle()
#define AVMediaCharacteristicContainsOnlyForcedSubtitles getAVMediaCharacteristicContainsOnlyForcedSubtitles()
#define AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly getAVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly()
#endif

#define kCMTimeZero getkCMTimeZero()

#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
    [m_avPlayer.get() setAppliesMediaSelectionCriteriaAutomatically:YES];
#endif
    

    if (m_avPlayerItem)
        [m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];


    // Create the player item so we can load media data. 
    m_avPlayerItem.adoptNS([[AVPlayerItem alloc] initWithAsset:m_avAsset.get()]);

    [[NSNotificationCenter defaultCenter] addObserver:m_objcObserver.get() selector:@selector(didEnd:) name:AVPlayerItemDidPlayToEndTimeNotification object:m_avPlayerItem.get()];

    for (NSString *keyName in itemKVOProperties())


        [m_legibleOutput.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
        [m_legibleOutput.get() setAdvanceIntervalForDelegateInvocation:NSTimeIntervalSince1970];
        [m_legibleOutput.get() setTextStylingResolution:AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly];
        [m_avPlayerItem.get() addOutput:m_legibleOutput.get()];
    }
#endif

        LOG(Media, "MediaPlayerPrivateAVFoundationObjC::processTextTracks(%p) - nil mediaSelectionGroup", this);
        return;
    }
    
    Vector<RefPtr<InbandTextTrackPrivateAVF> > removedTextTracks = m_textTracks;
    NSArray *legibleOptions = [AVMediaSelectionGroup playableMediaSelectionOptionsFromArray:[legibleGroup options]];
    for (AVMediaSelectionOptionType *option in legibleOptions) {

        if (!newTrack)
            continue;

        if ([[option mediaType] isEqualToString:AVMediaTypeSubtitle] && [option hasMediaCharacteristic:AVMediaCharacteristicContainsOnlyForcedSubtitles])
            continue;
                AVMediaSelectionOptionType *forcedOnlyOption = [option associatedMediaSelectionOptionInMediaSelectionGroup:legibleGroup];
                if (forcedOnlyOption)
                    continue;
            }
        }

        m_textTracks.append(InbandTextTrackPrivateAVFObjC::create(this, option));
    }

void MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(InbandTextTrackPrivateAVF *track)
{
    InbandTextTrackPrivateAVFObjC* trackPrivate = static_cast<InbandTextTrackPrivateAVFObjC*>(track);
    if (m_currentTrack == trackPrivate)
        return;

    AVMediaSelectionOptionType *mediaSelectionOption = trackPrivate ? trackPrivate->mediaSelectionOption() : 0;

    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(%p) - selecting media option %p", this, mediaSelectionOption);

        return;

    dispatch_async(dispatch_get_main_queue(), ^{
        if (!m_callback)
            return;
        m_callback->processCue(strings, CMTimeGetSeconds(itemTime));
    });
}

Return to Bug 107046

Lines 1304-1311 void MediaControlTextTrackContainerEleme Source/WebCore/html/shadow/MediaControlElements.cpp_sec1
- Source/WebCore/html/shadow/MediaControlElements.cpp -2 / +1 lines
1304	if (!cue->track() \|\| !cue->track()->isRendered())	1304	if (!cue->track() \|\| !cue->track()->isRendered())
1305	continue;	1305	continue;
1306		1306
1307	RefPtr<TextTrackCueBox> displayBox = cue->getDisplayTree();	1307	RefPtr<TextTrackCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size());
1308
1309	if (displayBox->hasChildNodes() && !contains(static_cast<Node*>(displayBox.get())))	1308	if (displayBox->hasChildNodes() && !contains(static_cast<Node*>(displayBox.get())))
1310	// Note: the display tree of a cue is removed when the active flag of the cue is unset.	1309	// Note: the display tree of a cue is removed when the active flag of the cue is unset.
1311	m_cueContainer->appendChild(displayBox, ASSERT_NO_EXCEPTION, false);	1310	m_cueContainer->appendChild(displayBox, ASSERT_NO_EXCEPTION, false);

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +91 lines
		1	2013-01-21 Eric Carlson <eric.carlson@apple.com>
		2
		3	Support non-WebVTT cues from in-band text tracks
		4	https://bugs.webkit.org/show_bug.cgi?id=107046
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt: Add new files.
		9	* GNUmakefile.list.am: Ditto.
		10	* Target.pri: Ditto.
		11	* WebCore.gypi: Ditto.
		12	* WebCore.vcproj/WebCore.vcproj: Ditto.
		13	* WebCore.xcodeproj/project.pbxproj: Ditto.
		14
		15	* html/shadow/MediaControlElements.cpp:
		16	(WebCore::MediaControlTextTrackContainerElement::updateDisplay): Pass video size to getDisplayTree.
		17
		18	* html/track/InbandTextTrack.cpp:
		19	(WebCore::InbandTextTrack::addGenericCue): New, create a generic cue if it doesn't already exist.
		20	(WebCore::InbandTextTrack::addWebVTTCue): Renamed from addCue.
		21	* html/track/InbandTextTrack.h:
		22
		23	* html/track/TextTrack.cpp:
		24	(WebCore::TextTrack::hasCue): Moved from InbandTextTrack.cpp, use operator == instead of inline
		25	comparison so derived TextTrackCues can be compared.
		26	* html/track/TextTrack.h:
		27
		28	* html/track/TextTrackCue.cpp:
		29	(WebCore::TextTrackCueBox::applyCSSProperties): Interface change.
		30	(WebCore::TextTrackCue::TextTrackCue): Don't create the display tree in the constructor, it may
		31	never be needed.
		32	(WebCore::TextTrackCue::createDisplayTree): New, create the display tree.
		33	(WebCore::TextTrackCue::displayTreeInternal): Display tree accessor, allows it to be created lazily.
		34	(WebCore::TextTrackCue::setAlign): Alignment -> CueAlignment.
		35	(WebCore::TextTrackCue::setIsActive): Use displayTreeInternal().
		36	(WebCore::TextTrackCue::getDisplayTree): Use displayTreeInternal(), pass video size to applyCSSProperties.
		37	(WebCore::TextTrackCue::removeDisplayTree): Use displayTreeInternal().
		38	(WebCore::TextTrackCue::operator==): New.
		39	* html/track/TextTrackCue.h:
		40	(WebCore::TextTrackCue::getAlignment): Alignment -> CueAlignment.
		41	(WebCore::TextTrackCue::operator!=): New.
		42	(WebCore::TextTrackCue::cueType): New, cue type identified needed by operator==.
		43	(WebCore::TextTrackCue::ownerDocument): New.
		44
		45	* html/track/TextTrackCueGeneric.cpp: Added.
		46	(WebCore::TextTrackCueGenericBox::create):
		47	(WebCore::TextTrackCueGenericBox::TextTrackCueGenericBox):
		48	(WebCore::TextTrackCueGenericBox::applyCSSProperties):
		49	(WebCore:::TextTrackCue):
		50	(WebCore::TextTrackCueGeneric::createDisplayTree):
		51	(WebCore::TextTrackCueGeneric::operator==):
		52	* html/track/TextTrackCueGeneric.h: Added.
		53	(WebCore::TextTrackCueGeneric::create):
		54	(WebCore::TextTrackCueGeneric::~TextTrackCueGeneric):
		55	(WebCore::TextTrackCueGeneric::baseFontSizeRelativeToVideoHeight):
		56	(WebCore::TextTrackCueGeneric::setBaseFontSizeRelativeToVideoHeight):
		57	(WebCore::TextTrackCueGeneric::fontSizeMultiplier):
		58	(WebCore::TextTrackCueGeneric::setFontSizeMultiplier):
		59	(WebCore::TextTrackCueGeneric::fontName):
		60	(WebCore::TextTrackCueGeneric::setFontName):
		61	(WebCore::TextTrackCueGeneric::operator!=):
		62	(WebCore::TextTrackCueGeneric::cueType):
		63
		64	* platform/graphics/InbandTextTrackPrivateClient.h:
65	* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
66	(WebCore::InbandTextTrackPrivateAVF::processCueAttributes): Copy cue attributes into GenericCueData
67	struct instead of trying to convert to WebVTT settings string. Process font size,font base
68	size, font name, and vertical layout attributes,
69	(WebCore::InbandTextTrackPrivateAVF::processCue): Create separate cues for each attributed
70	string in the array because each one can be at a different screen location.
71	(WebCore::InbandTextTrackPrivateAVF::resetCueValues):
72	* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
73	(InbandTextTrackPrivateAVF):
74
75	* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
76	(WebCore::MediaPlayerPrivateAVFoundation::seekCompleted): Reset any partially accumulated cues
77	delivered since the seek was started.
78	(WebCore::MediaPlayerPrivateAVFoundation::addGenericCue): Renamed from flushCurrentCue.
79	* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
80
81	* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
82	(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Whitespace cleanup.
83	(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Ditto.
84	(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): Tell legible output to deliver cues
85	without any additional styling needed by the internal renderer.
86	(WebCore::MediaPlayerPrivateAVFoundationObjC::processTextTracks):
87	(WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTrack): Do nothing if asked to change
88	to the track that is already current.
89	(-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):
90	Check to make sure that the client callback isn't NULL.
91
1	2013-01-21 Vladislav Kaznacheev <kaznacheev@chromium.org>	92	2013-01-21 Vladislav Kaznacheev <kaznacheev@chromium.org>
2		93
3	[Inspector] Layout Elements panel in a single column when docked right.	94	[Inspector] Layout Elements panel in a single column when docked right.

Lines 108-113 Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- Source/WebCore/WebCore.xcodeproj/project.pbxproj +8 lines
108	070756DF14239B4E00414161 /* JSTextTrackCueList.cpp in Sources / = {isa = PBXBuildFile; fileRef = 070756D914239B4C00414161 / JSTextTrackCueList.cpp */; };	108	070756DF14239B4E00414161 /* JSTextTrackCueList.cpp in Sources / = {isa = PBXBuildFile; fileRef = 070756D914239B4C00414161 / JSTextTrackCueList.cpp */; };
109	070756E014239B4E00414161 /* JSTextTrackCueList.h in Headers / = {isa = PBXBuildFile; fileRef = 070756DA14239B4E00414161 / JSTextTrackCueList.h */; };	109	070756E014239B4E00414161 /* JSTextTrackCueList.h in Headers / = {isa = PBXBuildFile; fileRef = 070756DA14239B4E00414161 / JSTextTrackCueList.h */; };
110	0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers / = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA / AccessibilitySlider.h */; };	110	0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers / = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA / AccessibilitySlider.h */; };
		111	071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources / = {isa = PBXBuildFile; fileRef = 071A9EC0168FB56C002629F9 / TextTrackCueGeneric.cpp */; };
		112	071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers / = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 / TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
111	0720B0A014D3323500642955 /* GenericEventQueue.cpp in Sources / = {isa = PBXBuildFile; fileRef = 0720B09E14D3323500642955 / GenericEventQueue.cpp */; };	113	0720B0A014D3323500642955 /* GenericEventQueue.cpp in Sources / = {isa = PBXBuildFile; fileRef = 0720B09E14D3323500642955 / GenericEventQueue.cpp */; };
112	0720B0A014D3323500642956 /* GestureEvent.cpp in Sources / = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642956 / GestureEvent.cpp */; };	114	0720B0A014D3323500642956 /* GestureEvent.cpp in Sources / = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642956 / GestureEvent.cpp */; };
113	0720B0A114D3323500642955 /* GenericEventQueue.h in Headers / = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642955 / GenericEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };	115	0720B0A114D3323500642955 /* GenericEventQueue.h in Headers / = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642955 / GenericEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
Lines 7303-7308 Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
7303	070756DA14239B4E00414161 /* JSTextTrackCueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrackCueList.h; sourceTree = "<group>"; };	7305	070756DA14239B4E00414161 /* JSTextTrackCueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrackCueList.h; sourceTree = "<group>"; };
7304	0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySlider.h; sourceTree = "<group>"; };	7306	0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySlider.h; sourceTree = "<group>"; };
7305	070DD8F50F01868000727DEB /* mediaControls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControls.css; sourceTree = "<group>"; };	7307	070DD8F50F01868000727DEB /* mediaControls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControls.css; sourceTree = "<group>"; };
		7308	071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueGeneric.cpp; sourceTree = "<group>"; };
		7309	071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueGeneric.h; sourceTree = "<group>"; };
7306	0720B09E14D3323500642955 /* GenericEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GenericEventQueue.cpp; sourceTree = "<group>"; };	7310	0720B09E14D3323500642955 /* GenericEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GenericEventQueue.cpp; sourceTree = "<group>"; };
7307	0720B09F14D3323500642955 /* GenericEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericEventQueue.h; sourceTree = "<group>"; };	7311	0720B09F14D3323500642955 /* GenericEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericEventQueue.h; sourceTree = "<group>"; };
7308	0720B09F14D3323500642956 /* GestureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GestureEvent.cpp; sourceTree = "<group>"; };	7312	0720B09F14D3323500642956 /* GestureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GestureEvent.cpp; sourceTree = "<group>"; };
Lines 19744-19749 Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
19744	9759E93814EF1CF80026A2DD /* TextTrackCue.cpp */,	19748	9759E93814EF1CF80026A2DD /* TextTrackCue.cpp */,
19745	9759E93914EF1CF80026A2DD /* TextTrackCue.h */,	19749	9759E93914EF1CF80026A2DD /* TextTrackCue.h */,
19746	9759E93A14EF1CF80026A2DD /* TextTrackCue.idl */,	19750	9759E93A14EF1CF80026A2DD /* TextTrackCue.idl */,
		19751	071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */,
		19752	071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */,
19747	9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */,	19753	9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */,
19748	9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */,	19754	9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */,
19749	9759E93D14EF1CF80026A2DD /* TextTrackCueList.idl */,	19755	9759E93D14EF1CF80026A2DD /* TextTrackCueList.idl */,
Lines 26027-26032 Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
26027	B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,	26033	B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
26028	9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,	26034	9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,
26029	9759E94314EF1CF80026A2DD /* TextTrackCue.h in Headers */,	26035	9759E94314EF1CF80026A2DD /* TextTrackCue.h in Headers */,
		26036	071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */,
26030	9759E94614EF1CF80026A2DD /* TextTrackCueList.h in Headers */,	26037	9759E94614EF1CF80026A2DD /* TextTrackCueList.h in Headers */,
26031	076970871463AD8700F502CF /* TextTrackList.h in Headers */,	26038	076970871463AD8700F502CF /* TextTrackList.h in Headers */,
26032	B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */,	26039	B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */,
Lines 29211-29216 Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec5
29211	B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,	29218	B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
29212	9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,	29219	9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
29213	9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,	29220	9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
		29221	071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,
29214	9759E94514EF1CF80026A2DD /* TextTrackCueList.cpp in Sources */,	29222	9759E94514EF1CF80026A2DD /* TextTrackCueList.cpp in Sources */,
29215	076970861463AD8700F502CF /* TextTrackList.cpp in Sources */,	29223	076970861463AD8700F502CF /* TextTrackList.cpp in Sources */,
29216	B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */,	29224	B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */,

Lines 32-40 Source/WebCore/html/track/InbandTextTrack.cpp_sec1
- Source/WebCore/html/track/InbandTextTrack.cpp -59 / +42 lines
32	#include "Document.h"	32	#include "Document.h"
33	#include "Event.h"	33	#include "Event.h"
34	#include "InbandTextTrackPrivate.h"	34	#include "InbandTextTrackPrivate.h"
		35	#include "Logging.h"
35	#include "MediaPlayer.h"	36	#include "MediaPlayer.h"
		37	#include "TextTrackCueGeneric.h"
36	#include "TextTrackCueList.h"	38	#include "TextTrackCueList.h"
37		39	#include <math.h>
38	#include <wtf/UnusedParam.h>	40	#include <wtf/UnusedParam.h>
39		41
40	namespace WebCore {	42	namespace WebCore {
Lines 98-171 size_t InbandTextTrack::inbandTrackIndex Source/WebCore/html/track/InbandTextTrack.cpp_sec2
98	return m_private->textTrackIndex();	100	return m_private->textTrackIndex();
99	}	101	}
100		102
101	void InbandTextTrack::addCue(InbandTextTrackPrivate* trackPrivate, double start, double end, const String& id, const String& content, const String& settings)	103	void InbandTextTrack::addGenericCue(InbandTextTrackPrivate* trackPrivate, GenericCueData* cueData)
102	{	104	{
103	UNUSED_PARAM(trackPrivate);	105	UNUSED_PARAM(trackPrivate);
104	ASSERT(trackPrivate == m_private);	106	ASSERT(trackPrivate == m_private);
105		107
106	RefPtr<TextTrackCue> cue = TextTrackCue::create(scriptExecutionContext(), start, end, content);	108	RefPtr<TextTrackCueGeneric> cue = TextTrackCueGeneric::create(scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
107	cue->setId(id);
108	cue->setCueSettings(settings);
109	cue->setTrack(this);
110		109
111	if (!m_cues)	110	cue->setId(cueData->id());
112	m_cues = TextTrackCueList::create();	111	cue->setBaseFontSizeRelativeToVideoHeight(cueData->baseFontSize());
113	m_cues->add(cue);	112	cue->setFontSizeMultiplier(cueData->relativeFontSize());
114		113	cue->setFontName(cueData->fontName());
115	if (client())	114
116	client()->textTrackAddCues(this, m_cues.get());	115	ExceptionCode ec;
		116	if (cueData->position() > 0)
		117	cue->setPosition(lround(cueData->position()), ec);
		118	if (cueData->line() > 0)
		119	cue->setLine(lround(cueData->line()), ec);
		120	if (cueData->size() > 0)
		121	cue->setSize(lround(cueData->size()), ec);
		122	if (cueData->align() == GenericCueData::Start)
		123	cue->setAlign(ASCIILiteral("start"), ec);
		124	else if (cueData->align() == GenericCueData::Middle)
		125	cue->setAlign(ASCIILiteral("middle"), ec);
		126	else if (cueData->align() == GenericCueData::End)
		127	cue->setAlign(ASCIILiteral("end"), ec);
		128	cue->setSnapToLines(false);
		129
		130	if (hasCue(cue.get())) {
		131	LOG(Media, "InbandTextTrack::addGenericCue ignoring already added cue: start=%.2f, end=%.2f, content=\"%s\"\n",
		132	cueData->startTime(), cueData->endTime(), cueData->content().utf8().data());
		133	return;
		134	}
		135
		136	addCue(cue);
117	}	137	}
118		138
119	bool InbandTextTrack::hasCue(InbandTextTrackPrivate*, double startTime, double endTime, const String& id, const String& content, const String& settings)	139	void InbandTextTrack::addWebVTTCue(InbandTextTrackPrivate* trackPrivate, double start, double end, const String& id, const String& content, const String& settings)
120	{	140	{
		141	UNUSED_PARAM(trackPrivate);
		142	ASSERT(trackPrivate == m_private);
121		143
122	if (startTime < 0 \|\| endTime < 0)	144	RefPtr<TextTrackCue> cue = TextTrackCue::create(scriptExecutionContext(), start, end, content);
123	return false;	145	cue->setId(id);
124		146	cue->setCueSettings(settings);
125	if (!cues()->length())
126	return false;
127
128	size_t searchStart = 0;
129	size_t searchEnd = cues()->length();
130
131	while (1) {
132	ASSERT(searchStart <= cues()->length());
133	ASSERT(searchEnd <= cues()->length());
134
135	TextTrackCue* cue;
136
137	// Cues in the TextTrackCueList are maintained in start time order.
138	if (searchStart == searchEnd) {
139	if (!searchStart)
140	return false;
141
142	cue = cues()->item(searchStart - 1);
143	if (!cue)
144	return false;
145	if (cue->startTime() != startTime)
146	return false;
147	if (cue->endTime() != endTime)
148	return false;
149	if (cue->text() != content)
150	return false;
151	if (cue->cueSettings() != settings)
152	return false;
153	if (cue->id() != id)
154	return false;
155
156	return true;
157	}
158
159	size_t index = (searchStart + searchEnd) / 2;
160	cue = cues()->item(index);
161	if (startTime < cue->startTime() \|\| (startTime == cue->startTime() && endTime > cue->endTime()))
162	searchEnd = index;
163	else
164	searchStart = index + 1;
165	}
166		147
167	ASSERT_NOT_REACHED();	148	if (hasCue(cue.get()))
168	return false;	149	return;
		150
		151	addCue(cue);
169	}	152	}
170		153
171	} // namespace WebCore	154	} // namespace WebCore

Lines 1-6 Source/WebCore/html/track/TextTrack.cpp_sec1
- Source/WebCore/html/track/TextTrack.cpp -1 / +59 lines
1	/*	1	/*
2	* Copyright (C) 2011 Google Inc. All rights reserved.	2	* Copyright (C) 2011 Google Inc. All rights reserved.
3	* Copyright (C) 2011 Apple Inc. All rights reserved.	3	* Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are	6	* modification, are permitted provided that the following conditions are
Lines 339-344 int TextTrack::trackIndexRelativeToRende Source/WebCore/html/track/TextTrack.cpp_sec2
339	return m_renderedTrackIndex;	339	return m_renderedTrackIndex;
340	}	340	}
341		341
		342	bool TextTrack::hasCue(TextTrackCue* cue)
		343	{
		344	if (cue->startTime() < 0 \|\| cue->endTime() < 0)
		345	return false;
		346
		347	if (!m_cues \|\| !m_cues->length())
		348	return false;
		349
		350	size_t searchStart = 0;
		351	size_t searchEnd = m_cues->length();
		352
		353	while (1) {
		354	ASSERT(searchStart <= m_cues->length());
		355	ASSERT(searchEnd <= m_cues->length());
		356
		357	TextTrackCue* existingCue;
		358
		359	// Cues in the TextTrackCueList are maintained in start time order.
		360	if (searchStart == searchEnd) {
		361	if (!searchStart)
		362	return false;
		363
		364	// If there is more than one cue with the same start time, back up to first one so we
		365	// consider all of them.
		366	while (searchStart >= 2 && cue->startTime() == m_cues->item(searchStart - 2)->startTime())
		367	--searchStart;
		368
		369	bool firstCompare = true;
		370	while (1) {
		371	if (!firstCompare)
		372	++searchStart;
		373	firstCompare = false;
		374	if (searchStart > m_cues->length())
		375	return false;
		376
		377	existingCue = m_cues->item(searchStart - 1);
		378	if (!existingCue \|\| cue->startTime() > existingCue->startTime())
		379	return false;
		380
		381	if (existingCue != cue)
		382	continue;
		383
		384	return true;
		385	}
		386	}
		387
		388	size_t index = (searchStart + searchEnd) / 2;
		389	existingCue = m_cues->item(index);
		390	if (cue->startTime() < existingCue->startTime() \|\| (cue->startTime() == existingCue->startTime() && cue->endTime() > existingCue->endTime()))
		391	searchEnd = index;
		392	else
		393	searchStart = index + 1;
		394	}
		395
		396	ASSERT_NOT_REACHED();
		397	return false;
		398	}
		399
342	} // namespace WebCore	400	} // namespace WebCore
343		401
344	#endif	402	#endif

Lines 1-6 Source/WebCore/html/track/TextTrack.h_sec1
- Source/WebCore/html/track/TextTrack.h -1 / +2 lines
1	/*	1	/*
2	* Copyright (C) 2011 Google Inc. All rights reserved.	2	* Copyright (C) 2011 Google Inc. All rights reserved.
3	* Copyright (C) 2011, 2012 Apple Inc. All rights reserved.	3	* Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions	6	* modification, are permitted provided that the following conditions
Lines 99-104 public: Source/WebCore/html/track/TextTrack.h_sec2
99		99
100	void addCue(PassRefPtr<TextTrackCue>);	100	void addCue(PassRefPtr<TextTrackCue>);
101	void removeCue(TextTrackCue*, ExceptionCode&);	101	void removeCue(TextTrackCue*, ExceptionCode&);
		102	bool hasCue(TextTrackCue*);
102		103
103	void cueWillChange(TextTrackCue*);	104	void cueWillChange(TextTrackCue*);
104	void cueDidChange(TextTrackCue*);	105	void cueDidChange(TextTrackCue*);

Lines 1-6 Source/WebCore/html/track/TextTrackCue.cpp_sec1
- Source/WebCore/html/track/TextTrackCue.cpp -13 / +51 lines
1	/*	1	/*
2	* Copyright (C) 2011 Google Inc. All rights reserved.	2	* Copyright (C) 2011 Google Inc. All rights reserved.
3	* Copyright (C) 2011, 2012 Apple Inc. All rights reserved.	3	* Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are	6	* modification, are permitted provided that the following conditions are
Lines 107-113 TextTrackCue* TextTrackCueBox::getCue() Source/WebCore/html/track/TextTrackCue.cpp_sec2
107	return m_cue;	107	return m_cue;
108	}	108	}
109		109
110	void TextTrackCueBox::applyCSSProperties()	110	void TextTrackCueBox::applyCSSProperties(const IntSize&)
111	{	111	{
112	// FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916	112	// FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
113		113
Lines 210-216 TextTrackCue::TextTrackCue(ScriptExecuti Source/WebCore/html/track/TextTrackCue.cpp_sec3
210	, m_snapToLines(true)	210	, m_snapToLines(true)
211	, m_allDocumentNodes(HTMLDivElement::create(static_cast<Document*>(context)))	211	, m_allDocumentNodes(HTMLDivElement::create(static_cast<Document*>(context)))
212	, m_displayTreeShouldChange(true)	212	, m_displayTreeShouldChange(true)
213	, m_displayTree(TextTrackCueBox::create(static_cast<Document*>(m_scriptExecutionContext), this))
214	{	213	{
215	ASSERT(m_scriptExecutionContext->isDocument());	214	ASSERT(m_scriptExecutionContext->isDocument());
216		215
Lines 228-233 TextTrackCue::~TextTrackCue() Source/WebCore/html/track/TextTrackCue.cpp_sec4
228	{	227	{
229	}	228	}
230		229
		230	PassRefPtr<TextTrackCueBox> TextTrackCue::createDisplayTree()
		231	{
		232	return TextTrackCueBox::create(ownerDocument(), this);
		233	}
		234
		235	PassRefPtr<TextTrackCueBox> TextTrackCue::displayTreeInternal()
		236	{
		237	if (!m_displayTree)
		238	m_displayTree = createDisplayTree();
		239	return m_displayTree;
		240	}
		241
231	void TextTrackCue::cueWillChange()	242	void TextTrackCue::cueWillChange()
232	{	243	{
233	if (m_track)	244	if (m_track)
Lines 438-444 void TextTrackCue::setAlign(const String Source/WebCore/html/track/TextTrackCue.cpp_sec5
438	// match for the new value, if any. If none of the values match, then the user	449	// match for the new value, if any. If none of the values match, then the user
439	// agent must instead throw a SyntaxError exception.	450	// agent must instead throw a SyntaxError exception.
440		451
441	Alignment alignment = m_cueAlignment;	452	CueAlignment alignment = m_cueAlignment;
442	if (value == startKeyword())	453	if (value == startKeyword())
443	alignment = Start;	454	alignment = Start;
444	else if (value == middleKeyword())	455	else if (value == middleKeyword())
Lines 545-552 void TextTrackCue::setIsActive(bool acti Source/WebCore/html/track/TextTrackCue.cpp_sec6
545		556
546	if (!active) {	557	if (!active) {
547	// Remove the display tree as soon as the cue becomes inactive.	558	// Remove the display tree as soon as the cue becomes inactive.
548	ExceptionCode ec;	559	displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
549	m_displayTree->remove(ec);
550	}	560	}
551	}	561	}
552		562
Lines 722-731 void TextTrackCue::updateDisplayTree(flo Source/WebCore/html/track/TextTrackCue.cpp_sec7
722	m_allDocumentNodes->appendChild(referenceTree);	732	m_allDocumentNodes->appendChild(referenceTree);
723	}	733	}
724		734
725	PassRefPtr<TextTrackCueBox> TextTrackCue::getDisplayTree()	735	PassRefPtr<TextTrackCueBox> TextTrackCue::getDisplayTree(const IntSize& videoSize)
726	{	736	{
		737	RefPtr<TextTrackCueBox> displayTree = displayTreeInternal();
727	if (!m_displayTreeShouldChange \|\| !track()->isRendered())	738	if (!m_displayTreeShouldChange \|\| !track()->isRendered())
728	return m_displayTree;	739	return displayTree;
729		740
730	// 10.1 - 10.10	741	// 10.1 - 10.10
731	calculateDisplayParameters();	742	calculateDisplayParameters();
Lines 733-739 PassRefPtr<TextTrackCueBox> TextTrackCue Source/WebCore/html/track/TextTrackCue.cpp_sec8
733	// 10.11. Apply the terms of the CSS specifications to nodes within the	744	// 10.11. Apply the terms of the CSS specifications to nodes within the
734	// following constraints, thus obtaining a set of CSS boxes positioned	745	// following constraints, thus obtaining a set of CSS boxes positioned
735	// relative to an initial containing block:	746	// relative to an initial containing block:
736	m_displayTree->removeChildren();	747	displayTree->removeChildren();
737		748
738	// The document tree is the tree of WebVTT Node Objects rooted at nodes.	749	// The document tree is the tree of WebVTT Node Objects rooted at nodes.
739		750
Lines 743-749 PassRefPtr<TextTrackCueBox> TextTrackCue Source/WebCore/html/track/TextTrackCue.cpp_sec9
743		754
744	// Note: This is contained by default in m_allDocumentNodes.	755	// Note: This is contained by default in m_allDocumentNodes.
745	m_allDocumentNodes->setPseudo(allNodesShadowPseudoId());	756	m_allDocumentNodes->setPseudo(allNodesShadowPseudoId());
746	m_displayTree->appendChild(m_allDocumentNodes, ASSERT_NO_EXCEPTION, true);	757	displayTree->appendChild(m_allDocumentNodes, ASSERT_NO_EXCEPTION, true);
747		758
748	// FIXME(BUG 79916): Runs of children of WebVTT Ruby Objects that are not	759	// FIXME(BUG 79916): Runs of children of WebVTT Ruby Objects that are not
749	// WebVTT Ruby Text Objects must be wrapped in anonymous boxes whose	760	// WebVTT Ruby Text Objects must be wrapped in anonymous boxes whose
Lines 756-773 PassRefPtr<TextTrackCueBox> TextTrackCue Source/WebCore/html/track/TextTrackCue.cpp_sec10
756	// is no line breaking opportunity. (Thus, normally text wraps as needed,	767	// is no line breaking opportunity. (Thus, normally text wraps as needed,
757	// but if there is a particularly long word, it does not overflow as it	768	// but if there is a particularly long word, it does not overflow as it
758	// normally would in CSS, it is instead forcibly wrapped at the box's edge.)	769	// normally would in CSS, it is instead forcibly wrapped at the box's edge.)
759	m_displayTree->applyCSSProperties();	770	displayTree->applyCSSProperties(videoSize);
760		771
761	m_displayTreeShouldChange = false;	772	m_displayTreeShouldChange = false;
762		773
763	// 10.15. Let cue's text track cue display state have the CSS boxes in	774	// 10.15. Let cue's text track cue display state have the CSS boxes in
764	// boxes.	775	// boxes.
765	return m_displayTree;	776	return displayTree;
766	}	777	}
767		778
768	void TextTrackCue::removeDisplayTree()	779	void TextTrackCue::removeDisplayTree()
769	{	780	{
770	m_displayTree->remove(ASSERT_NO_EXCEPTION);	781	displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
771	}	782	}
772		783
773	std::pair<double, double> TextTrackCue::getPositionCoordinates() const	784	std::pair<double, double> TextTrackCue::getPositionCoordinates() const
Lines 1066-1071 EventTargetData* TextTrackCue::ensureEve Source/WebCore/html/track/TextTrackCue.cpp_sec11
1066	return &m_eventTargetData;	1077	return &m_eventTargetData;
1067	}	1078	}
1068		1079
		1080	bool TextTrackCue::operator==(const TextTrackCue& cue) const
		1081	{
		1082	if (cueType() != cue.cueType())
		1083	return false;
		1084
		1085	if (m_endTime != cue.endTime())
		1086	return false;
		1087	if (m_startTime != cue.startTime())
		1088	return false;
		1089	if (m_content != cue.text())
		1090	return false;
		1091	if (m_settings != cue.cueSettings())
		1092	return false;
		1093	if (m_id != cue.id())
		1094	return false;
		1095	if (m_textPosition != cue.position())
		1096	return false;
		1097	if (m_linePosition != cue.line())
		1098	return false;
		1099	if (m_cueSize != cue.size())
		1100	return false;
		1101	if (align() != cue.align())
		1102	return false;
		1103
		1104	return true;
		1105	}
		1106
1069	} // namespace WebCore	1107	} // namespace WebCore
1070		1108
1071	#endif	1109	#endif

Line 0 Source/WebCore/html/track/TextTrackCueGeneric.cpp_sec1
- Source/WebCore/html/track/TextTrackCueGeneric.cpp +150 lines
		1	/*
		2	* Copyright (C) 2013 Apple Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	* 1. Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* 2. Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	*
		13	* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
		14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
		17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
		18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
		19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
		20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
		21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#include "config.h"
		27
		28	#if ENABLE(VIDEO_TRACK)
		29
		30	#include "TextTrackCueGeneric.h"
		31
		32	#include "CSSPropertyNames.h"
		33	#include "CSSValueKeywords.h"
		34	#include "HTMLDivElement.h"
		35	#include "HTMLNames.h"
		36	#include "InbandTextTrackPrivateClient.h"
		37	#include "RenderObject.h"
		38	#include "RenderTextTrackCue.h"
		39	#include "ScriptExecutionContext.h"
		40	#include "TextTrackCue.h"
		41
		42	namespace WebCore {
		43
		44	class TextTrackCueGenericBoxElement : public TextTrackCueBox {
		45	public:
		46	static PassRefPtr<TextTrackCueGenericBoxElement> create(Document* document, TextTrackCueGeneric* cue)
		47	{
		48	return adoptRef(new TextTrackCueGenericBoxElement(document, cue));
		49	}
		50
		51	virtual void applyCSSProperties(const IntSize&) OVERRIDE;
		52
		53	private:
		54	TextTrackCueGenericBoxElement(Document, TextTrackCue);
		55	};
		56
		57	TextTrackCueGenericBoxElement::TextTrackCueGenericBoxElement(Document* document, TextTrackCue* cue)
		58	: TextTrackCueBox(document, cue)
		59	{
		60	}
		61
		62	void TextTrackCueGenericBoxElement::applyCSSProperties(const IntSize& videoSize)
		63	{
		64	setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
65	setInlineStyleProperty(CSSPropertyUnicodeBidi, CSSValueWebkitPlaintext);
66
67	TextTrackCueGeneric* cue = static_cast<TextTrackCueGeneric*>(getCue());
68
69	if (cue->useDefaultPosition()) {
70	setInlineStyleProperty(CSSPropertyBottom, "0");
71	setInlineStyleProperty(CSSPropertyMarginBottom, 1.0, CSSPrimitiveValue::CSS_PERCENTAGE);
72	} else {
73	setInlineStyleProperty(CSSPropertyLeft, static_cast<float>(cue->position()), CSSPrimitiveValue::CSS_PERCENTAGE);
74	setInlineStyleProperty(CSSPropertyTop, static_cast<float>(cue->line()), CSSPrimitiveValue::CSS_PERCENTAGE);
75	}
76
77	float size = static_cast<float>(cue->getCSSSize());
78	if (cue->getWritingDirection() == TextTrackCue::Horizontal) {
79	setInlineStyleProperty(CSSPropertyDirection, CSSValueLtr);
80	setInlineStyleProperty(CSSPropertyWidth, size, CSSPrimitiveValue::CSS_PERCENTAGE);
81	setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto);
82	} else {
83	setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto);
84	setInlineStyleProperty(CSSPropertyHeight, size, CSSPrimitiveValue::CSS_PERCENTAGE);
85	}
86
87	if (cue->baseFontSizeRelativeToVideoHeight()) {
88	double fontSize = videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100;
89	if (cue->fontSizeMultiplier())
90	fontSize *= cue->fontSizeMultiplier() / 100;
91	setInlineStyleProperty(CSSPropertyFontSize, String::number(fontSize) + "px");
92	}
93
94	if (cue->getAlignment() == TextTrackCue::Start)
95	setInlineStyleProperty(CSSPropertyTextAlign, CSSValueStart);
96	else if (cue->getAlignment() == TextTrackCue::End)
97	setInlineStyleProperty(CSSPropertyTextAlign, CSSValueEnd);
98	else
99	setInlineStyleProperty(CSSPropertyTextAlign, CSSValueCenter);
100
101	setInlineStyleProperty(CSSPropertyWebkitWritingMode, cue->getCSSWritingMode(), false);
102	setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePreWrap);
103	setInlineStyleProperty(CSSPropertyWordBreak, CSSValueNormal);
104	}
105
106	TextTrackCueGeneric::TextTrackCueGeneric(ScriptExecutionContext* context, double start, double end, const String& content)
107	: TextTrackCue(context, start, end, content)
108	, m_baseFontSizeRelativeToVideoHeight(0)
109	, m_fontSizeMultiplier(0)
110	, m_defaultPosition(true)
111	{
112	}
113
114	PassRefPtr<TextTrackCueBox> TextTrackCueGeneric::createDisplayTree()
115	{
116	return TextTrackCueGenericBoxElement::create(ownerDocument(), this);
117	}
118
119	void TextTrackCueGeneric::setLine(int line, ExceptionCode& ec)
120	{
121	m_defaultPosition = false;
122	TextTrackCue::setLine(line, ec);
123	}
124
125	void TextTrackCueGeneric::setPosition(int position, ExceptionCode& ec)
126	{
127	m_defaultPosition = false;
128	TextTrackCue::setPosition(position, ec);
129	}
130
131	bool TextTrackCueGeneric::operator==(const TextTrackCue& cue) const
132	{
133	if (cue.cueType() != TextTrackCue::Generic)
134	return false;
135
136	const TextTrackCueGeneric* other = static_cast<const TextTrackCueGeneric*>(&cue);
137
138	if (m_baseFontSizeRelativeToVideoHeight != other->baseFontSizeRelativeToVideoHeight())
139	return false;
140	if (m_fontSizeMultiplier != other->fontSizeMultiplier())
141	return false;
142	if (m_fontName != other->fontName())
143	return false;
144
145	return TextTrackCue::operator==(cue);
146	}
147
148	} // namespace WebCore
149
150	#endif

Lines 1-5 Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h_sec1
- Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h -3 / +74 lines
1	/*	1	/*
2	* Copyright (C) 2012 Apple Inc. All rights reserved.	2	* Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 26-31 Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h_sec2
26	#ifndef InbandTextTrackPrivateClient_h	26	#ifndef InbandTextTrackPrivateClient_h
27	#define InbandTextTrackPrivateClient_h	27	#define InbandTextTrackPrivateClient_h
28		28
		29	#include <wtf/Noncopyable.h>
29	#include <wtf/text/WTFString.h>	30	#include <wtf/text/WTFString.h>
30		31
31	#if ENABLE(VIDEO_TRACK)	32	#if ENABLE(VIDEO_TRACK)
Lines 34-45 namespace WebCore { Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h_sec3
34		35
35	class InbandTextTrackPrivate;	36	class InbandTextTrackPrivate;
36		37
		38	class GenericCueData {
		39	WTF_MAKE_NONCOPYABLE(GenericCueData); WTF_MAKE_FAST_ALLOCATED;
		40	public:
		41	GenericCueData()
		42	: m_startTime(0)
		43	, m_endTime(0)
		44	, m_line(-1)
		45	, m_position(-1)
		46	, m_size(-1)
		47	, m_align(None)
		48	, m_baseFontSize(0)
		49	, m_relativeFontSize(0)
		50	{
		51	}
		52	virtual ~GenericCueData() { }
		53
		54	double startTime() const { return m_startTime; }
		55	void setStartTime(double startTime) { m_startTime = startTime; }
		56
		57	double endTime() const { return m_endTime; }
		58	void setEndTime(double endTime) { m_endTime = endTime; }
		59
		60	String id() const { return m_id; }
		61	void setId(String id) { m_id = id; }
		62
		63	String content() const { return m_content; }
		64	void setContent(String content) { m_content = content; }
		65
		66	double line() const { return m_line; }
		67	void setLine(double line) { m_line = line; }
		68
		69	double position() const { return m_position; }
		70	void setPosition(double position) { m_position = position; }
		71
		72	double size() const { return m_size; }
		73	void setSize(double size) { m_size = size; }
		74
		75	enum Alignment {
		76	None,
		77	Start,
		78	Middle,
		79	End
		80	};
		81	Alignment align() const { return m_align; }
		82	void setAlign(Alignment align) { m_align = align; }
		83
		84	String fontName() const { return m_fontName; }
		85	void setFontName(String fontName) { m_fontName = fontName; }
		86
		87	double baseFontSize() const { return m_baseFontSize; }
		88	void setBaseFontSize(double baseFontSize) { m_baseFontSize = baseFontSize; }
		89
		90	double relativeFontSize() const { return m_relativeFontSize; }
		91	void setRelativeFontSize(double relativeFontSize) { m_relativeFontSize = relativeFontSize; }
		92
		93	private:
		94
		95	double m_startTime;
		96	double m_endTime;
		97	String m_id;
		98	String m_content;
		99	double m_line;
		100	double m_position;
		101	double m_size;
102	Alignment m_align;
103	String m_fontName;
104	double m_baseFontSize;
105	double m_relativeFontSize;
106	};
107
37	class InbandTextTrackPrivateClient {	108	class InbandTextTrackPrivateClient {
38	public:	109	public:
39	virtual ~InbandTextTrackPrivateClient() { }	110	virtual ~InbandTextTrackPrivateClient() { }
40		111
41	virtual void addCue(InbandTextTrackPrivate, double /start/, double /end/, const String& /id/, const String& /content/, const String& /settings*/) = 0;	112	virtual void addWebVTTCue(InbandTextTrackPrivate, double /start/, double /end/, const String& /id/, const String& /content/, const String& /settings*/) = 0;
42	virtual bool hasCue(InbandTextTrackPrivate, double /start/, double /end/, const String& /id/, const String& /content/, const String& /settings*/) = 0;	113	virtual void addGenericCue(InbandTextTrackPrivate, GenericCueData) = 0;
43	};	114	};
44		115
45	} // namespace WebCore	116	} // namespace WebCore

Lines 582-587 void MediaPlayerPrivateAVFoundation::see Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp_sec1
- Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp -9 / +8 lines
582	LOG(Media, "MediaPlayerPrivateAVFoundation::seekCompleted(%p) - finished = %d", this, finished);	582	LOG(Media, "MediaPlayerPrivateAVFoundation::seekCompleted(%p) - finished = %d", this, finished);
583	UNUSED_PARAM(finished);	583	UNUSED_PARAM(finished);
584		584
		585	#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
		586	if (currentTrack())
		587	currentTrack()->resetCueValues();
		588	#endif
		589
585	m_seekTo = MediaPlayer::invalidTime();	590	m_seekTo = MediaPlayer::invalidTime();
586	updateStates();	591	updateStates();
587	m_player->timeChanged();	592	m_player->timeChanged();
Lines 811-829 void MediaPlayerPrivateAVFoundation::dis Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp_sec2
811	}	816	}
812		817
813	#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)	818	#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
814	void MediaPlayerPrivateAVFoundation::flushCurrentCue(InbandTextTrackPrivateAVF* track)	819	void MediaPlayerPrivateAVFoundation::addGenericCue(InbandTextTrackPrivateAVF* track, GenericCueData* cueData)
815	{	820	{
816	if (!track->client())	821	if (!track->client())
817	return;	822	return;
818		823
819	// AVFoundation returns a cue every time the data is buffered, only add it once.	824	LOG(Media, "MediaPlayerPrivateAVFoundation::addGenericCue(%p) - adding cue for time %.2f", this, cueData->startTime());
820	if (track->client()->hasCue(track, track->start(), track->end(), track->id(), track->content(), track->settings())) {	825	track->client()->addGenericCue(track, cueData);
821	LOG(Media, "MediaPlayerPrivateAVFoundation::flushCurrentCue(%p) - already have cue for time %.2f", this, track->start());
822	return;
823	}
824
825	LOG(Media, "MediaPlayerPrivateAVFoundation::flushCurrentCue(%p) - adding cue for time %.2f", this, track->start());
826	track->client()->addCue(track, track->start(), track->end(), track->id(), track->content(), track->settings());
827	}	826	}
828		827
829	void MediaPlayerPrivateAVFoundation::configureInbandTracks()	828	void MediaPlayerPrivateAVFoundation::configureInbandTracks()

Lines 106-111 SOFT_LINK_CLASS(AVFoundation, AVMediaSel Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec1
- Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm -10 / +12 lines
106	SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *)	106	SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *)
107	SOFT_LINK_POINTER(AVFoundation, AVMediaTypeSubtitle, NSString *)	107	SOFT_LINK_POINTER(AVFoundation, AVMediaTypeSubtitle, NSString *)
108	SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *)	108	SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *)
		109	SOFT_LINK_POINTER(AVFoundation, AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, NSString *)
109		110
110	#define AVPlayerItemLegibleOutput getAVPlayerItemLegibleOutputClass()	111	#define AVPlayerItemLegibleOutput getAVPlayerItemLegibleOutputClass()
111	#define AVMediaSelectionGroup getAVMediaSelectionGroupClass()	112	#define AVMediaSelectionGroup getAVMediaSelectionGroupClass()
Lines 113-118 SOFT_LINK_POINTER(AVFoundation, AVMediaC Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec2
113	#define AVMediaCharacteristicLegible getAVMediaCharacteristicLegible()	114	#define AVMediaCharacteristicLegible getAVMediaCharacteristicLegible()
114	#define AVMediaTypeSubtitle getAVMediaTypeSubtitle()	115	#define AVMediaTypeSubtitle getAVMediaTypeSubtitle()
115	#define AVMediaCharacteristicContainsOnlyForcedSubtitles getAVMediaCharacteristicContainsOnlyForcedSubtitles()	116	#define AVMediaCharacteristicContainsOnlyForcedSubtitles getAVMediaCharacteristicContainsOnlyForcedSubtitles()
		117	#define AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly getAVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly()
116	#endif	118	#endif
117		119
118	#define kCMTimeZero getkCMTimeZero()	120	#define kCMTimeZero getkCMTimeZero()
Lines 391-397 void MediaPlayerPrivateAVFoundationObjC: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec3
391	#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)	393	#if HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
392	[m_avPlayer.get() setAppliesMediaSelectionCriteriaAutomatically:YES];	394	[m_avPlayer.get() setAppliesMediaSelectionCriteriaAutomatically:YES];
393	#endif	395	#endif
394
395		396
396	if (m_avPlayerItem)	397	if (m_avPlayerItem)
397	[m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];	398	[m_avPlayer.get() replaceCurrentItemWithPlayerItem:m_avPlayerItem.get()];
Lines 410-416 void MediaPlayerPrivateAVFoundationObjC: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec4
410		411
411	// Create the player item so we can load media data.	412	// Create the player item so we can load media data.
412	m_avPlayerItem.adoptNS([[AVPlayerItem alloc] initWithAsset:m_avAsset.get()]);	413	m_avPlayerItem.adoptNS([[AVPlayerItem alloc] initWithAsset:m_avAsset.get()]);
413		414
414	[[NSNotificationCenter defaultCenter] addObserver:m_objcObserver.get() selector:@selector(didEnd:) name:AVPlayerItemDidPlayToEndTimeNotification object:m_avPlayerItem.get()];	415	[[NSNotificationCenter defaultCenter] addObserver:m_objcObserver.get() selector:@selector(didEnd:) name:AVPlayerItemDidPlayToEndTimeNotification object:m_avPlayerItem.get()];
415		416
416	for (NSString *keyName in itemKVOProperties())	417	for (NSString *keyName in itemKVOProperties())
Lines 897-902 void MediaPlayerPrivateAVFoundationObjC: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec5
897		898
898	[m_legibleOutput.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];	899	[m_legibleOutput.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
899	[m_legibleOutput.get() setAdvanceIntervalForDelegateInvocation:NSTimeIntervalSince1970];	900	[m_legibleOutput.get() setAdvanceIntervalForDelegateInvocation:NSTimeIntervalSince1970];
		901	[m_legibleOutput.get() setTextStylingResolution:AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly];
900	[m_avPlayerItem.get() addOutput:m_legibleOutput.get()];	902	[m_avPlayerItem.get() addOutput:m_legibleOutput.get()];
901	}	903	}
902	#endif	904	#endif
Lines 1212-1218 void MediaPlayerPrivateAVFoundationObjC: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec6
1212	LOG(Media, "MediaPlayerPrivateAVFoundationObjC::processTextTracks(%p) - nil mediaSelectionGroup", this);	1214	LOG(Media, "MediaPlayerPrivateAVFoundationObjC::processTextTracks(%p) - nil mediaSelectionGroup", this);
1213	return;	1215	return;
1214	}	1216	}
1215		1217
1216	Vector<RefPtr<InbandTextTrackPrivateAVF> > removedTextTracks = m_textTracks;	1218	Vector<RefPtr<InbandTextTrackPrivateAVF> > removedTextTracks = m_textTracks;
1217	NSArray *legibleOptions = [AVMediaSelectionGroup playableMediaSelectionOptionsFromArray:[legibleGroup options]];	1219	NSArray *legibleOptions = [AVMediaSelectionGroup playableMediaSelectionOptionsFromArray:[legibleGroup options]];
1218	for (AVMediaSelectionOptionType *option in legibleOptions) {	1220	for (AVMediaSelectionOptionType *option in legibleOptions) {
Lines 1228-1240 void MediaPlayerPrivateAVFoundationObjC: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec7
1228	if (!newTrack)	1230	if (!newTrack)
1229	continue;	1231	continue;
1230		1232
1231	if ([[option mediaType] isEqualToString:AVMediaTypeSubtitle]) {	1233	if ([[option mediaType] isEqualToString:AVMediaTypeSubtitle] && [option hasMediaCharacteristic:AVMediaCharacteristicContainsOnlyForcedSubtitles])
1232	if (![option hasMediaCharacteristic:AVMediaCharacteristicContainsOnlyForcedSubtitles]) {	1234	continue;
1233	AVMediaSelectionOptionType *forcedOnlyOption = [option associatedMediaSelectionOptionInMediaSelectionGroup:legibleGroup];
1234	if (forcedOnlyOption)
1235	continue;
1236	}
1237	}
1238		1235
1239	m_textTracks.append(InbandTextTrackPrivateAVFObjC::create(this, option));	1236	m_textTracks.append(InbandTextTrackPrivateAVFObjC::create(this, option));
1240	}	1237	}
Lines 1275-1280 void MediaPlayerPrivateAVFoundationObjC: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec8
1275	void MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(InbandTextTrackPrivateAVF *track)	1272	void MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(InbandTextTrackPrivateAVF *track)
1276	{	1273	{
1277	InbandTextTrackPrivateAVFObjC* trackPrivate = static_cast<InbandTextTrackPrivateAVFObjC*>(track);	1274	InbandTextTrackPrivateAVFObjC* trackPrivate = static_cast<InbandTextTrackPrivateAVFObjC*>(track);
		1275	if (m_currentTrack == trackPrivate)
		1276	return;
		1277
1278	AVMediaSelectionOptionType *mediaSelectionOption = trackPrivate ? trackPrivate->mediaSelectionOption() : 0;	1278	AVMediaSelectionOptionType *mediaSelectionOption = trackPrivate ? trackPrivate->mediaSelectionOption() : 0;
1279		1279
1280	LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(%p) - selecting media option %p", this, mediaSelectionOption);	1280	LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(%p) - selecting media option %p", this, mediaSelectionOption);
Lines 1424-1429 - (void)legibleOutput:(id)output didOutp Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm_sec9
1424	return;	1424	return;
1425		1425
1426	dispatch_async(dispatch_get_main_queue(), ^{	1426	dispatch_async(dispatch_get_main_queue(), ^{
		1427	if (!m_callback)
		1428	return;
1427	m_callback->processCue(strings, CMTimeGetSeconds(itemTime));	1429	m_callback->processCue(strings, CMTimeGetSeconds(itemTime));
1428	});	1430	});
1429	}	1431	}