<!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>[213972] 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/213972">213972</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-14 22:21:06 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>CanvasCapture should not generate a frame per each canvas draw command
https://bugs.webkit.org/show_bug.cgi?id=169498
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-14
Reviewed by Simon Fraser & Eric Carlson.
Source/WebCore:
Test: fast/mediastream/captureStream/canvas2d-heavy-drawing.html
Making Canvas capture be asynchronous.
This ensures that one frame will be created for a set of synchronous draw commands.
In the future, we should find a better approach, like aligning with requestAnimationFrame.
Adding internals observer API for media stream tracks.
* Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
(WebCore::CanvasCaptureMediaStreamTrack::Source::Source):
(WebCore::CanvasCaptureMediaStreamTrack::Source::canvasChanged):
* Modules/mediastream/CanvasCaptureMediaStreamTrack.h:
* Modules/mediastream/MediaStreamTrack.idl:
* platform/mediastream/RealtimeMediaSource.h:
* testing/Internals.cpp:
(WebCore::Internals::~Internals):
(WebCore::Internals::observeMediaStreamTrack):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* fast/mediastream/captureStream/canvas2d-heavy-drawing-expected.txt: Added.
* fast/mediastream/captureStream/canvas2d-heavy-drawing.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamCanvasCaptureMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamCanvasCaptureMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackidl">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamcaptureStreamcanvas2dheavydrawingexpectedtxt">trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamcaptureStreamcanvas2dheavydrawinghtml">trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/LayoutTests/ChangeLog 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-14 Youenn Fablet <youenn@apple.com>
+
+ CanvasCapture should not generate a frame per each canvas draw command
+ https://bugs.webkit.org/show_bug.cgi?id=169498
+
+ Reviewed by Simon Fraser & Eric Carlson.
+
+ * fast/mediastream/captureStream/canvas2d-heavy-drawing-expected.txt: Added.
+ * fast/mediastream/captureStream/canvas2d-heavy-drawing.html: Added.
+
</ins><span class="cx"> 2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, skip fast/media/video-element-in-details-collapse.html on iOS
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamcaptureStreamcanvas2dheavydrawingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing-expected.txt (0 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing-expected.txt 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+
+PASS captureStream with 2d context drawing
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamcaptureStreamcanvas2dheavydrawinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing.html (0 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/captureStream/canvas2d-heavy-drawing.html 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <body>
+ <canvas id="canvas1" width=100px height=100px></canvas>
+ <video id="video" autoplay width=100px height=100px></video>
+ <canvas id="canvas2" width=100px height=100px></canvas>
+ <script src="../../../resources/testharness.js"></script>
+ <script src="../../../resources/testharnessreport.js"></script>
+ <script>
+
+var canvas1 = document.getElementById("canvas1");
+var canvas2 = document.getElementById("canvas2");
+var video = document.getElementById("video");
+
+var previousTrackSampleCount = 0
+function validateCanvas(resolve, reject)
+{
+ try {
+ if (window.internals) {
+ assert_true((internals.trackVideoSampleCount - previousTrackSampleCount) <= 1, "got too much internals.trackVideoSampleCount");
+ previousTrackSampleCount = internals.trackVideoSampleCount;
+ }
+ canvas2.getContext("2d").drawImage(video, 0 ,0);
+ assert_array_equals(canvas2.getContext("2d").getImageData(0 ,0, 100, 100), canvas2.getContext("2d").getImageData(0, 0, 100, 100));
+ } catch(e) {
+ reject(e);
+ return;
+ }
+ setTimeout(() => { validateCanvas(reject, resolve); }, 5);
+}
+
+function checkCanvas(canvas, stream)
+{
+ return new Promise((resolve, reject) => {
+ video.srcObject = stream;
+ video.onplay = () => {
+ if (window.internals)
+ previousTrackSampleCount = internals.trackVideoSampleCount;
+ validateCanvas(resolve, reject);
+ setTimeout(resolve, 500);
+ }
+ });
+}
+
+var cptr = 0;
+function printLine()
+{
+ var context = canvas1.getContext("2d");
+ context.fillStyle = "red";
+ for (var i = 0 ; i < 100; ++i)
+ context.fillRect(0, 0, 100, 100);
+
+ cptr += 5;
+ if (cptr > 255)
+ cptr = 0;
+ context.fillStyle="rgb(0, " + cptr + ", 0)";
+ context.fillRect(0, 0, 100, 100);
+ setTimeout(printLine, 100);
+}
+
+promise_test((test) => {
+ var stream = canvas1.captureStream();
+
+ assert_false(!!stream.getAudioTracks().length);
+ assert_true(stream.getVideoTracks().length == 1);
+
+ if (window.internals)
+ internals.observeMediaStreamTrack(stream.getVideoTracks()[0]);
+
+ promise = checkCanvas(canvas1, stream);
+
+ printLine();
+
+ return promise;
+}, "captureStream with 2d context drawing");
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-03-14 Youenn Fablet <youenn@apple.com>
+
+ CanvasCapture should not generate a frame per each canvas draw command
+ https://bugs.webkit.org/show_bug.cgi?id=169498
+
+ Reviewed by Simon Fraser & Eric Carlson.
+
+ Test: fast/mediastream/captureStream/canvas2d-heavy-drawing.html
+
+ Making Canvas capture be asynchronous.
+ This ensures that one frame will be created for a set of synchronous draw commands.
+ In the future, we should find a better approach, like aligning with requestAnimationFrame.
+ Adding internals observer API for media stream tracks.
+
+ * Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
+ (WebCore::CanvasCaptureMediaStreamTrack::Source::Source):
+ (WebCore::CanvasCaptureMediaStreamTrack::Source::canvasChanged):
+ * Modules/mediastream/CanvasCaptureMediaStreamTrack.h:
+ * Modules/mediastream/MediaStreamTrack.idl:
+ * platform/mediastream/RealtimeMediaSource.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::~Internals):
+ (WebCore::Internals::observeMediaStreamTrack):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderElements should unregister for viewport visibility callbacks when they are destroyed
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamCanvasCaptureMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> : RealtimeMediaSource(String(), Type::Video, String())
</span><span class="cx"> , m_frameRequestRate(WTFMove(frameRequestRate))
</span><span class="cx"> , m_requestFrameTimer(*this, &Source::requestFrameTimerFired)
</span><ins>+ , m_canvasChangedTimer(*this, &Source::captureCanvas)
</ins><span class="cx"> , m_canvas(&canvas)
</span><span class="cx"> {
</span><span class="cx"> m_settings.setWidth(canvas.width());
</span><span class="lines">@@ -123,7 +124,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(canvas, m_canvas == &canvas);
</span><span class="cx">
</span><del>- captureCanvas();
</del><ins>+ // FIXME: We should try to generate the frame at the time the screen is being updated.
+ if (m_canvasChangedTimer.isActive())
+ return;
+ m_canvasChangedTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CanvasCaptureMediaStreamTrack::Source::captureCanvas()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamCanvasCaptureMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><ins>+#include "Timer.h"
</ins><span class="cx"> #include <wtf/TypeCasts.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> bool m_shouldEmitFrame { true };
</span><span class="cx"> std::optional<double> m_frameRequestRate;
</span><span class="cx"> Timer m_requestFrameTimer;
</span><ins>+ Timer m_canvasChangedTimer;
</ins><span class="cx"> RealtimeMediaSourceSettings m_settings;
</span><span class="cx"> HTMLCanvasElement* m_canvas;
</span><span class="cx"> RefPtr<Image> m_currentImage;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> ActiveDOMObject,
</span><span class="cx"> Conditional=MEDIA_STREAM,
</span><span class="cx"> CustomToJSObject,
</span><ins>+ ExportToWrappedFunction,
</ins><span class="cx"> PrivateIdentifier,
</span><span class="cx"> PublicIdentifier,
</span><span class="cx"> ] interface MediaStreamTrack : EventTarget {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -137,8 +137,8 @@
</span><span class="cx"> virtual bool remote() const { return m_remote; }
</span><span class="cx"> virtual void setRemote(bool remote) { m_remote = remote; }
</span><span class="cx">
</span><del>- void addObserver(Observer&);
- void removeObserver(Observer&);
</del><ins>+ WEBCORE_EXPORT void addObserver(Observer&);
+ WEBCORE_EXPORT void removeObserver(Observer&);
</ins><span class="cx">
</span><span class="cx"> virtual void startProducingData() { }
</span><span class="cx"> virtual void stopProducingData() { }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> #include "MallocStatistics.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include "MediaProducer.h"
</span><ins>+#include "MediaStreamTrack.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "MemoryInfo.h"
</span><span class="cx"> #include "MockLibWebRTCPeerConnection.h"
</span><span class="lines">@@ -376,6 +377,8 @@
</span><span class="cx">
</span><span class="cx"> Internals::~Internals()
</span><span class="cx"> {
</span><ins>+ if (m_track)
+ m_track->source().removeObserver(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::resetToConsistentState(Page& page)
</span><span class="lines">@@ -3825,4 +3828,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span><ins>+void Internals::observeMediaStreamTrack(MediaStreamTrack& track)
+{
+ m_track = &track;
+ m_track->source().addObserver(*this);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/testing/Internals.h 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "ContextDestructionObserver.h"
</span><span class="cx"> #include "ExceptionOr.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <runtime/Float32Array.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="lines">@@ -57,6 +58,7 @@
</span><span class="cx"> class InternalSettings;
</span><span class="cx"> class MallocStatistics;
</span><span class="cx"> class MediaSession;
</span><ins>+class MediaStreamTrack;
</ins><span class="cx"> class MemoryInfo;
</span><span class="cx"> class MockCDMFactory;
</span><span class="cx"> class MockContentFilterSettings;
</span><span class="lines">@@ -75,7 +77,7 @@
</span><span class="cx"> class WebGLRenderingContextBase;
</span><span class="cx"> class XMLHttpRequest;
</span><span class="cx">
</span><del>-class Internals final : public RefCounted<Internals>, private ContextDestructionObserver {
</del><ins>+class Internals final : public RefCounted<Internals>, private ContextDestructionObserver, private RealtimeMediaSource::Observer {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<Internals> create(Document&);
</span><span class="cx"> virtual ~Internals();
</span><span class="lines">@@ -544,6 +546,10 @@
</span><span class="cx"> void simulateWebGLContextChanged(WebGLRenderingContextBase&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ unsigned long trackAudioSampleCount() const { return m_trackAudioSampleCount; }
+ unsigned long trackVideoSampleCount() const { return m_trackVideoSampleCount; }
+ void observeMediaStreamTrack(MediaStreamTrack&);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document&);
</span><span class="cx"> Document* contextDocument() const;
</span><span class="lines">@@ -551,7 +557,15 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<RenderedDocumentMarker*> markerAt(Node&, const String& markerType, unsigned index);
</span><span class="cx">
</span><ins>+ // RealtimeMediaSource::Observer API
+ void videoSampleAvailable(MediaSample&) final { m_trackVideoSampleCount++; }
+ void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final { m_trackAudioSampleCount++; }
+
</ins><span class="cx"> std::unique_ptr<InspectorStubFrontend> m_inspectorFrontend;
</span><ins>+
+ unsigned long m_trackVideoSampleCount { 0 };
+ unsigned long m_trackAudioSampleCount { 0 };
+ RefPtr<MediaStreamTrack> m_track;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (213971 => 213972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2017-03-15 03:28:08 UTC (rev 213971)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-03-15 05:21:06 UTC (rev 213972)
</span><span class="lines">@@ -516,4 +516,8 @@
</span><span class="cx"> void disableTileSizeUpdateDelay();
</span><span class="cx">
</span><span class="cx"> [Conditional=WEBGL] void simulateWebGLContextChanged(WebGLRenderingContextBase context);
</span><ins>+
+ void observeMediaStreamTrack(MediaStreamTrack track);
+ readonly attribute unsigned long trackAudioSampleCount;
+ readonly attribute unsigned long trackVideoSampleCount;
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>