<!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>[212413] trunk/Source/ThirdParty/libwebrtc</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/212413">212413</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-02-15 16:54:49 -0800 (Wed, 15 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ASAN build after <a href="http://trac.webkit.org/projects/webkit/changeset/212401">r212401</a>
https://bugs.webkit.org/show_bug.cgi?id=168398
* Source/webrtc/media/engine/webrtcvideocapturer.cc:
* libwebrtc.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartylibwebrtcChangeLog">trunk/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcmediaenginewebrtcvideocapturercc">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtclibwebrtcxcodeprojprojectpbxproj">trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (212412 => 212413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-02-16 00:42:58 UTC (rev 212412)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-02-16 00:54:49 UTC (rev 212413)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2017-02-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix ASAN build after r212401
+ https://bugs.webkit.org/show_bug.cgi?id=168398
+
+ * Source/webrtc/media/engine/webrtcvideocapturer.cc:
+ * libwebrtc.xcodeproj/project.pbxproj:
+
+2017-02-15 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Make libwebrtc.dylib
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168335
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcmediaenginewebrtcvideocapturercc"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc (212412 => 212413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc 2017-02-16 00:42:58 UTC (rev 212412)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc 2017-02-16 00:54:49 UTC (rev 212413)
</span><span class="lines">@@ -49,10 +49,20 @@
</span><span class="cx"> virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
</span><span class="cx"> int id,
</span><span class="cx"> const char* device) {
</span><ins>+#if RTC_HAS_ASAN
+ // FIXME: this shouldn't be necessary.
+ return nullptr;
+#else
</ins><span class="cx"> return webrtc::VideoCaptureFactory::Create(id, device);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) {
</span><ins>+#if RTC_HAS_ASAN
+ // FIXME: this shouldn't be necessary.
+ return nullptr;
+#else
</ins><span class="cx"> return webrtc::VideoCaptureFactory::CreateDeviceInfo(id);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) {
</span><span class="cx"> delete info;
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtclibwebrtcxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (212412 => 212413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2017-02-16 00:42:58 UTC (rev 212412)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2017-02-16 00:54:49 UTC (rev 212413)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx"> 5C0073111E5513E70042215A /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730C1E5513E70042215A /* CoreMedia.framework */; };
</span><span class="cx"> 5C0073121E5513E70042215A /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730D1E5513E70042215A /* CoreVideo.framework */; };
</span><span class="cx"> 5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073131E5514020042215A /* VideoToolbox.framework */; };
</span><ins>+ 5C0073431E552C800042215A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073411E552C800042215A /* CoreGraphics.framework */; };
+ 5C0073441E552C800042215A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073421E552C800042215A /* Security.framework */; };
+ 5C0073461E552CA20042215A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073451E552CA20042215A /* SystemConfiguration.framework */; };
</ins><span class="cx"> 5C0884E31E4A986000403995 /* compare.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D341E4323D4002651C8 /* compare.cc */; };
</span><span class="cx"> 5C0884E41E4A986000403995 /* compare_common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D2F1E4323D4002651C8 /* compare_common.cc */; };
</span><span class="cx"> 5C0884E51E4A986000403995 /* compare_gcc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD84211E439BCB00621E92 /* compare_gcc.cc */; };
</span><span class="lines">@@ -2671,6 +2674,9 @@
</span><span class="cx"> 5C00730C1E5513E70042215A /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
</span><span class="cx"> 5C00730D1E5513E70042215A /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
</span><span class="cx"> 5C0073131E5514020042215A /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
</span><ins>+ 5C0073411E552C800042215A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+ 5C0073421E552C800042215A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+ 5C0073451E552CA20042215A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
</ins><span class="cx"> 5C0884891E4A978C00403995 /* libsrtp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libsrtp.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5C08848A1E4A978C00403995 /* libyuv.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libyuv.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5C0884D11E4A97E300403995 /* libsrtp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsrtp.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -5117,6 +5123,9 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 5C0073461E552CA20042215A /* SystemConfiguration.framework in Frameworks */,
+ 5C0073431E552C800042215A /* CoreGraphics.framework in Frameworks */,
+ 5C0073441E552C800042215A /* Security.framework in Frameworks */,
</ins><span class="cx"> 5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */,
</span><span class="cx"> 5C00730E1E5513E70042215A /* AudioToolbox.framework in Frameworks */,
</span><span class="cx"> 5C00730F1E5513E70042215A /* AVFoundation.framework in Frameworks */,
</span><span class="lines">@@ -7156,6 +7165,9 @@
</span><span class="cx"> 5CB3048A1DE4143400D2C405 /* Frameworks */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 5C0073451E552CA20042215A /* SystemConfiguration.framework */,
+ 5C0073411E552C800042215A /* CoreGraphics.framework */,
+ 5C0073421E552C800042215A /* Security.framework */,
</ins><span class="cx"> 5C0073131E5514020042215A /* VideoToolbox.framework */,
</span><span class="cx"> 5C0073091E5513E70042215A /* AudioToolbox.framework */,
</span><span class="cx"> 5C00730A1E5513E70042215A /* AVFoundation.framework */,
</span></span></pre>
</div>
</div>
</body>
</html>