⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 243482 in webkit


Ignore:
Timestamp:
Mar 25, 2019, 8:30:12 PM (7 years ago)
Author:
Fujii Hironori
Message:

Unreviewed, rolling out r243450.

AppleWin and WinCairo port builds get broken.

Reverted changeset:

"Add test for fix of #196095"
​https://bugs.webkit.org/show_bug.cgi?id=196097
​https://trac.webkit.org/changeset/243450

Location:
trunk
Files:
3 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r243478 r243482  
     12019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Unreviewed, rolling out r243450.
     4
     5        AppleWin and WinCairo port builds get broken.
     6
     7        Reverted changeset:
     8
     9        "Add test for fix of #196095"
     10        https://bugs.webkit.org/show_bug.cgi?id=196097
     11        https://trac.webkit.org/changeset/243450
     12
    1132019-03-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
    214

  • trunk/Source/WebCore/CMakeLists.txt

    r243457 r243482  
    13811381        html/track/TextTrack.idl
    13821382        html/track/TextTrackCue.idl
    1383         html/track/TextTrackCueGeneric.idl
    13841383        html/track/TextTrackCueList.idl
    13851384        html/track/TextTrackList.idl

  • trunk/Source/WebCore/ChangeLog

    r243478 r243482  
     12019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Unreviewed, rolling out r243450.
     4
     5        AppleWin and WinCairo port builds get broken.
     6
     7        Reverted changeset:
     8
     9        "Add test for fix of #196095"
     10        https://bugs.webkit.org/show_bug.cgi?id=196097
     11        https://trac.webkit.org/changeset/243450
     12
    1132019-03-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
    214

  • trunk/Source/WebCore/DerivedSources-input.xcfilelist

    r243457 r243482  
    865865$(PROJECT_DIR)/html/track/TextTrack.idl
    866866$(PROJECT_DIR)/html/track/TextTrackCue.idl
    867 $(PROJECT_DIR)/html/track/TextTrackCueGeneric.idl
    868867$(PROJECT_DIR)/html/track/TextTrackCueList.idl
    869868$(PROJECT_DIR)/html/track/TextTrackList.idl

  • trunk/Source/WebCore/DerivedSources-output.xcfilelist

    r243457 r243482  
    17401740$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCue.cpp
    17411741$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCue.h
    1742 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueGeneric.cpp
    1743 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueGeneric.h
    17441742$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueList.cpp
    17451743$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueList.h

  • trunk/Source/WebCore/DerivedSources.make

    r243457 r243482  
    844844    $(WebCore)/html/track/TextTrack.idl \
    845845    $(WebCore)/html/track/TextTrackCue.idl \
    846     $(WebCore)/html/track/TextTrackCueGeneric.idl \
    847846    $(WebCore)/html/track/TextTrackCueList.idl \
    848847    $(WebCore)/html/track/TextTrackList.idl \

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r243478 r243482  
    42244224                CDF756A3215C29E900EFCB50 /* JSMediaKeyEncryptionScheme.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF756A1215C29E900EFCB50 /* JSMediaKeyEncryptionScheme.h */; };
    42254225                CDFC360618CA61C20026E56F /* RemoteCommandListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CDFC360418CA61C20026E56F /* RemoteCommandListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
    4226                 CDFD78C32242FCC600D7208A /* JSTextTrackCueGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDFD78BB2242C4FF00D7208A /* JSTextTrackCueGeneric.cpp */; };
    42274226                CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    42284227                CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (); }; };
    … …  
    1393113930                CDFC360318CA61C20026E56F /* RemoteCommandListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteCommandListener.cpp; sourceTree = "<group>"; };
    1393213931                CDFC360418CA61C20026E56F /* RemoteCommandListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCommandListener.h; sourceTree = "<group>"; };
    13933                 CDFD78BA2242C4FE00D7208A /* JSTextTrackCueGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrackCueGeneric.h; sourceTree = "<group>"; };
    13934                 CDFD78BB2242C4FF00D7208A /* JSTextTrackCueGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCueGeneric.cpp; sourceTree = "<group>"; };
    13935                 CDFD78C22242FC4900D7208A /* TextTrackCueGeneric.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackCueGeneric.idl; sourceTree = "<group>"; };
    1393613932                CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarkerController.cpp; sourceTree = "<group>"; };
    1393713933                CE057FA41220731100A476D5 /* DocumentMarkerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarkerController.h; sourceTree = "<group>"; };
    … …  
    2311323109                                070756D714239B4B00414161 /* JSTextTrackCue.cpp */,
    2311423110                                070756D814239B4B00414161 /* JSTextTrackCue.h */,
    23115                                 CDFD78BB2242C4FF00D7208A /* JSTextTrackCueGeneric.cpp */,
    23116                                 CDFD78BA2242C4FE00D7208A /* JSTextTrackCueGeneric.h */,
    2311723111                                070756D914239B4C00414161 /* JSTextTrackCueList.cpp */,
    2311823112                                070756DA14239B4E00414161 /* JSTextTrackCueList.h */,
    … …  
    2405624050                                071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */,
    2405724051                                071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */,
    24058                                 CDFD78C22242FC4900D7208A /* TextTrackCueGeneric.idl */,
    2405924052                                9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */,
    2406024053                                9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */,
    … …  
    3307133064                                CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
    3307233065                                538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */,
    33073                                 CDFD78C32242FCC600D7208A /* JSTextTrackCueGeneric.cpp in Sources */,
    3307433066                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
    3307533067                                CDA98E0B1603CD6000FEA3B1 /* LegacyCDM.cpp in Sources */,

  • trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp

    r243450 r243482  
    5555class Event;
    5656
    57 RefPtr<HTMLMediaElement> parentMediaElement(const Node* node)
     57RefPtr<HTMLMediaElement> parentMediaElement(Node* node)
    5858{
    5959    if (!node)
    … …  
    6161    RefPtr<Node> mediaNode = node->shadowHost();
    6262    if (!mediaNode)
    63         mediaNode = const_cast<Node*>(node);
     63        mediaNode = node;
    6464    if (!is<HTMLMediaElement>(*mediaNode))
    6565        return nullptr;

  • trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h

    r243450 r243482  
    7373};
    7474
    75 RefPtr<HTMLMediaElement> parentMediaElement(const Node*);
     75RefPtr<HTMLMediaElement> parentMediaElement(Node*);
    7676inline RefPtr<HTMLMediaElement> parentMediaElement(const RenderObject& renderer) { return parentMediaElement(renderer.node()); }
    7777

  • trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

    r243450 r243482  
    11731173
    11741174    activeCues.removeAllMatching([] (CueInterval& cueInterval) {
    1175         if (!is<VTTCue>(cueInterval.data()))
     1175        if (!cueInterval.data() || !cueInterval.data()->isRenderable())
    11761176            return true;
    11771177
    1178         Ref<VTTCue> cue = downcast<VTTCue>(*cueInterval.data());
     1178        RefPtr<VTTCue> cue = toVTTCue(cueInterval.data());
    11791179
    11801180        return !cue->isRenderable()
    … …  
    11981198            continue;
    11991199
    1200         RefPtr<VTTCue> cue = downcast<VTTCue>(activeCues[i].data());
    1201 
    1202         DEBUG_LOG(LOGIDENTIFIER, "adding and positioning cue ", i, ": \"", cue->text(), "\", start=", cue->startTime(), ", end=", cue->endTime(), ", line=", cue->line());
     1200        RefPtr<VTTCue> cue = toVTTCue(activeCues[i].data());
     1201        ASSERT(cue);
     1202        if (!cue)
     1203            continue;
     1204
     1205        LOG(Media, "MediaControlTextTrackContainerElement::updateDisplay(%p) - adding and positioning cue #%zu: \"%s\", start=%.2f, end=%.2f, line=%.2f", this, i, cue->text().utf8().data(), cue->startTime(), cue->endTime(), cue->line());
    12031206        Ref<VTTCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size(), m_fontSize);
    12041207        RefPtr<VTTRegion> region = cue->track()->regions()->getRegionById(cue->regionId());
    … …  
    14521455}
    14531456
    1454 #if !RELEASE_LOG_DISABLED
    1455 const Logger& MediaControlTextTrackContainerElement::logger() const
    1456 {
    1457     return document().logger();
    1458 }
    1459 
    1460 const void* MediaControlTextTrackContainerElement::logIdentifier() const
    1461 {
    1462     if (auto mediaElement = parentMediaElement(this))
    1463         return mediaElement->logIdentifier();
    1464     return nullptr;
    1465 }
    1466 
    1467 WTFLogChannel& MediaControlTextTrackContainerElement::logChannel() const
    1468 {
    1469     return LogMedia;
    1470 }
    1471 #endif // !RELEASE_LOG_DISABLED
    1472 
    14731457#endif // ENABLE(VIDEO_TRACK)
    14741458

  • trunk/Source/WebCore/html/shadow/MediaControlElements.h

    r243450 r243482  
    3434#include "MediaControlElementTypes.h"
    3535#include "TextTrackRepresentation.h"
    36 #include <wtf/LoggerHelper.h>
    3736
    3837namespace WebCore {
    … …  
    468467#if ENABLE(VIDEO_TRACK)
    469468
    470 class MediaControlTextTrackContainerElement final
    471     : public MediaControlDivElement
    472     , public TextTrackRepresentationClient
    473 #if !RELEASE_LOG_DISABLED
    474     , private LoggerHelper
    475 #endif
    476 {
     469class MediaControlTextTrackContainerElement final : public MediaControlDivElement, public TextTrackRepresentationClient {
    477470    WTF_MAKE_ISO_ALLOCATED(MediaControlTextTrackContainerElement);
    478471public:
    … …  
    488481    void updateActiveCuesFontSize();
    489482    void updateTextStrokeStyle();
    490 
    491 #if !RELEASE_LOG_DISABLED
    492     const Logger& logger() const final;
    493     const void* logIdentifier() const final;
    494     WTFLogChannel& logChannel() const final;
    495     const char* logClassName() const final { return "MediaControlTextTrackContainerElement"; }
    496 #endif
    497 
     483   
    498484    explicit MediaControlTextTrackContainerElement(Document&);
    499485

  • trunk/Source/WebCore/html/track/DataCue.h

    r243450 r243482  
    3434#include <JavaScriptCore/JSCJSValue.h>
    3535#include <wtf/MediaTime.h>
    36 #include <wtf/TypeCasts.h>
    3736
    3837namespace WebCore {
    … …  
    125124}
    126125
    127 SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::DataCue)
    128 static bool isType(const WebCore::TextTrackCue& cue) { return cue.cueType() == WebCore::TextTrackCue::Data; }
    129 SPECIALIZE_TYPE_TRAITS_END()
    130 
    131126#endif

  • trunk/Source/WebCore/html/track/TextTrackCueGeneric.h

    r243450 r243482  
    7171
    7272private:
    73     WEBCORE_TESTSUPPORT_EXPORT TextTrackCueGeneric(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const String&);
     73    TextTrackCueGeneric(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const String&);
    7474   
    7575    bool isOrderedBefore(const TextTrackCue*) const final;
    … …  
    109109
    110110}
    111 
    112 SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::TextTrackCueGeneric)
    113 static bool isType(const WebCore::TextTrackCue& cue) { return cue.cueType() == WebCore::TextTrackCue::Generic; }
    114 SPECIALIZE_TYPE_TRAITS_END()
    115 
    116111#endif

  • trunk/Source/WebCore/html/track/VTTCue.h

    r243450 r243482  
    3636#include "HTMLElement.h"
    3737#include "TextTrackCue.h"
    38 #include <wtf/TypeCasts.h>
    3938
    4039namespace WebCore {
    … …  
    262261} // namespace WTF
    263262
    264 SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::VTTCue)
    265     static bool isType(const WebCore::TextTrackCue& cue) { return cue.isRenderable(); }
    266 SPECIALIZE_TYPE_TRAITS_END()
    267 
    268263#endif

  • trunk/Source/WebCore/testing/Internals.cpp

    r243451 r243482  
    214214#include "CaptionUserPreferences.h"
    215215#include "PageGroup.h"
    216 #include "TextTrackCueGeneric.h"
    217216#endif
    218217
    … …  
    35803579}
    35813580
    3582 RefPtr<TextTrackCueGeneric> Internals::createGenericCue(double startTime, double endTime, String text)
    3583 {
    3584     Document* document = contextDocument();
    3585     if (!document || !document->page())
    3586         return nullptr;
    3587 #if ENABLE(VIDEO_TRACK)
    3588     return TextTrackCueGeneric::create(*document, MediaTime::createWithDouble(startTime), MediaTime::createWithDouble(endTime), text);
    3589 #else
    3590     UNUSED_PARAM(startTime);
    3591     UNUSED_PARAM(endTime);
    3592     UNUSED_PARAM(text);
    3593     return nullptr;
    3594 #endif
    3595 }
    3596 
    35973581#if ENABLE(VIDEO)
    35983582

  • trunk/Source/WebCore/testing/Internals.h

    r243450 r243482  
    9292class StringCallback;
    9393class StyleSheet;
    94 class TextTrackCueGeneric;
    9594class TimeRanges;
    9695class TypeConversions;
    … …  
    545544    ExceptionOr<void> setPrimaryAudioTrackLanguageOverride(const String&);
    546545    ExceptionOr<void> setCaptionDisplayMode(const String&);
    547     RefPtr<TextTrackCueGeneric> createGenericCue(double startTime, double endTime, String text);
    548546
    549547#if ENABLE(VIDEO)

  • trunk/Source/WebCore/testing/Internals.idl

    r243450 r243482  
    541541    [Conditional=VIDEO_TRACK, MayThrowException] void setPrimaryAudioTrackLanguageOverride(DOMString language);
    542542    [Conditional=VIDEO_TRACK, MayThrowException] void setCaptionDisplayMode(DOMString mode);
    543     [Conditional=VIDEO_TRACK] TextTrackCueGeneric createGenericCue(double startTime, double endTime, DOMString text);
    544543
    545544    [Conditional=VIDEO] TimeRanges createTimeRanges(Float32Array startTimes, Float32Array

  • trunk/Tools/ChangeLog

    r243470 r243482  
     12019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Unreviewed, rolling out r243450.
     4
     5        AppleWin and WinCairo port builds get broken.
     6
     7        Reverted changeset:
     8
     9        "Add test for fix of #196095"
     10        https://bugs.webkit.org/show_bug.cgi?id=196097
     11        https://trac.webkit.org/changeset/243450
     12
    1132019-03-25  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r243450 r243482  
    939939
    940940    [preferences setMediaPlaybackAllowsInline:YES];
    941     [preferences setMediaPlaybackRequiresUserGesture:NO];
    942941    [preferences setVideoPlaybackRequiresUserGesture:NO];
    943942    [preferences setAudioPlaybackRequiresUserGesture:NO];

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r243450 r243482  
    855855    WKPreferencesSetWebSQLDisabled(preferences, false);
    856856
    857     WKPreferencesSetMediaPlaybackRequiresUserGesture(preferences, false);
    858     WKPreferencesSetVideoPlaybackRequiresUserGesture(preferences, false);
    859     WKPreferencesSetAudioPlaybackRequiresUserGesture(preferences, false);
    860 
    861857    platformResetPreferencesToConsistentValues();
    862858}
Note: See TracChangeset for help on using the changeset viewer.