Unreviewed, rolling out r243450.
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Mar 2019 03:30:12 +0000 (03:30 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Mar 2019 03:30:12 +0000 (03:30 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243482 268f45cc-cd09-0410-ab3c-d52691b4dbfc

23 files changed:
LayoutTests/ChangeLog
LayoutTests/media/track/track-in-band-metadata-display-order-expected.txt [deleted file]
LayoutTests/media/track/track-in-band-metadata-display-order.html [deleted file]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources-input.xcfilelist
Source/WebCore/DerivedSources-output.xcfilelist
Source/WebCore/DerivedSources.make
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/shadow/MediaControlElementTypes.cpp
Source/WebCore/html/shadow/MediaControlElementTypes.h
Source/WebCore/html/shadow/MediaControlElements.cpp
Source/WebCore/html/shadow/MediaControlElements.h
Source/WebCore/html/track/DataCue.h
Source/WebCore/html/track/TextTrackCueGeneric.h
Source/WebCore/html/track/TextTrackCueGeneric.idl [deleted file]
Source/WebCore/html/track/VTTCue.h
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/WebKitTestRunner/TestController.cpp

index 54352b0..409a73e 100644 (file)
@@ -1,3 +1,15 @@
+2019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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
+
 2019-03-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         Remove the SVG tear off objects for SVGAngle, SVGAnimatedAngle and SVGAnimatedEnumeration
diff --git a/LayoutTests/media/track/track-in-band-metadata-display-order-expected.txt b/LayoutTests/media/track/track-in-band-metadata-display-order-expected.txt
deleted file mode 100644 (file)
index 60f75d2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-RUN(video.src = findMediaFile("video", "../content/test"))
-EVENT(canplaythrough)
-RUN(captionTrack = video.addTextTrack("captions"))
-RUN(captionTrack.mode = "showing")
-RUN(metadataTrack = video.addTextTrack("metadata"))
-RUN(metadataTrack.mode = "hidden")
-RUN(cue = internals.createGenericCue(2, 4, "I am earlier"))
-RUN(cue.line = 40)
-RUN(captionTrack.addCue(cue))
-RUN(cue = internals.createGenericCue(2.5, 4.5, "I am later"))
-RUN(cue.line = 80)
-RUN(captionTrack.addCue(cue))
-RUN(metadataTrack.addCue(new DataCue(2.25, video.duration, "first data cue")))
-RUN(metadataTrack.addCue(new DataCue(2.25, video.duration, "second data cue")))
-RUN(video.currentTime = 3)
-EVENT(seeked)
-EXPECTED (textTrackDisplayElement(video, "display", 0).textContent == 'I am later') OK
-EXPECTED (textTrackDisplayElement(video, "display", 1).textContent == 'I am earlier') OK
-END OF TEST
-
diff --git a/LayoutTests/media/track/track-in-band-metadata-display-order.html b/LayoutTests/media/track/track-in-band-metadata-display-order.html
deleted file mode 100644 (file)
index e31e8a8..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>track-in-band-metadata-display-order</title>
-    <script src="../video-test.js"></script>
-    <script src="../media-file.js"></script>
-    <script src="../media-controls.js"></script>
-    <script>
-        window.addEventListener('load', async event => {
-            window.video = document.querySelector('video');
-            run('video.src = findMediaFile("video", "../content/test")');
-
-            await waitFor(video, 'canplaythrough');
-
-            run('captionTrack = video.addTextTrack("captions")');
-            run('captionTrack.mode = "showing"');
-            run('metadataTrack = video.addTextTrack("metadata")');
-            run('metadataTrack.mode = "hidden"');
-            run('cue = internals.createGenericCue(2, 4, "I am earlier")')
-            run('cue.line = 40');
-            run('captionTrack.addCue(cue)');
-            run('cue = internals.createGenericCue(2.5, 4.5, "I am later")');
-            run('cue.line = 80');
-            run('captionTrack.addCue(cue)');
-            run('metadataTrack.addCue(new DataCue(2.25, video.duration, "first data cue"))')
-            run('metadataTrack.addCue(new DataCue(2.25, video.duration, "second data cue"))')
-
-            run('video.currentTime = 3');
-            await waitFor(video, 'seeked');
-
-            testExpected('textTrackDisplayElement(video, "display", 0).textContent', 'I am later');
-            testExpected('textTrackDisplayElement(video, "display", 1).textContent', 'I am earlier');
-
-            endTest();
-        });
-    </script>
-</head>
-<body>
-    <video controls></video>
-</body>
-</html>
\ No newline at end of file
index 9be26e3..c4b8b76 100644 (file)
@@ -1380,7 +1380,6 @@ if (ENABLE_VIDEO_TRACK)
         html/track/DataCue.idl
         html/track/TextTrack.idl
         html/track/TextTrackCue.idl
-        html/track/TextTrackCueGeneric.idl
         html/track/TextTrackCueList.idl
         html/track/TextTrackList.idl
         html/track/TrackEvent.idl
index 211f51f..896d4b9 100644 (file)
@@ -1,3 +1,15 @@
+2019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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
+
 2019-03-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         Remove the SVG tear off objects for SVGAngle, SVGAnimatedAngle and SVGAnimatedEnumeration
index 6628e46..c6b5bc1 100644 (file)
@@ -864,7 +864,6 @@ $(PROJECT_DIR)/html/track/AudioTrackList.idl
 $(PROJECT_DIR)/html/track/DataCue.idl
 $(PROJECT_DIR)/html/track/TextTrack.idl
 $(PROJECT_DIR)/html/track/TextTrackCue.idl
-$(PROJECT_DIR)/html/track/TextTrackCueGeneric.idl
 $(PROJECT_DIR)/html/track/TextTrackCueList.idl
 $(PROJECT_DIR)/html/track/TextTrackList.idl
 $(PROJECT_DIR)/html/track/TrackEvent.idl
index cf758f9..0b96b17 100644 (file)
@@ -1739,8 +1739,6 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrack.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrack.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCue.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCue.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueGeneric.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueGeneric.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueList.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackCueList.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSTextTrackList.cpp
index a89ab71..83d1b03 100644 (file)
@@ -843,7 +843,6 @@ JS_BINDING_IDLS = \
     $(WebCore)/html/track/DataCue.idl \
     $(WebCore)/html/track/TextTrack.idl \
     $(WebCore)/html/track/TextTrackCue.idl \
-    $(WebCore)/html/track/TextTrackCueGeneric.idl \
     $(WebCore)/html/track/TextTrackCueList.idl \
     $(WebCore)/html/track/TextTrackList.idl \
     $(WebCore)/html/track/TrackEvent.idl \
index 5ba5bff..630af3a 100644 (file)
                CDF7483F18FEBCEC0006ECC0 /* GridPositionsResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF7483D18FEBCEC0006ECC0 /* GridPositionsResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDF756A3215C29E900EFCB50 /* JSMediaKeyEncryptionScheme.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF756A1215C29E900EFCB50 /* JSMediaKeyEncryptionScheme.h */; };
                CDFC360618CA61C20026E56F /* RemoteCommandListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CDFC360418CA61C20026E56F /* RemoteCommandListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CDFD78C32242FCC600D7208A /* JSTextTrackCueGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDFD78BB2242C4FF00D7208A /* JSTextTrackCueGeneric.cpp */; };
                CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (); }; };
                CE1866451F72E5B400A0CAB6 /* MarkedText.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1866431F72E5B400A0CAB6 /* MarkedText.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDFC360218CA61630026E56F /* RemoteCommandListenerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteCommandListenerIOS.mm; sourceTree = "<group>"; };
                CDFC360318CA61C20026E56F /* RemoteCommandListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteCommandListener.cpp; sourceTree = "<group>"; };
                CDFC360418CA61C20026E56F /* RemoteCommandListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCommandListener.h; sourceTree = "<group>"; };
-               CDFD78BA2242C4FE00D7208A /* JSTextTrackCueGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrackCueGeneric.h; sourceTree = "<group>"; };
-               CDFD78BB2242C4FF00D7208A /* JSTextTrackCueGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCueGeneric.cpp; sourceTree = "<group>"; };
-               CDFD78C22242FC4900D7208A /* TextTrackCueGeneric.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackCueGeneric.idl; sourceTree = "<group>"; };
                CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarkerController.cpp; sourceTree = "<group>"; };
                CE057FA41220731100A476D5 /* DocumentMarkerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarkerController.h; sourceTree = "<group>"; };
                CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AlternativeTextController.cpp; sourceTree = "<group>"; };
                                0707568F1422668C00414161 /* JSTextTrack.h */,
                                070756D714239B4B00414161 /* JSTextTrackCue.cpp */,
                                070756D814239B4B00414161 /* JSTextTrackCue.h */,
