<!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>[208735] trunk</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/208735">208735</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-11-15 10:19:19 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove HasMediaCaptureDevice
https://bugs.webkit.org/show_bug.cgi?id=164767
<rdar://problem/29263696>
Reviewed by Eric Carlson.
Source/WebCore:
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::mediaState): Remove HasMediaCaptureDevice in state.
* page/MediaProducer.h:
* testing/Internals.cpp:
(WebCore::Internals::pageMediaState): Remove it in the media string.
Source/WebKit2:
* UIProcess/API/C/WKPage.cpp: Remove kWKMediaHasCaptureDevice.
(WKPageGetMediaState):
* UIProcess/API/C/WKPagePrivate.h:
LayoutTests:
* fast/mediastream/MediaStream-page-muted-expected.txt: Remove check for HasMediaCaptureDevice.
* fast/mediastream/MediaStream-page-muted.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreampagemutedexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreampagemutedhtml">trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMediaProducerh">trunk/Source/WebCore/page/MediaProducer.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/LayoutTests/ChangeLog 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-15 Jon Lee <jonlee@apple.com>
+
+ Remove HasMediaCaptureDevice
+ https://bugs.webkit.org/show_bug.cgi?id=164767
+ <rdar://problem/29263696>
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/MediaStream-page-muted-expected.txt: Remove check for HasMediaCaptureDevice.
+ * fast/mediastream/MediaStream-page-muted.html:
+
</ins><span class="cx"> 2016-11-14 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix font-synthesis and text-decoration-skip parsing
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -12,10 +12,8 @@
</span><span class="cx"> *** Muting capture devices
</span><span class="cx"> EVENT: mute
</span><span class="cx"> PASS muteChangedEvent.target.muted is true
</span><del>-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</del><span class="cx"> EVENT: mute
</span><span class="cx"> PASS muteChangedEvent.target.muted is true
</span><del>-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</del><span class="cx">
</span><span class="cx"> PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false
</span><span class="cx">
</span><span class="lines">@@ -22,10 +20,8 @@
</span><span class="cx"> *** Unmuting capture devices
</span><span class="cx"> EVENT: unmute
</span><span class="cx"> PASS muteChangedEvent.target.muted is false
</span><del>-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</del><span class="cx"> EVENT: unmute
</span><span class="cx"> PASS muteChangedEvent.target.muted is false
</span><del>-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</del><span class="cx">
</span><span class="cx"> PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> muteChangedEvent = ev;
</span><span class="cx"> debug(`EVENT: ${muteChangedEvent.type}`);
</span><span class="cx"> shouldBe('muteChangedEvent.target.muted', (muteChangedEvent.type == "mute").toString());
</span><del>- shouldBe("window.internals.pageMediaState().includes('HasMediaCaptureDevice')", "true");
</del><span class="cx">
</span><span class="cx"> if (++eventCount == 2) {
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebCore/ChangeLog 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-15 Jon Lee <jonlee@apple.com>
+
+ Remove HasMediaCaptureDevice
+ https://bugs.webkit.org/show_bug.cgi?id=164767
+ <rdar://problem/29263696>
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::mediaState): Remove HasMediaCaptureDevice in state.
+ * page/MediaProducer.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::pageMediaState): Remove it in the media string.
+
</ins><span class="cx"> 2016-11-14 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix font-synthesis and text-decoration-skip parsing
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -312,7 +312,6 @@
</span><span class="cx"> if (!m_isActive)
</span><span class="cx"> return state;
</span><span class="cx">
</span><del>- state |= HasMediaCaptureDevice;
</del><span class="cx"> if (m_private->isProducingData())
</span><span class="cx"> state |= HasActiveMediaCaptureDevice;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MediaProducer.h (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MediaProducer.h 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebCore/page/MediaProducer.h 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> HasPlaybackTargetAvailabilityListener = 1 << 9,
</span><span class="cx"> HasAudioOrVideo = 1 << 10,
</span><span class="cx"> HasActiveMediaCaptureDevice = 1 << 11,
</span><del>- HasMediaCaptureDevice = 1 << 12,
</del><span class="cx"> };
</span><span class="cx"> typedef unsigned MediaStateFlags;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -3012,8 +3012,6 @@
</span><span class="cx"> string.append("HasAudioOrVideo,");
</span><span class="cx"> if (state & MediaProducer::HasActiveMediaCaptureDevice)
</span><span class="cx"> string.append("HasActiveMediaCaptureDevice,");
</span><del>- if (state & MediaProducer::HasMediaCaptureDevice)
- string.append("HasMediaCaptureDevice,");
</del><span class="cx">
</span><span class="cx"> if (string.isEmpty())
</span><span class="cx"> string.append("IsNotPlaying");
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-11-15 Jon Lee <jonlee@apple.com>
+
+ Remove HasMediaCaptureDevice
+ https://bugs.webkit.org/show_bug.cgi?id=164767
+ <rdar://problem/29263696>
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/API/C/WKPage.cpp: Remove kWKMediaHasCaptureDevice.
+ (WKPageGetMediaState):
+ * UIProcess/API/C/WKPagePrivate.h:
+
</ins><span class="cx"> 2016-11-15 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Disallow loads using HTTP 0.9 at the ResourceHandle/NetworkDataTask level
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -2748,8 +2748,6 @@
</span><span class="cx"> state |= kWKMediaIsPlayingAudio;
</span><span class="cx"> if (coreState & WebCore::MediaProducer::IsPlayingVideo)
</span><span class="cx"> state |= kWKMediaIsPlayingVideo;
</span><del>- if (coreState & WebCore::MediaProducer::HasMediaCaptureDevice)
- state |= kWKMediaHasCaptureDevice;
</del><span class="cx"> if (coreState & WebCore::MediaProducer::HasActiveMediaCaptureDevice)
</span><span class="cx"> state |= kWKMediaHasActiveCaptureDevice;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (208734 => 208735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-11-15 17:32:53 UTC (rev 208734)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-11-15 18:19:19 UTC (rev 208735)
</span><span class="lines">@@ -134,7 +134,6 @@
</span><span class="cx"> kWKMediaIsPlayingAudio = 1 << 0,
</span><span class="cx"> kWKMediaIsPlayingVideo = 1 << 1,
</span><span class="cx"> kWKMediaHasActiveCaptureDevice = 1 << 2,
</span><del>- kWKMediaHasCaptureDevice = 1 << 3,
</del><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKMediaState;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>