<!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>[211761] 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/211761">211761</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-06 17:33:41 -0800 (Mon, 06 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream Mac] Remove some unused code
https://bugs.webkit.org/show_bug.cgi?id=167913
Reviewed by Jer Noble.
No new tests, no functional change.
* platform/mediastream/CaptureDeviceManager.h:
(WebCore::CaptureSessionInfo::~CaptureSessionInfo): Deleted.
(WebCore::CaptureSessionInfo::supportsVideoSize): Deleted.
(WebCore::CaptureSessionInfo::bestSessionPresetForVideoDimensions): Deleted.
* platform/mediastream/mac/AVCaptureDeviceManager.h:
* platform/mediastream/mac/AVCaptureDeviceManager.mm:
(WebCore::AVCaptureDeviceManager::refreshCaptureDeviceList):
(WebCore::AVCaptureSessionInfo::AVCaptureSessionInfo): Deleted.
(WebCore::AVCaptureSessionInfo::supportsVideoSize): Deleted.
(WebCore::AVCaptureSessionInfo::bestSessionPresetForVideoDimensions): Deleted.
* platform/mediastream/mac/AVMediaCaptureSource.mm:
(WebCore::AVMediaCaptureSource::AVMediaCaptureSource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamCaptureDeviceManagerh">trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211760 => 211761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-07 01:20:05 UTC (rev 211760)
+++ trunk/Source/WebCore/ChangeLog 2017-02-07 01:33:41 UTC (rev 211761)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-06 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream Mac] Remove some unused code
+ https://bugs.webkit.org/show_bug.cgi?id=167913
+
+ Reviewed by Jer Noble.
+
+ No new tests, no functional change.
+
+ * platform/mediastream/CaptureDeviceManager.h:
+ (WebCore::CaptureSessionInfo::~CaptureSessionInfo): Deleted.
+ (WebCore::CaptureSessionInfo::supportsVideoSize): Deleted.
+ (WebCore::CaptureSessionInfo::bestSessionPresetForVideoDimensions): Deleted.
+ * platform/mediastream/mac/AVCaptureDeviceManager.h:
+ * platform/mediastream/mac/AVCaptureDeviceManager.mm:
+ (WebCore::AVCaptureDeviceManager::refreshCaptureDeviceList):
+ (WebCore::AVCaptureSessionInfo::AVCaptureSessionInfo): Deleted.
+ (WebCore::AVCaptureSessionInfo::supportsVideoSize): Deleted.
+ (WebCore::AVCaptureSessionInfo::bestSessionPresetForVideoDimensions): Deleted.
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::AVMediaCaptureSource::AVMediaCaptureSource):
+
</ins><span class="cx"> 2017-02-06 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Allow some schemes to opt-out of CORS
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamCaptureDeviceManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.h (211760 => 211761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.h 2017-02-07 01:20:05 UTC (rev 211760)
+++ trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.h 2017-02-07 01:33:41 UTC (rev 211761)
</span><span class="lines">@@ -36,22 +36,13 @@
</span><span class="cx"> public:
</span><span class="cx"> String m_persistentDeviceID;
</span><span class="cx"> String m_localizedName;
</span><del>- String m_groupID;
-
</del><span class="cx"> String m_sourceId;
</span><del>-
- bool m_enabled { false };
</del><ins>+ String m_groupID { emptyString() };
+ bool m_enabled { true };
</ins><span class="cx"> RealtimeMediaSource::Type m_sourceType { RealtimeMediaSource::None };
</span><span class="cx"> RealtimeMediaSourceSettings::VideoFacingMode m_position { RealtimeMediaSourceSettings::Unknown };
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class CaptureSessionInfo {
-public:
- virtual ~CaptureSessionInfo() { }
- virtual bool supportsVideoSize(const String& /* videoSize */) const { return false; }
- virtual String bestSessionPresetForVideoDimensions(int /* width */, int /* height */) const { return emptyString(); }
-};
-
</del><span class="cx"> class CaptureDeviceManager {
</span><span class="cx"> public:
</span><span class="cx"> virtual Vector<CaptureDeviceInfo>& captureDeviceList() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h (211760 => 211761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2017-02-07 01:20:05 UTC (rev 211760)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2017-02-07 01:33:41 UTC (rev 211761)
</span><span class="lines">@@ -42,16 +42,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class AVCaptureSessionInfo : public CaptureSessionInfo {
-public:
- AVCaptureSessionInfo(AVCaptureSession*);
- bool supportsVideoSize(const String&) const final;
- String bestSessionPresetForVideoDimensions(int width, int height) const final;
-
-private:
- AVCaptureSession *m_platformSession;
-};
-
</del><span class="cx"> class AVCaptureDeviceManager final : public CaptureDeviceManager {
</span><span class="cx"> friend class NeverDestroyed<AVCaptureDeviceManager>;
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (211760 => 211761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2017-02-07 01:20:05 UTC (rev 211760)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2017-02-07 01:33:41 UTC (rev 211761)
</span><span class="lines">@@ -92,50 +92,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-AVCaptureSessionInfo::AVCaptureSessionInfo(AVCaptureSessionType *platformSession)
- : m_platformSession(platformSession)
-{
-}
-
-bool AVCaptureSessionInfo::supportsVideoSize(const String& videoSize) const
-{
- return [m_platformSession canSetSessionPreset:videoSize];
-}
-
-String AVCaptureSessionInfo::bestSessionPresetForVideoDimensions(int width, int height) const
-{
- ASSERT(width >= 0);
- ASSERT(height >= 0);
-
- if (width > 1280 || height > 720) {
- // FIXME: this restriction could be adjusted with the videoMaxScaleAndCropFactor property.
- return emptyString();
- }
-
- if (width > 640 || height > 480) {
- if (supportsVideoSize(AVCaptureSessionPreset1280x720))
- return AVCaptureSessionPreset1280x720;
-
- return emptyString();
- }
-
- if (width > 352 || height > 288) {
- if (supportsVideoSize(AVCaptureSessionPreset640x480))
- return AVCaptureSessionPreset640x480;
-
- return emptyString();
- }
-
- if (supportsVideoSize(AVCaptureSessionPreset352x288))
- return AVCaptureSessionPreset352x288;
-
- if (supportsVideoSize(AVCaptureSessionPresetLow))
- return AVCaptureSessionPresetLow;
-
- return emptyString();
-}
-
-
</del><span class="cx"> Vector<CaptureDeviceInfo>& AVCaptureDeviceManager::captureDeviceList()
</span><span class="cx"> {
</span><span class="cx"> if (!isAvailable())
</span><span class="lines">@@ -172,13 +128,8 @@
</span><span class="cx">
</span><span class="cx"> CaptureDeviceInfo captureDevice;
</span><span class="cx"> if (!captureDeviceFromDeviceID(platformDevice.uniqueID, captureDevice)) {
</span><del>- // An AVCaptureDevice has a unique ID, but we can't use it for the source ID because:
- // 1. if it provides both audio and video we will need to create two sources for it
- // 2. the unique ID persists on one system across device connections, disconnections,
- // application restarts, and reboots, so it could be used to figerprint a user.
- captureDevice.m_persistentDeviceID = platformDevice.uniqueID;
- captureDevice.m_enabled = true;
- captureDevice.m_localizedName = platformDevice.localizedName;
</del><ins>+ CaptureDeviceInfo captureDevice = { platformDevice.uniqueID, platformDevice.localizedName, createCanonicalUUIDString() };
+
</ins><span class="cx"> if ([platformDevice position] == AVCaptureDevicePositionFront)
</span><span class="cx"> captureDevice.m_position = RealtimeMediaSourceSettings::User;
</span><span class="cx"> if ([platformDevice position] == AVCaptureDevicePositionBack)
</span><span class="lines">@@ -191,7 +142,6 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: For a given device, the source ID should persist when visiting the same request origin,
</span><span class="cx"> // but differ across different request origins.
</span><del>- captureDevice.m_sourceId = createCanonicalUUIDString();
</del><span class="cx"> captureDevice.m_sourceType = hasVideo ? RealtimeMediaSource::Video : RealtimeMediaSource::Audio;
</span><span class="cx"> if (hasVideo && hasAudio) {
</span><span class="cx"> // Add the audio component as a separate device.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (211760 => 211761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2017-02-07 01:20:05 UTC (rev 211760)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2017-02-07 01:33:41 UTC (rev 211761)
</span><span class="lines">@@ -126,11 +126,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, RealtimeMediaSource::Type type)
</span><del>- : RealtimeMediaSource(id, type, emptyString())
</del><ins>+ : RealtimeMediaSource(id, type, device.localizedName)
</ins><span class="cx"> , m_objcObserver(adoptNS([[WebCoreAVMediaCaptureSourceObserver alloc] initWithCallback:this]))
</span><span class="cx"> , m_device(device)
</span><span class="cx"> {
</span><del>- setName(device.localizedName);
</del><span class="cx"> setPersistentID(device.uniqueID);
</span><span class="cx"> setMuted(true);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>