-                               CDFD78BB2242C4FF00D7208A /* JSTextTrackCueGeneric.cpp */,
-                               CDFD78BA2242C4FE00D7208A /* JSTextTrackCueGeneric.h */,
                                070756D914239B4C00414161 /* JSTextTrackCueList.cpp */,
                                070756DA14239B4E00414161 /* JSTextTrackCueList.h */,
                                07B5A2D91464320A00A81ECE /* JSTextTrackList.cpp */,
                                9759E93A14EF1CF80026A2DD /* TextTrackCue.idl */,
                                071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */,
                                071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */,
-                               CDFD78C22242FC4900D7208A /* TextTrackCueGeneric.idl */,
                                9759E93B14EF1CF80026A2DD /* TextTrackCueList.cpp */,
                                9759E93C14EF1CF80026A2DD /* TextTrackCueList.h */,
                                9759E93D14EF1CF80026A2DD /* TextTrackCueList.idl */,
                                BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
                                CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
                                538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */,
-                               CDFD78C32242FCC600D7208A /* JSTextTrackCueGeneric.cpp in Sources */,
                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
                                CDA98E0B1603CD6000FEA3B1 /* LegacyCDM.cpp in Sources */,
                                CDE8B5EC1A69777300B4B66A /* LegacyCDMPrivateClearKey.cpp in Sources */,
