<!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>[165456] 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/165456">165456</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-11 17:19:25 -0700 (Tue, 11 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get the incomplete WebVTT Regions code to build again.
https://bugs.webkit.org/show_bug.cgi?id=130094
Reviewed by Eric Carlson.
The feature is not being turned on here, so there are no new tests.
* DerivedSources.make: Add missing IDL files for Regions.
* WebCore.xcodeproj/project.pbxproj: Add Regions-related files.
* html/track/InbandWebVTTTextTrack.cpp:
(WebCore::InbandWebVTTTextTrack::newRegionsParsed): Add stub implementation.
* html/track/LoadableTextTrack.cpp: Add missing include file.
* html/track/TextTrack.cpp:
(WebCore::TextTrack::TextTrack): Correct ordering of construction
to avoid compiler warning.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandWebVTTTextTrackcpp">trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackcpp">trunk/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackcpp">trunk/Source/WebCore/html/track/TextTrack.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165455 => 165456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-12 00:12:22 UTC (rev 165455)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 00:19:25 UTC (rev 165456)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-11 Brent Fulgham <bfulgham@apple.com>
+
+ Get the incomplete WebVTT Regions code to build again.
+ https://bugs.webkit.org/show_bug.cgi?id=130094
+
+ Reviewed by Eric Carlson.
+
+ The feature is not being turned on here, so there are no new tests.
+
+ * DerivedSources.make: Add missing IDL files for Regions.
+ * WebCore.xcodeproj/project.pbxproj: Add Regions-related files.
+ * html/track/InbandWebVTTTextTrack.cpp:
+ (WebCore::InbandWebVTTTextTrack::newRegionsParsed): Add stub implementation.
+ * html/track/LoadableTextTrack.cpp: Add missing include file.
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::TextTrack): Correct ordering of construction
+ to avoid compiler warning.
+
</ins><span class="cx"> 2014-03-11 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove unused method from BatteryController
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (165455 => 165456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-03-12 00:12:22 UTC (rev 165455)
+++ trunk/Source/WebCore/DerivedSources.make 2014-03-12 00:19:25 UTC (rev 165456)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006, 2007, 2008, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
</span><span class="cx"> # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
</span><span class="cx"> #
</span><span class="lines">@@ -450,6 +450,8 @@
</span><span class="cx"> $(WebCore)/html/track/TextTrackCue.idl \
</span><span class="cx"> $(WebCore)/html/track/TextTrackCueList.idl \
</span><span class="cx"> $(WebCore)/html/track/TextTrackList.idl \
</span><ins>+ $(WebCore)/html/track/TextTrackRegion.idl \
+ $(WebCore)/html/track/TextTrackRegionList.idl \
</ins><span class="cx"> $(WebCore)/html/track/TrackEvent.idl \
</span><span class="cx"> $(WebCore)/html/track/VideoTrack.idl \
</span><span class="cx"> $(WebCore)/html/track/VideoTrackList.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (165455 => 165456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-12 00:12:22 UTC (rev 165455)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-12 00:19:25 UTC (rev 165456)
</span><span class="lines">@@ -2292,6 +2292,14 @@
</span><span class="cx"> 7ACD88D314C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7ACD88D114C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp */; };
</span><span class="cx"> 7ACD88D414C08BD60084EDD2 /* InspectorIndexedDBAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ACD88D214C08BD60084EDD2 /* InspectorIndexedDBAgent.h */; };
</span><span class="cx"> 7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; };
</span><ins>+ 7AF9B20218CFB2DF00C64BEF /* TextTrackRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF9B1FC18CFB2DF00C64BEF /* TextTrackRegion.cpp */; };
+ 7AF9B20318CFB2DF00C64BEF /* TextTrackRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF9B1FD18CFB2DF00C64BEF /* TextTrackRegion.h */; };
+ 7AF9B20518CFB2DF00C64BEF /* TextTrackRegionList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF9B1FF18CFB2DF00C64BEF /* TextTrackRegionList.cpp */; };
+ 7AF9B20618CFB2DF00C64BEF /* TextTrackRegionList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF9B20018CFB2DF00C64BEF /* TextTrackRegionList.h */; };
+ 7AF9B20C18CFB5F400C64BEF /* JSTextTrackRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF9B20818CFB5F200C64BEF /* JSTextTrackRegion.cpp */; };
+ 7AF9B20D18CFB5F400C64BEF /* JSTextTrackRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF9B20918CFB5F200C64BEF /* JSTextTrackRegion.h */; };
+ 7AF9B20E18CFB5F400C64BEF /* JSTextTrackRegionList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF9B20A18CFB5F300C64BEF /* JSTextTrackRegionList.cpp */; };
+ 7AF9B20F18CFB5F400C64BEF /* JSTextTrackRegionList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF9B20B18CFB5F300C64BEF /* JSTextTrackRegionList.h */; };
</ins><span class="cx"> 7BE7427381FA906FBB4F0F2C /* JSSVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */; };
</span><span class="cx"> 7C2BDD3D17C7F98C0038FF15 /* JSDOMGlobalObjectTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */; };
</span><span class="cx"> 7C2BDD3E17C7F98C0038FF15 /* JSDOMGlobalObjectTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */; };
</span><span class="lines">@@ -9268,6 +9276,16 @@
</span><span class="cx"> 7ACD88D114C08BD60084EDD2 /* InspectorIndexedDBAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorIndexedDBAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7ACD88D214C08BD60084EDD2 /* InspectorIndexedDBAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorIndexedDBAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; };
</span><ins>+ 7AF9B1FC18CFB2DF00C64BEF /* TextTrackRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackRegion.cpp; sourceTree = "<group>"; };
+ 7AF9B1FD18CFB2DF00C64BEF /* TextTrackRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRegion.h; sourceTree = "<group>"; };
+ 7AF9B1FE18CFB2DF00C64BEF /* TextTrackRegion.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackRegion.idl; sourceTree = "<group>"; };
+ 7AF9B1FF18CFB2DF00C64BEF /* TextTrackRegionList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackRegionList.cpp; sourceTree = "<group>"; };
+ 7AF9B20018CFB2DF00C64BEF /* TextTrackRegionList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRegionList.h; sourceTree = "<group>"; };
+ 7AF9B20118CFB2DF00C64BEF /* TextTrackRegionList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextTrackRegionList.idl; sourceTree = "<group>"; };
+ 7AF9B20818CFB5F200C64BEF /* JSTextTrackRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackRegion.cpp; sourceTree = "<group>"; };
+ 7AF9B20918CFB5F200C64BEF /* JSTextTrackRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrackRegion.h; sourceTree = "<group>"; };
+ 7AF9B20A18CFB5F300C64BEF /* JSTextTrackRegionList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackRegionList.cpp; sourceTree = "<group>"; };
+ 7AF9B20B18CFB5F300C64BEF /* JSTextTrackRegionList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTextTrackRegionList.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMGlobalObjectTask.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMGlobalObjectTask.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C522D4915B477E8009B7C95 /* InspectorOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorOverlay.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -18339,6 +18357,10 @@
</span><span class="cx"> 070756DA14239B4E00414161 /* JSTextTrackCueList.h */,
</span><span class="cx"> 07B5A2D91464320A00A81ECE /* JSTextTrackList.cpp */,
</span><span class="cx"> 07B5A2DA1464320A00A81ECE /* JSTextTrackList.h */,
</span><ins>+ 7AF9B20818CFB5F200C64BEF /* JSTextTrackRegion.cpp */,
+ 7AF9B20918CFB5F200C64BEF /* JSTextTrackRegion.h */,
+ 7AF9B20A18CFB5F300C64BEF /* JSTextTrackRegionList.cpp */,
+ 7AF9B20B18CFB5F300C64BEF /* JSTextTrackRegionList.h */,
</ins><span class="cx"> E44614120CD6826900FADA75 /* JSTimeRanges.cpp */,
</span><span class="cx"> E44614130CD6826900FADA75 /* JSTimeRanges.h */,
</span><span class="cx"> 07846340145B151A00A58DF1 /* JSTrackEvent.cpp */,
</span><span class="lines">@@ -19209,6 +19231,12 @@
</span><span class="cx"> 076970841463AD8700F502CF /* TextTrackList.cpp */,
</span><span class="cx"> 076970851463AD8700F502CF /* TextTrackList.h */,
</span><span class="cx"> 07B5A3061468537100A81ECE /* TextTrackList.idl */,
</span><ins>+ 7AF9B1FC18CFB2DF00C64BEF /* TextTrackRegion.cpp */,
+ 7AF9B1FD18CFB2DF00C64BEF /* TextTrackRegion.h */,
+ 7AF9B1FE18CFB2DF00C64BEF /* TextTrackRegion.idl */,
+ 7AF9B1FF18CFB2DF00C64BEF /* TextTrackRegionList.cpp */,
+ 7AF9B20018CFB2DF00C64BEF /* TextTrackRegionList.h */,
+ 7AF9B20118CFB2DF00C64BEF /* TextTrackRegionList.idl */,
</ins><span class="cx"> 070334D8145A006F008D8D45 /* TrackBase.cpp */,
</span><span class="cx"> 070334D61459FFD5008D8D45 /* TrackBase.h */,
</span><span class="cx"> 070334D01459FFAC008D8D45 /* TrackEvent.cpp */,
</span><span class="lines">@@ -23061,6 +23089,7 @@
</span><span class="cx"> BC64B4DC0CB4298A005F2B62 /* CSSFontSelector.h in Headers */,
</span><span class="cx"> A80E6CED0A1989CA007FB8C5 /* CSSFontValue.h in Headers */,
</span><span class="cx"> BC02A63C0E09A9CF004B6D2B /* CSSFunctionValue.h in Headers */,
</span><ins>+ 7AF9B20318CFB2DF00C64BEF /* TextTrackRegion.h in Headers */,
</ins><span class="cx"> BC53C6920DA591140021EB5D /* CSSGradientValue.h in Headers */,
</span><span class="cx"> 650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */,
</span><span class="cx"> CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */,
</span><span class="lines">@@ -23488,6 +23517,7 @@
</span><span class="cx"> 85E711D70AC5D5350053270F /* DOMStyleSheetListInternal.h in Headers */,
</span><span class="cx"> BC1A37BD097C715F0019F3D8 /* DOMStylesheets.h in Headers */,
</span><span class="cx"> 85ACA99C0A9B575900671E90 /* DOMText.h in Headers */,
</span><ins>+ 7AF9B20618CFB2DF00C64BEF /* TextTrackRegionList.h in Headers */,
</ins><span class="cx"> DDE63ED50B7D45A800226998 /* DOMTextEvent.h in Headers */,
</span><span class="cx"> 85E711D90AC5D5350053270F /* DOMTextInternal.h in Headers */,
</span><span class="cx"> 188604B40F2E654A000B6443 /* DOMTimer.h in Headers */,
</span><span class="lines">@@ -24550,6 +24580,8 @@
</span><span class="cx"> 070756DE14239B4E00414161 /* JSTextTrackCue.h in Headers */,
</span><span class="cx"> 070756E014239B4E00414161 /* JSTextTrackCueList.h in Headers */,
</span><span class="cx"> 07B5A2DC1464320A00A81ECE /* JSTextTrackList.h in Headers */,
</span><ins>+ 7AF9B20D18CFB5F400C64BEF /* JSTextTrackRegion.h in Headers */,
+ 7AF9B20F18CFB5F400C64BEF /* JSTextTrackRegionList.h in Headers */,
</ins><span class="cx"> E446141B0CD6826900FADA75 /* JSTimeRanges.h in Headers */,
</span><span class="cx"> 0FDA7C17188322EB00C954B5 /* JSTouch.h in Headers */,
</span><span class="cx"> 0FDA7C19188322EB00C954B5 /* JSTouchEvent.h in Headers */,
</span><span class="lines">@@ -26955,6 +26987,7 @@
</span><span class="cx"> 0F54DCD61880F867003EEDBB /* DOMTouch.mm in Sources */,
</span><span class="cx"> 0F54DCD81880F867003EEDBB /* DOMTouchEvent.mm in Sources */,
</span><span class="cx"> 0F54DCDC1880F867003EEDBB /* DOMTouchList.mm in Sources */,
</span><ins>+ 7AF9B20518CFB2DF00C64BEF /* TextTrackRegionList.cpp in Sources */,
</ins><span class="cx"> E145349816A9BB6A000F6FD2 /* DOMTransitionEvent.mm in Sources */,
</span><span class="cx"> 85526CD30AB0B7DA000302EA /* DOMTreeWalker.mm in Sources */,
</span><span class="cx"> 85C7F4920AAF79DC004014DD /* DOMUIEvent.mm in Sources */,
</span><span class="lines">@@ -28009,6 +28042,8 @@
</span><span class="cx"> 07E116B11489C9A100EC5ACE /* JSTextTrackCustom.cpp in Sources */,
</span><span class="cx"> 07B5A2DB1464320A00A81ECE /* JSTextTrackList.cpp in Sources */,
</span><span class="cx"> 07B5A30D14687D7100A81ECE /* JSTextTrackListCustom.cpp in Sources */,
</span><ins>+ 7AF9B20C18CFB5F400C64BEF /* JSTextTrackRegion.cpp in Sources */,
+ 7AF9B20E18CFB5F400C64BEF /* JSTextTrackRegionList.cpp in Sources */,
</ins><span class="cx"> E446141A0CD6826900FADA75 /* JSTimeRanges.cpp in Sources */,
</span><span class="cx"> 0FDA7C16188322EB00C954B5 /* JSTouch.cpp in Sources */,
</span><span class="cx"> 0FDA7C18188322EB00C954B5 /* JSTouchEvent.cpp in Sources */,
</span><span class="lines">@@ -29236,6 +29271,7 @@
</span><span class="cx"> A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */,
</span><span class="cx"> BCDFD48F0E305290009D10AD /* XMLHttpRequestUpload.cpp in Sources */,
</span><span class="cx"> A833C80C0A2CF25600D57664 /* XMLNames.cpp in Sources */,
</span><ins>+ 7AF9B20218CFB2DF00C64BEF /* TextTrackRegion.cpp in Sources */,
</ins><span class="cx"> E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */,
</span><span class="cx"> 1ACE53EA0A8D18E70022947D /* XMLSerializer.cpp in Sources */,
</span><span class="cx"> 5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandWebVTTTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp (165455 => 165456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp 2014-03-12 00:12:22 UTC (rev 165455)
+++ trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp 2014-03-12 00:19:25 UTC (rev 165456)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InbandTextTrackPrivate.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "NotImplemented.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -74,7 +75,14 @@
</span><span class="cx"> addCue(cue.release(), ASSERT_NO_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if ENABLE(WEBVTT_REGIONS)
+void InbandWebVTTTextTrack::newRegionsParsed()
+{
+ notImplemented();
+}
+#endif
+
</ins><span class="cx"> void InbandWebVTTTextTrack::fileFailedToParse()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "Unable to parse WebVTT stream.");
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (165455 => 165456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2014-03-12 00:12:22 UTC (rev 165455)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2014-03-12 00:19:25 UTC (rev 165456)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "TextTrackCueList.h"
</span><span class="cx">
</span><ins>+#if ENABLE(WEBVTT_REGIONS)
+#include "TextTrackRegionList.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track, const String& kind, const String& label, const String& language)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (165455 => 165456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrack.cpp 2014-03-12 00:12:22 UTC (rev 165455)
+++ trunk/Source/WebCore/html/track/TextTrack.cpp 2014-03-12 00:19:25 UTC (rev 165456)
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> TextTrack::TextTrack(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language, TextTrackType type)
</span><span class="cx"> : TrackBase(TrackBase::TextTrack, id, label, language)
</span><span class="cx"> , m_cues(0)
</span><del>- , m_scriptExecutionContext(context)
</del><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> , m_regions(0)
</span><span class="cx"> #endif
</span><ins>+ , m_scriptExecutionContext(context)
</ins><span class="cx"> , m_mode(disabledKeyword().string())
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_trackType(type)
</span></span></pre>
</div>
</div>
</body>
</html>