<!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>[187971] 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/187971">187971</a></dd>
<dt>Author</dt> <dd>mdaiter@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 11:40:08 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding in MediaPrivateMediaStreamEngine to default compile
https://bugs.webkit.org/show_bug.cgi?id=146790
<rdar://problem/21747289>
Reviewed by Eric Carlson.
* WebCore.xcodeproj/project.pbxproj:
* platform/mediastream/MediaStreamPrivate.h:
(WebCore::MediaStreamPrivate::MediaStreamPrivate):</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>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187970 => 187971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 18:35:55 UTC (rev 187970)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 18:40:08 UTC (rev 187971)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-08-05 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><ins>+ Adding in MediaPrivateMediaStreamEngine to default compile
+ https://bugs.webkit.org/show_bug.cgi?id=146790
+ <rdar://problem/21747289>
+
+ Reviewed by Eric Carlson.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mediastream/MediaStreamPrivate.h:
+ (WebCore::MediaStreamPrivate::MediaStreamPrivate):
+
+2015-08-05 Matthew Daiter <mdaiter@apple.com>
+
</ins><span class="cx"> Remove m_synchronizer from MediaPlayerPrivateMediaStream
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147637
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (187970 => 187971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-05 18:35:55 UTC (rev 187970)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-05 18:40:08 UTC (rev 187971)
</span><span class="lines">@@ -633,6 +633,10 @@
</span><span class="cx"> 14E8378E09F85D4F00B85AE4 /* JSEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 14E8378D09F85D4F00B85AE4 /* JSEvent.h */; };
</span><span class="cx"> 14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 14FFE31B0AE1963300136BF5 /* HTMLFrameElementBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14FFE31E0AE1963300136BF5 /* HTMLFrameElementBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14FFE31C0AE1963300136BF5 /* HTMLFrameElementBase.cpp */; };
</span><ins>+ 150524F41B712FF600696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 150524F01B712FF000696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.h */; };
+ 150524F51B712FF900696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 150524F11B712FF000696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.mm */; };
+ 150524F61B712FFC00696AA9 /* MediaStreamPrivateAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 150524F21B712FF000696AA9 /* MediaStreamPrivateAVFObjC.h */; };
+ 150524F71B712FFF00696AA9 /* MediaStreamPrivateAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 150524F31B712FF000696AA9 /* MediaStreamPrivateAVFObjC.mm */; };
</ins><span class="cx"> 15145B901B3A1CE000662BF7 /* MediaDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 15145B8F1B3A1B3E00662BF7 /* MediaDeviceInfo.h */; };
</span><span class="cx"> 152A29B41B4EF5B700B52AE0 /* MediaDevicesPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 152A29B21B4EF59600B52AE0 /* MediaDevicesPrivate.cpp */; };
</span><span class="cx"> 152A29B51B4EF5BA00B52AE0 /* MediaDevicesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 152A29B31B4EF59600B52AE0 /* MediaDevicesPrivate.h */; };
</span><span class="lines">@@ -7770,6 +7774,10 @@
</span><span class="cx"> 14E8378D09F85D4F00B85AE4 /* JSEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 14FFE31B0AE1963300136BF5 /* HTMLFrameElementBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLFrameElementBase.h; sourceTree = "<group>"; };
</span><span class="cx"> 14FFE31C0AE1963300136BF5 /* HTMLFrameElementBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLFrameElementBase.cpp; sourceTree = "<group>"; };
</span><ins>+ 150524F01B712FF000696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateMediaStreamAVFObjC.h; sourceTree = "<group>"; };
+ 150524F11B712FF000696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlayerPrivateMediaStreamAVFObjC.mm; sourceTree = "<group>"; };
+ 150524F21B712FF000696AA9 /* MediaStreamPrivateAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamPrivateAVFObjC.h; sourceTree = "<group>"; };
+ 150524F31B712FF000696AA9 /* MediaStreamPrivateAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaStreamPrivateAVFObjC.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 15145B8F1B3A1B3E00662BF7 /* MediaDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaDeviceInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 15145B911B3A1D4C00662BF7 /* MediaDeviceInfo.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaDeviceInfo.idl; sourceTree = "<group>"; };
</span><span class="cx"> 152A29B21B4EF59600B52AE0 /* MediaDevicesPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDevicesPrivate.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -22217,6 +22225,10 @@
</span><span class="cx"> DF9AFD6F13FC31B00015FEB7 /* objc */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 150524F01B712FF000696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.h */,
+ 150524F11B712FF000696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.mm */,
+ 150524F21B712FF000696AA9 /* MediaStreamPrivateAVFObjC.h */,
+ 150524F31B712FF000696AA9 /* MediaStreamPrivateAVFObjC.mm */,
</ins><span class="cx"> CDE3A85617F6020400C5BE20 /* AudioTrackPrivateAVFObjC.h */,
</span><span class="cx"> CDE3A85517F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm */,
</span><span class="cx"> CD54A760180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.cpp */,
</span><span class="lines">@@ -25880,6 +25892,7 @@
</span><span class="cx"> 65DF320609D1CC60000BE325 /* JSWheelEvent.h in Headers */,
</span><span class="cx"> E1CAA5C60E8BD23600A73ECA /* JSWorker.h in Headers */,
</span><span class="cx"> E18256900EF2B02D00933242 /* JSWorkerGlobalScope.h in Headers */,
</span><ins>+ 150524F41B712FF600696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.h in Headers */,
</ins><span class="cx"> E1C36D350EB0A094007410BC /* JSWorkerGlobalScopeBase.h in Headers */,
</span><span class="cx"> E1C362EF0EAF2AA9007410BC /* JSWorkerLocation.h in Headers */,
</span><span class="cx"> E1271A580EEECDE400F61213 /* JSWorkerNavigator.h in Headers */,
</span><span class="lines">@@ -27116,6 +27129,7 @@
</span><span class="cx"> 9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,
</span><span class="cx"> 9759E94314EF1CF80026A2DD /* TextTrackCue.h in Headers */,
</span><span class="cx"> 071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */,
</span><ins>+ 150524F61B712FFC00696AA9 /* MediaStreamPrivateAVFObjC.h in Headers */,
</ins><span class="cx"> 9759E94614EF1CF80026A2DD /* TextTrackCueList.h in Headers */,
</span><span class="cx"> 076970871463AD8700F502CF /* TextTrackList.h in Headers */,
</span><span class="cx"> B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */,
</span><span class="lines">@@ -30351,6 +30365,7 @@
</span><span class="cx"> B2227A230D00BF220071B782 /* SVGForeignObjectElement.cpp in Sources */,
</span><span class="cx"> B2227A260D00BF220071B782 /* SVGGElement.cpp in Sources */,
</span><span class="cx"> 087E0AF613606D0B00FA4BA8 /* SVGGlyph.cpp in Sources */,
</span><ins>+ 150524F51B712FF900696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.mm in Sources */,
</ins><span class="cx"> B2A1F2AD0CEF0ABF00442F6A /* SVGGlyphElement.cpp in Sources */,
</span><span class="cx"> 24D912BD13CA9A9700D21915 /* SVGGlyphRefElement.cpp in Sources */,
</span><span class="cx"> B2227A290D00BF220071B782 /* SVGGradientElement.cpp in Sources */,
</span><span class="lines">@@ -30416,6 +30431,7 @@
</span><span class="cx"> B2227AC70D00BF220071B782 /* SVGTextContentElement.cpp in Sources */,
</span><span class="cx"> B2227ACA0D00BF220071B782 /* SVGTextElement.cpp in Sources */,
</span><span class="cx"> B2227ACD0D00BF220071B782 /* SVGTextPathElement.cpp in Sources */,
</span><ins>+ 150524F71B712FFF00696AA9 /* MediaStreamPrivateAVFObjC.mm in Sources */,
</ins><span class="cx"> B2227AD00D00BF220071B782 /* SVGTextPositioningElement.cpp in Sources */,
</span><span class="cx"> B2227AD30D00BF220071B782 /* SVGTitleElement.cpp in Sources */,
</span><span class="cx"> 1CCDF5BD1990332400BCEBAD /* SVGToOTFFontConversion.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (187970 => 187971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-08-05 18:35:55 UTC (rev 187970)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-08-05 18:40:08 UTC (rev 187971)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> static RefPtr<MediaStreamPrivate> create(const Vector<RefPtr<MediaStreamTrackPrivate>>&);
</span><span class="cx"> static RefPtr<MediaStreamPrivate> create();
</span><span class="cx">
</span><ins>+ MediaStreamPrivate() { }
</ins><span class="cx"> virtual ~MediaStreamPrivate() { }
</span><span class="cx">
</span><span class="cx"> enum class NotifyClientOption { Notify, DontNotify };
</span><span class="lines">@@ -79,7 +80,6 @@
</span><span class="cx"> void removeTrack(MediaStreamTrackPrivate&, NotifyClientOption);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MediaStreamPrivate() { }
</del><span class="cx"> MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamTrackPrivate>>&);
</span><span class="cx">
</span><span class="cx"> MediaStreamPrivateClient* m_client;
</span></span></pre>
</div>
</div>
</body>
</html>