index d2891a7..3fa7e74 100644 (file)
@@ -54,13 +54,13 @@ using namespace HTMLNames;
 
 class Event;
 
-RefPtr<HTMLMediaElement> parentMediaElement(const Node* node)
+RefPtr<HTMLMediaElement> parentMediaElement(Node* node)
 {
     if (!node)
         return nullptr;
     RefPtr<Node> mediaNode = node->shadowHost();
     if (!mediaNode)
-        mediaNode = const_cast<Node*>(node);
+        mediaNode = node;
     if (!is<HTMLMediaElement>(*mediaNode))
         return nullptr;
     return downcast<HTMLMediaElement>(mediaNode.get());
index 931fc0e..56d67fa 100644 (file)
@@ -72,7 +72,7 @@ enum MediaControlElementType {
     MediaClosedCaptionsTrackList,
 };
 
-RefPtr<HTMLMediaElement> parentMediaElement(const Node*);
+RefPtr<HTMLMediaElement> parentMediaElement(Node*);
 inline RefPtr<HTMLMediaElement> parentMediaElement(const RenderObject& renderer) { return parentMediaElement(renderer.node()); }
 
 MediaControlElementType mediaControlElementType(Node*);
index 7c08c43..a7f9d9e 100644 (file)
@@ -1172,10 +1172,10 @@ void MediaControlTextTrackContainerElement::updateDisplay()
         removeChildren();
 
     activeCues.removeAllMatching([] (CueInterval& cueInterval) {
-        if (!is<VTTCue>(cueInterval.data()))
+        if (!cueInterval.data() || !cueInterval.data()->isRenderable())
             return true;
 
-        Ref<VTTCue> cue = downcast<VTTCue>(*cueInterval.data());
+        RefPtr<VTTCue> cue = toVTTCue(cueInterval.data());
 
         return !cue->isRenderable()
             || !cue->track()
@@ -1197,9 +1197,12 @@ void MediaControlTextTrackContainerElement::updateDisplay()
         if (!mediaController()->closedCaptionsVisible())
             continue;
 
-        RefPtr<VTTCue> cue = downcast<VTTCue>(activeCues[i].data());
+        RefPtr<VTTCue> cue = toVTTCue(activeCues[i].data());
+        ASSERT(cue);
+        if (!cue)
+            continue;
 
-        DEBUG_LOG(LOGIDENTIFIER, "adding and positioning cue ", i, ": \"", cue->text(), "\", start=", cue->startTime(), ", end=", cue->endTime(), ", line=", cue->line());
+        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());
         Ref<VTTCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size(), m_fontSize);
         RefPtr<VTTRegion> region = cue->track()->regions()->getRegionById(cue->regionId());
         if (!region) {
@@ -1451,25 +1454,6 @@ void MediaControlTextTrackContainerElement::textTrackRepresentationBoundsChanged
     updateSizes();
 }
 
-#if !RELEASE_LOG_DISABLED
-const Logger& MediaControlTextTrackContainerElement::logger() const
-{
-    return document().logger();
-}
-
-const void* MediaControlTextTrackContainerElement::logIdentifier() const
-{
-    if (auto mediaElement = parentMediaElement(this))
-        return mediaElement->logIdentifier();
-    return nullptr;
-}
-
-WTFLogChannel& MediaControlTextTrackContainerElement::logChannel() const
-{
-    return LogMedia;
-}
-#endif // !RELEASE_LOG_DISABLED
-
 #endif // ENABLE(VIDEO_TRACK)
 
 // ----------------------------
index 7c2cc65..cf0560e 100644 (file)
@@ -33,7 +33,6 @@
 
 #include "MediaControlElementTypes.h"
 #include "TextTrackRepresentation.h"
-#include <wtf/LoggerHelper.h>
 
 namespace WebCore {
 
@@ -467,13 +466,7 @@ private:
 
 #if ENABLE(VIDEO_TRACK)
 
-class MediaControlTextTrackContainerElement final
-    : public MediaControlDivElement
-    , public TextTrackRepresentationClient
-#if !RELEASE_LOG_DISABLED
-    , private LoggerHelper
-#endif
-{
+class MediaControlTextTrackContainerElement final : public MediaControlDivElement, public TextTrackRepresentationClient {
     WTF_MAKE_ISO_ALLOCATED(MediaControlTextTrackContainerElement);
 public:
     static Ref<MediaControlTextTrackContainerElement> create(Document&);
@@ -487,14 +480,7 @@ private:
     void updateTimerFired();
     void updateActiveCuesFontSize();
     void updateTextStrokeStyle();
-
-#if !RELEASE_LOG_DISABLED
-    const Logger& logger() const final;
-    const void* logIdentifier() const final;
-    WTFLogChannel& logChannel() const final;
-    const char* logClassName() const final { return "MediaControlTextTrackContainerElement"; }
-#endif
-
+    
     explicit MediaControlTextTrackContainerElement(Document&);
 
     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
index dc12f1d..7d63b70 100644 (file)
@@ -33,7 +33,6 @@
 #include <JavaScriptCore/ArrayBuffer.h>
 #include <JavaScriptCore/JSCJSValue.h>
 #include <wtf/MediaTime.h>
-#include <wtf/TypeCasts.h>
 
 namespace WebCore {
 
@@ -124,8 +123,4 @@ struct LogArgument<WebCore::DataCue> {
 
 }
 
-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::DataCue)
-static bool isType(const WebCore::TextTrackCue& cue) { return cue.cueType() == WebCore::TextTrackCue::Data; }
-SPECIALIZE_TYPE_TRAITS_END()
-
 #endif
index a6653e9..a2ba1a1 100644 (file)
@@ -70,7 +70,7 @@ public:
     String toJSONString() const;
 
 private:
-    WEBCORE_TESTSUPPORT_EXPORT TextTrackCueGeneric(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const String&);
+    TextTrackCueGeneric(ScriptExecutionContext&, const MediaTime& start, const MediaTime& end, const String&);
     
     bool isOrderedBefore(const TextTrackCue*) const final;
     bool isPositionedAbove(const TextTrackCue*) const final;
@@ -108,9 +108,4 @@ struct LogArgument<WebCore::TextTrackCueGeneric> {
 };
 
 }
-
-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::TextTrackCueGeneric)
-static bool isType(const WebCore::TextTrackCue& cue) { return cue.cueType() == WebCore::TextTrackCue::Generic; }
-SPECIALIZE_TYPE_TRAITS_END()
-
 #endif
diff --git a/Source/WebCore/html/track/TextTrackCueGeneric.idl b/Source/WebCore/html/track/TextTrackCueGeneric.idl
deleted file mode 100644 (file)
index a1c8afc..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2019 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
- */
-
-[
-    Conditional=VIDEO_TRACK,
-    JSGenerateToJSObject,
-    JSGenerateToNativeObject,
-    NoInterfaceObject,
-    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT,
-] interface TextTrackCueGeneric : VTTCue {
-};
index 713ac2d..a5c230f 100644 (file)
@@ -35,7 +35,6 @@
 
 #include "HTMLElement.h"
 #include "TextTrackCue.h"
-#include <wtf/TypeCasts.h>
 
 namespace WebCore {
 
@@ -261,8 +260,4 @@ struct LogArgument<WebCore::VTTCue> {
 
 } // namespace WTF
 
-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::VTTCue)
-    static bool isType(const WebCore::TextTrackCue& cue) { return cue.isRenderable(); }
-SPECIALIZE_TYPE_TRAITS_END()
-
 #endif
index d1379ab..8369a1c 100644 (file)
 #if ENABLE(VIDEO_TRACK)
 #include "CaptionUserPreferences.h"
 #include "PageGroup.h"
-#include "TextTrackCueGeneric.h"
 #endif
 
 #if ENABLE(VIDEO)
@@ -3579,21 +3578,6 @@ ExceptionOr<void> Internals::setCaptionDisplayMode(const String& mode)
     return { };
 }
 
-RefPtr<TextTrackCueGeneric> Internals::createGenericCue(double startTime, double endTime, String text)
-{
-    Document* document = contextDocument();
-    if (!document || !document->page())
-        return nullptr;
-#if ENABLE(VIDEO_TRACK)
-    return TextTrackCueGeneric::create(*document, MediaTime::createWithDouble(startTime), MediaTime::createWithDouble(endTime), text);
-#else
-    UNUSED_PARAM(startTime);
-    UNUSED_PARAM(endTime);
-    UNUSED_PARAM(text);
-    return nullptr;
-#endif
-}
-
 #if ENABLE(VIDEO)
 
 Ref<TimeRanges> Internals::createTimeRanges(Float32Array& startTimes, Float32Array& endTimes)
index ea888cb..5212839 100644 (file)
@@ -91,7 +91,6 @@ class SerializedScriptValue;
 class SourceBuffer;
 class StringCallback;
 class StyleSheet;
-class TextTrackCueGeneric;
 class TimeRanges;
 class TypeConversions;
 class VoidCallback;
@@ -544,7 +543,6 @@ public:
     ExceptionOr<void> setCaptionsStyleSheetOverride(const String&);
     ExceptionOr<void> setPrimaryAudioTrackLanguageOverride(const String&);
     ExceptionOr<void> setCaptionDisplayMode(const String&);
-    RefPtr<TextTrackCueGeneric> createGenericCue(double startTime, double endTime, String text);
 
 #if ENABLE(VIDEO)
     Ref<TimeRanges> createTimeRanges(Float32Array& startTimes, Float32Array& endTimes);
index eed71e6..a2f8c6a 100644 (file)
@@ -540,7 +540,6 @@ enum CompositingPolicy {
     [Conditional=VIDEO_TRACK, MayThrowException] void setCaptionsStyleSheetOverride(DOMString override);
     [Conditional=VIDEO_TRACK, MayThrowException] void setPrimaryAudioTrackLanguageOverride(DOMString language);
     [Conditional=VIDEO_TRACK, MayThrowException] void setCaptionDisplayMode(DOMString mode);
-    [Conditional=VIDEO_TRACK] TextTrackCueGeneric createGenericCue(double startTime, double endTime, DOMString text);
 
     [Conditional=VIDEO] TimeRanges createTimeRanges(Float32Array startTimes, Float32Array
      endTimes);
index 52263e2..c965ee8 100644 (file)
@@ -1,3 +1,15 @@
+2019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        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
+
 2019-03-25  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r243465.
index 612ce4f..5c6e168 100644 (file)
@@ -938,7 +938,6 @@ static void resetWebPreferencesToConsistentValues()
         [preferences setUserStyleSheetEnabled:NO];
 
     [preferences setMediaPlaybackAllowsInline:YES];
-    [preferences setMediaPlaybackRequiresUserGesture:NO];
     [preferences setVideoPlaybackRequiresUserGesture:NO];
     [preferences setAudioPlaybackRequiresUserGesture:NO];
     [preferences setMediaDataLoadsAutomatically:YES];
index dc58aee..e8908fb 100644 (file)
@@ -854,10 +854,6 @@ void TestController::resetPreferencesToConsistentValues(const TestOptions& optio
 
     WKPreferencesSetWebSQLDisabled(preferences, false);
 
-    WKPreferencesSetMediaPlaybackRequiresUserGesture(preferences, false);
-    WKPreferencesSetVideoPlaybackRequiresUserGesture(preferences, false);
-    WKPreferencesSetAudioPlaybackRequiresUserGesture(preferences, false);
-
     platformResetPreferencesToConsistentValues();
 }