<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170333] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170333">170333</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-06-23 16:45:01 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] remove InbandTextTrackPrivateAVFIOS
https://bugs.webkit.org/show_bug.cgi?id=134220
Reviewed by Benjamin Poulain.
* WebCore.xcodeproj/project.pbxproj: Remove references to InbandTextTrackPrivateAVFIOS.
* platform/graphics/ios/InbandTextTrackPrivateAVFIOS.h: Removed.
* platform/graphics/ios/InbandTextTrackPrivateAVFIOS.mm: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosInbandTextTrackPrivateAVFIOSh">trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosInbandTextTrackPrivateAVFIOSmm">trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170332 => 170333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-23 23:17:00 UTC (rev 170332)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 23:45:01 UTC (rev 170333)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-23 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] remove InbandTextTrackPrivateAVFIOS
+ https://bugs.webkit.org/show_bug.cgi?id=134220
+
+ Reviewed by Benjamin Poulain.
+
+ * WebCore.xcodeproj/project.pbxproj: Remove references to InbandTextTrackPrivateAVFIOS.
+
+ * platform/graphics/ios/InbandTextTrackPrivateAVFIOS.h: Removed.
+ * platform/graphics/ios/InbandTextTrackPrivateAVFIOS.mm: Removed.
+
</ins><span class="cx"> 2014-06-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r170323.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (170332 => 170333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-23 23:17:00 UTC (rev 170332)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-23 23:45:01 UTC (rev 170333)
</span><span class="lines">@@ -345,8 +345,6 @@
</span><span class="cx"> 07E117071489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */; };
</span><span class="cx"> 07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */; };
</span><span class="cx"> 07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */; };
</span><del>- 07ED35A216D6DCC9002248F3 /* InbandTextTrackPrivateAVFIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07357C7716D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.mm */; };
- 07ED35A316D6DCE2002248F3 /* InbandTextTrackPrivateAVFIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 07357C7616D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.h */; };
</del><span class="cx"> 07F944161864D046005D31CB /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* MediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */; };
</span><span class="cx"> 07FE99DC18807A7D00256648 /* HTMLMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */; };
</span><span class="lines">@@ -7111,8 +7109,6 @@
</span><span class="cx"> 072AE1E3183C0741000A5988 /* QuickTimePluginReplacement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = QuickTimePluginReplacement.idl; path = plugins/QuickTimePluginReplacement.idl; sourceTree = "<group>"; };
</span><span class="cx"> 072AE1E4183C0741000A5988 /* QuickTimePluginReplacement.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = QuickTimePluginReplacement.js; path = plugins/QuickTimePluginReplacement.js; sourceTree = "<group>"; };
</span><span class="cx"> 072CA86016CB4DC3008AE131 /* CaptionUserPreferences.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CaptionUserPreferences.cpp; sourceTree = "<group>"; };
</span><del>- 07357C7616D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandTextTrackPrivateAVFIOS.h; sourceTree = "<group>"; };
- 07357C7716D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InbandTextTrackPrivateAVFIOS.mm; sourceTree = "<group>"; };
</del><span class="cx"> 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 07367DDD172CA67F00D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InbandTextTrackPrivateLegacyAVFObjC.h; path = objc/InbandTextTrackPrivateLegacyAVFObjC.h; sourceTree = "<group>"; };
</span><span class="cx"> 07367DDE172CA67F00D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InbandTextTrackPrivateLegacyAVFObjC.mm; path = objc/InbandTextTrackPrivateLegacyAVFObjC.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -15639,8 +15635,6 @@
</span><span class="cx"> C58361A81744523F00173511 /* FontServicesIOS.mm */,
</span><span class="cx"> 31AB4FFF122878A2001A7DB0 /* GraphicsContext3DIOS.h */,
</span><span class="cx"> FED13D3F0CEA939400D89466 /* IconIOS.mm */,
</span><del>- 07357C7616D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.h */,
- 07357C7716D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.mm */,
</del><span class="cx"> 37E6594F163B10C200EB4574 /* SimpleFontDataIOS.mm */,
</span><span class="cx"> CEEC6034187DD962003E43BB /* TextTrackRepresentationIOS.h */,
</span><span class="cx"> CDCA82941679100F00875714 /* TextTrackRepresentationIOS.mm */,
</span><span class="lines">@@ -24490,7 +24484,6 @@
</span><span class="cx"> 07941792166E855F009416C2 /* InbandTextTrack.h in Headers */,
</span><span class="cx"> 07941794166EA04E009416C2 /* InbandTextTrackPrivate.h in Headers */,
</span><span class="cx"> 07B442D7166C70B000556CAD /* InbandTextTrackPrivateAVF.h in Headers */,
</span><del>- 07ED35A316D6DCE2002248F3 /* InbandTextTrackPrivateAVFIOS.h in Headers */,
</del><span class="cx"> 07AA6B6C166D2C1300D45671 /* InbandTextTrackPrivateAVFObjC.h in Headers */,
</span><span class="cx"> 07CE77D516712A6A00C55A47 /* InbandTextTrackPrivateClient.h in Headers */,
</span><span class="cx"> 07367DDF172CA67F00D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.h in Headers */,
</span><span class="lines">@@ -27930,7 +27923,6 @@
</span><span class="cx"> BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */,
</span><span class="cx"> 07941791166E855F009416C2 /* InbandTextTrack.cpp in Sources */,
</span><span class="cx"> 07B442D6166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp in Sources */,
</span><del>- 07ED35A216D6DCC9002248F3 /* InbandTextTrackPrivateAVFIOS.mm in Sources */,
</del><span class="cx"> 07AA6B6B166D2C0700D45671 /* InbandTextTrackPrivateAVFObjC.mm in Sources */,
</span><span class="cx"> 07367DE0172CA68200D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.mm in Sources */,
</span><span class="cx"> BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosInbandTextTrackPrivateAVFIOSh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.h (170332 => 170333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.h 2014-06-23 23:17:00 UTC (rev 170332)
+++ trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.h 2014-06-23 23:45:01 UTC (rev 170333)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013, 2014 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. ``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
- * 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 InbandTextTrackPrivateAVFIOS_h
-#define InbandTextTrackPrivateAVFIOS_h
-
-#if ENABLE(VIDEO) && PLATFORM(IOS)
-
-#include "InbandTextTrackPrivateAVF.h"
-#include <wtf/RetainPtr.h>
-
-namespace WebCore {
-
-class InbandTextTrackPrivateAVFIOS : public InbandTextTrackPrivateAVF {
-public:
- static PassRefPtr<InbandTextTrackPrivateAVFIOS> create(AVFInbandTrackParent* parent, int internalID, const String& name, const String& language, const String& type)
- {
- return adoptRef(new InbandTextTrackPrivateAVFIOS(parent, internalID, name, language, type));
- }
-
- ~InbandTextTrackPrivateAVFIOS();
-
- virtual InbandTextTrackPrivate::Kind kind() const override;
- virtual AtomicString label() const override { return m_name; }
- virtual AtomicString language() const override { return m_language; }
- virtual Category textTrackCategory() const override { return InBand; }
- int internalID() const { return m_internalID; }
-
-protected:
- InbandTextTrackPrivateAVFIOS(AVFInbandTrackParent*, int, const String& name, const String& language, const String& type);
-
- String m_name;
- String m_language;
- String m_type;
- int m_internalID;
-};
-}
-
-#endif // ENABLE(VIDEO) && PLATFORM(IOS)
-#endif // InbandTextTrackPrivateAVFIOS_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosInbandTextTrackPrivateAVFIOSmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.mm (170332 => 170333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.mm 2014-06-23 23:17:00 UTC (rev 170332)
+++ trunk/Source/WebCore/platform/graphics/ios/InbandTextTrackPrivateAVFIOS.mm 2014-06-23 23:45:01 UTC (rev 170333)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * 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 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 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.
- */
-
-#import "config.h"
-
-#if ENABLE(VIDEO) && PLATFORM(IOS)
-
-#import "InbandTextTrackPrivateAVFIOS.h"
-
-#import "BlockExceptions.h"
-#import "FloatConversion.h"
-#import "InbandTextTrackPrivate.h"
-#import "InbandTextTrackPrivateAVF.h"
-#import "Logging.h"
-
-using namespace WebCore;
-
-namespace WebCore {
-
-InbandTextTrackPrivateAVFIOS::InbandTextTrackPrivateAVFIOS(AVFInbandTrackParent* parent, int internalID, const String& name, const String& language, const String& type)
- : InbandTextTrackPrivateAVF(parent)
- , m_name(name)
- , m_language(language)
- , m_type(type)
- , m_internalID(internalID)
-{
-}
-
-InbandTextTrackPrivateAVFIOS::~InbandTextTrackPrivateAVFIOS()
-{
-}
-
-InbandTextTrackPrivate::Kind InbandTextTrackPrivateAVFIOS::kind() const
-{
- if ([m_type isEqualToString:@"captions"])
- return Captions;
- if ([m_type isEqualToString:@"subtitles"])
- return Subtitles;
-
- return Captions;
-}
-
-} // namespace WebCore
-
-#endif
</del></span></pre>
</div>
</div>
</body>
</html>