<!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>[174079] 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/174079">174079</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-09-29 12:29:53 -0700 (Mon, 29 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Remove MediaPlayerPrivateQTKit frame rate code
https://bugs.webkit.org/show_bug.cgi?id=137217
Reviewed by Carlos Garcia Campos.
No new tests, this removes obsolete code.
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit):
(WebCore::MediaPlayerPrivateQTKit::play):
(WebCore::MediaPlayerPrivateQTKit::pause):
(WebCore::MediaPlayerPrivateQTKit::didEnd):
(WebCore::MediaPlayerPrivateQTKit::repaint):
(WebCore::MediaPlayerPrivateQTKit::paint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174078 => 174079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-29 19:26:23 UTC (rev 174078)
+++ trunk/Source/WebCore/ChangeLog 2014-09-29 19:29:53 UTC (rev 174079)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-29 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Remove MediaPlayerPrivateQTKit frame rate code
+ https://bugs.webkit.org/show_bug.cgi?id=137217
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests, this removes obsolete code.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::MediaPlayerPrivateQTKit):
+ (WebCore::MediaPlayerPrivateQTKit::play):
+ (WebCore::MediaPlayerPrivateQTKit::pause):
+ (WebCore::MediaPlayerPrivateQTKit::didEnd):
+ (WebCore::MediaPlayerPrivateQTKit::repaint):
+ (WebCore::MediaPlayerPrivateQTKit::paint):
+
</ins><span class="cx"> 2014-09-29 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: in an aria-labelledby computation, do not traverse into elements whose nameFrom value does not include 'contents'
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (174078 => 174079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-09-29 19:26:23 UTC (rev 174078)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-09-29 19:29:53 UTC (rev 174079)
</span><span class="lines">@@ -47,10 +47,6 @@
</span><span class="cx"> OBJC_CLASS QTVideoRendererWebKitOnly;
</span><span class="cx"> OBJC_CLASS WebCoreMovieObserver;
</span><span class="cx">
</span><del>-#ifndef DRAW_FRAME_RATE
-#define DRAW_FRAME_RATE 0
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MediaPlayerPrivateQTKit : public MediaPlayerPrivateInterface {
</span><span class="lines">@@ -209,11 +205,6 @@
</span><span class="cx"> bool m_isAllowedToRender;
</span><span class="cx"> bool m_privateBrowsing;
</span><span class="cx"> mutable MediaTime m_maxTimeLoadedAtLastDidLoadingProgress;
</span><del>-#if DRAW_FRAME_RATE
- int m_frameCountWhilePlaying;
- MediaTime m_timeStartedPlaying;
- MediaTime m_timeStoppedPlaying;
-#endif
</del><span class="cx"> mutable FloatSize m_cachedNaturalSize;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (174078 => 174079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-09-29 19:26:23 UTC (rev 174078)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-09-29 19:29:53 UTC (rev 174079)
</span><span class="lines">@@ -47,13 +47,6 @@
</span><span class="cx"> #import <QTKit/QTKit.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><del>-#if DRAW_FRAME_RATE
-#import "Font.h"
-#import "Document.h"
-#import "RenderStyle.h"
-#import "RenderView.h"
-#endif
-
</del><span class="cx"> SOFT_LINK_FRAMEWORK(QTKit)
</span><span class="cx">
</span><span class="cx"> SOFT_LINK(QTKit, QTMakeTime, QTTime, (long long timeValue, long timeScale), (timeValue, timeScale))
</span><span class="lines">@@ -217,11 +210,6 @@
</span><span class="cx"> , m_videoFrameHasDrawn(false)
</span><span class="cx"> , m_isAllowedToRender(false)
</span><span class="cx"> , m_privateBrowsing(false)
</span><del>-#if DRAW_FRAME_RATE
- , m_frameCountWhilePlaying(0)
- , m_timeStartedPlaying(0)
- , m_timeStoppedPlaying(0)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -689,9 +677,6 @@
</span><span class="cx"> if (!metaDataAvailable())
</span><span class="cx"> return;
</span><span class="cx"> m_startedPlaying = true;
</span><del>-#if DRAW_FRAME_RATE
- m_frameCountWhilePlaying = 0;
-#endif
</del><span class="cx"> [m_objcObserver.get() setDelayCallbacks:YES];
</span><span class="cx"> [m_qtMovie.get() setRate:m_player->rate()];
</span><span class="cx"> [m_objcObserver.get() setDelayCallbacks:NO];
</span><span class="lines">@@ -703,9 +688,6 @@
</span><span class="cx"> if (!metaDataAvailable())
</span><span class="cx"> return;
</span><span class="cx"> m_startedPlaying = false;
</span><del>-#if DRAW_FRAME_RATE
- m_timeStoppedPlaying = [NSDate timeIntervalSinceReferenceDate];
-#endif
</del><span class="cx"> [m_objcObserver.get() setDelayCallbacks:YES];
</span><span class="cx"> [m_qtMovie.get() stop];
</span><span class="cx"> [m_objcObserver.get() setDelayCallbacks:NO];
</span><span class="lines">@@ -1217,9 +1199,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_startedPlaying = false;
</span><del>-#if DRAW_FRAME_RATE
- m_timeStoppedPlaying = [NSDate timeIntervalSinceReferenceDate];
-#endif
</del><span class="cx">
</span><span class="cx"> // Hang onto the current time and use it as duration from now on since QuickTime is telling us we
</span><span class="cx"> // are at the end. Do this because QuickTime sometimes reports one time for duration and stops
</span><span class="lines">@@ -1279,15 +1258,6 @@
</span><span class="cx"> if (m_hasUnsupportedTracks)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if DRAW_FRAME_RATE
- if (m_startedPlaying) {
- m_frameCountWhilePlaying++;
- // to eliminate preroll costs from our calculation,
- // our frame rate calculation excludes the first frame drawn after playback starts
- if (1==m_frameCountWhilePlaying)
- m_timeStartedPlaying = [NSDate timeIntervalSinceReferenceDate];
- }
-#endif
</del><span class="cx"> m_videoFrameHasDrawn = true;
</span><span class="cx"> m_player->repaint();
</span><span class="cx"> }
</span><span class="lines">@@ -1359,28 +1329,6 @@
</span><span class="cx"> [view displayRectIgnoringOpacity:paintRect inContext:newContext];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if DRAW_FRAME_RATE
- // Draw the frame rate only after having played more than 10 frames.
- if (m_frameCountWhilePlaying > 10) {
- Frame* frame = m_player->frameView() ? &m_player->frameView()->frame() : nullptr;
- Document* document = frame ? frame->document() : nullptr;
- auto renderer = document ? document->renderView() : nullptr;
- RenderStyle* styleToUse = renderer ? renderer->style() : nullptr;
- if (styleToUse) {
- double frameRate = (m_frameCountWhilePlaying - 1) / ( m_startedPlaying ? ([NSDate timeIntervalSinceReferenceDate] - m_timeStartedPlaying) :
- (m_timeStoppedPlaying - m_timeStartedPlaying) );
- String text = String::format("%1.2f", frameRate);
- TextRun textRun(text.characters(), text.length());
- const Color color(255, 0, 0);
- context->scale(FloatSize(1.0f, -1.0f));
- context->setStrokeColor(color, styleToUse->colorSpace());
- context->setStrokeStyle(SolidStroke);
- context->setStrokeThickness(1.0f);
- context->setFillColor(color, styleToUse->colorSpace());
- context->drawText(styleToUse->font(), textRun, IntPoint(2, -3));
- }
- }
-#endif
</del><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> [m_objcObserver.get() setDelayCallbacks:NO];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>