<!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>[179219] branches/safari-600.1.4.15-branch/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/179219">179219</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 14:31:02 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177591">r177591</a>. rdar://problem/19445895</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformFeatureCounterKeysh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179218 => 179219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-27 22:29:33 UTC (rev 179218)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-27 22:31:02 UTC (rev 179219)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-01-27 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177591
+
+ 2014-12-19 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log how often media element playback happens using FeatureCounter
+ https://bugs.webkit.org/show_bug.cgi?id=139819
+ <rdar://problem/19309988>
+
+ Reviewed by Eric Carlson.
+
+ Log using FeatureCounter how often we start loading for audio / video
+ elements, and how often they end up being played.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ Add flag to identify when a media element starts playing for the first
+ time.
+
+ (WebCore::HTMLMediaElement::loadResource):
+ Log when a media element starts loading.
+
+ (WebCore::HTMLMediaElement::updatePlayState):
+ Log when a media element starts playing for the first time.
+
+ * html/HTMLMediaElement.h:
+ Add flag to identify when a media element starts playing for the first
+ time.
+
+ * platform/FeatureCounterKeys.h:
+ Add FeatureCounter keys for HTMLMediaElement loading / playback.
+
+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r177581
</span><span class="cx">
</span><span class="cx"> 2014-12-19 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.cpp (179218 => 179219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-27 22:29:33 UTC (rev 179218)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-27 22:31:02 UTC (rev 179219)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><ins>+#include "FeatureCounter.h"
</ins><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -291,6 +292,7 @@
</span><span class="cx"> , m_actionAfterScan(Nothing)
</span><span class="cx"> , m_scanType(Scan)
</span><span class="cx"> , m_scanDirection(Forward)
</span><ins>+ , m_firstTimePlaying(true)
</ins><span class="cx"> , m_playing(false)
</span><span class="cx"> , m_isWaitingUntilMediaCanStart(false)
</span><span class="cx"> , m_shouldDelayLoadEvent(false)
</span><span class="lines">@@ -1199,6 +1201,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Log that we started loading a media element.
+ FEATURE_COUNTER_INCREMENT_KEY(document().page(), isVideo() ? FeatureCounterMediaVideoElementLoadingKey : FeatureCounterMediaAudioElementLoadingKey);
+ m_firstTimePlaying = true;
+
</ins><span class="cx"> // Set m_currentSrc *before* changing to the cache url, the fact that we are loading from the app
</span><span class="cx"> // cache is an internal detail not exposed through the media element API.
</span><span class="cx"> m_currentSrc = url;
</span><span class="lines">@@ -4544,6 +4550,12 @@
</span><span class="cx"> m_player->setRate(effectivePlaybackRate());
</span><span class="cx"> m_player->setMuted(muted());
</span><span class="cx">
</span><ins>+ if (m_firstTimePlaying) {
+ // Log that a media element was played.
+ FEATURE_COUNTER_INCREMENT_KEY(document().page(), isVideo() ? FeatureCounterMediaVideoElementPlayedKey : FeatureCounterMediaAudioElementPlayedKey);
+ m_firstTimePlaying = false;
+ }
+
</ins><span class="cx"> m_player->play();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.h (179218 => 179219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.h 2015-01-27 22:29:33 UTC (rev 179218)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLMediaElement.h 2015-01-27 22:31:02 UTC (rev 179219)
</span><span class="lines">@@ -795,6 +795,7 @@
</span><span class="cx"> ScanType m_scanType;
</span><span class="cx"> ScanDirection m_scanDirection;
</span><span class="cx">
</span><ins>+ bool m_firstTimePlaying : 1;
</ins><span class="cx"> bool m_playing : 1;
</span><span class="cx"> bool m_isWaitingUntilMediaCanStart : 1;
</span><span class="cx"> bool m_shouldDelayLoadEvent : 1;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h (179218 => 179219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-27 22:29:33 UTC (rev 179218)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-27 22:31:02 UTC (rev 179219)
</span><span class="lines">@@ -70,6 +70,12 @@
</span><span class="cx"> static const char FeatureCounterCachedResourceRevalidationReasonMustRevalidateIsExpiredKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.mustRevalidateIsExpired";
</span><span class="cx"> static const char FeatureCounterCachedResourceRevalidationReasonIsExpiredKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.isExpired";
</span><span class="cx">
</span><ins>+// Media playback.
+static const char FeatureCounterMediaVideoElementLoadingKey[] = "com.apple.WebKit.media.video.loading";
+static const char FeatureCounterMediaAudioElementLoadingKey[] = "com.apple.WebKit.media.audio.loading";
+static const char FeatureCounterMediaVideoElementPlayedKey[] = "com.apple.WebKit.media.video.played";
+static const char FeatureCounterMediaAudioElementPlayedKey[] = "com.apple.WebKit.media.audio.played";
+
</ins><span class="cx"> // Navigation types.
</span><span class="cx"> static const char FeatureCounterNavigationStandard[] = "com.apple.WebKit.navigation.standard";
</span><span class="cx"> static const char FeatureCounterNavigationBack[] = "com.apple.WebKit.navigation.back";
</span></span></pre>
</div>
</div>
</body>
</html>