<!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>[198696] 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/198696">198696</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-25 16:06:06 -0700 (Fri, 25 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a compile time flag for using QTKit
https://bugs.webkit.org/show_bug.cgi?id=155868
Patch by Alex Christensen <achristensen@webkit.org> on 2016-03-25
Reviewed by Daniel Bates.
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector):
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
* platform/graphics/mac/MediaTimeQTKit.h:
* platform/graphics/mac/MediaTimeQTKit.mm:
* platform/mac/WebVideoFullscreenController.mm:
(SOFT_LINK_CLASS):
(-[WebVideoFullscreenController setVideoElement:]):
(-[WebVideoFullscreenController updatePowerAssertions]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaTimeQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaTimeQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenControllermm">trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198695 => 198696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-25 23:04:02 UTC (rev 198695)
+++ trunk/Source/WebCore/ChangeLog 2016-03-25 23:06:06 UTC (rev 198696)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-25 Alex Christensen <achristensen@webkit.org>
+
+ Add a compile time flag for using QTKit
+ https://bugs.webkit.org/show_bug.cgi?id=155868
+
+ Reviewed by Daniel Bates.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::buildMediaEnginesVector):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ * platform/graphics/mac/MediaTimeQTKit.h:
+ * platform/graphics/mac/MediaTimeQTKit.mm:
+ * platform/mac/WebVideoFullscreenController.mm:
+ (SOFT_LINK_CLASS):
+ (-[WebVideoFullscreenController setVideoElement:]):
+ (-[WebVideoFullscreenController updatePowerAssertions]):
+
</ins><span class="cx"> 2016-03-25 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Autoscrolling from a drag selection does not work in full screen, or when the
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (198695 => 198696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-03-25 23:04:02 UTC (rev 198695)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-03-25 23:06:06 UTC (rev 198696)
</span><span class="lines">@@ -65,7 +65,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+#if USE(QTKIT)
</ins><span class="cx"> #include "MediaPlayerPrivateQTKit.h"
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> #include "MediaPlayerPrivateAVFoundationObjC.h"
</span><span class="lines">@@ -207,7 +209,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // USE(AVFOUNDATION)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && USE(QTKIT)
</ins><span class="cx"> if (Settings::isQTKitEnabled())
</span><span class="cx"> MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (198695 => 198696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-03-25 23:04:02 UTC (rev 198695)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-03-25 23:06:06 UTC (rev 198696)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO)
</del><ins>+#if ENABLE(VIDEO) && USE(QTKIT)
</ins><span class="cx">
</span><span class="cx"> #import "MediaPlayerPrivateQTKit.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaTimeQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h (198695 => 198696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h 2016-03-25 23:04:02 UTC (rev 198695)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h 2016-03-25 23:06:06 UTC (rev 198696)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef MediaTimeQTKit_h
</span><span class="cx"> #define MediaTimeQTKit_h
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && USE(QTKIT)
</ins><span class="cx">
</span><span class="cx"> #include <QTKit/QTTime.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaTimeQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm (198695 => 198696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm 2016-03-25 23:04:02 UTC (rev 198695)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm 2016-03-25 23:06:06 UTC (rev 198696)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MediaTimeQTKit.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && USE(QTKIT)
</ins><span class="cx">
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <QTKit/QTTime.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (198695 => 198696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2016-03-25 23:04:02 UTC (rev 198695)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2016-03-25 23:06:06 UTC (rev 198696)
</span><span class="lines">@@ -33,21 +33,21 @@
</span><span class="cx"> #import "WebWindowAnimation.h"
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="cx"> #import <Carbon/Carbon.h>
</span><del>-#import <QTKit/QTKit.h>
</del><span class="cx"> #import <WebCore/DisplaySleepDisabler.h>
</span><span class="cx"> #import <WebCore/HTMLVideoElement.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><del>-using namespace WebCore;
-
</del><ins>+#if USE(QTKIT)
+#import <QTKit/QTKit.h>
</ins><span class="cx"> SOFT_LINK_FRAMEWORK(QTKit)
</span><span class="cx"> SOFT_LINK_CLASS(QTKit, QTMovieLayer)
</span><del>-
</del><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieRateDidChangeNotification, NSString *)
</span><del>-
</del><span class="cx"> #define QTMovieRateDidChangeNotification getQTMovieRateDidChangeNotification()
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> SOFT_LINK_FRAMEWORK(AVFoundation)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVPlayerLayer)
</span><span class="cx">
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ([self isWindowLoaded]) {
</span><ins>+#if USE(QTKIT)
</ins><span class="cx"> if (_videoElement->platformMedia().type == PlatformMedia::QTMovieType) {
</span><span class="cx"> QTMovie *movie = _videoElement->platformMedia().media.qtMovie;
</span><span class="cx"> QTMovieLayer *layer = [allocQTMovieLayerInstance() init];
</span><span class="lines">@@ -138,7 +139,9 @@
</span><span class="cx"> name:QTMovieRateDidChangeNotification
</span><span class="cx"> object:movie];
</span><span class="cx">
</span><del>- } else if (_videoElement->platformMedia().type == PlatformMedia::AVFoundationMediaPlayerType) {
</del><ins>+ } else
+#endif
+ if (_videoElement->platformMedia().type == PlatformMedia::AVFoundationMediaPlayerType) {
</ins><span class="cx"> AVPlayer *player = _videoElement->platformMedia().media.avfMediaPlayer;
</span><span class="cx"> AVPlayerLayer *layer = [allocAVPlayerLayerInstance() init];
</span><span class="cx"> [self setupVideoOverlay:layer];
</span><span class="lines">@@ -357,6 +360,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)updatePowerAssertions
</span><span class="cx"> {
</span><ins>+#if USE(QTKIT)
</ins><span class="cx"> float rate = 0;
</span><span class="cx"> if (_videoElement && _videoElement->platformMedia().type == PlatformMedia::QTMovieType)
</span><span class="cx"> rate = [_videoElement->platformMedia().media.qtMovie rate];
</span><span class="lines">@@ -365,6 +369,7 @@
</span><span class="cx"> if (!_displaySleepDisabler)
</span><span class="cx"> _displaySleepDisabler = DisplaySleepDisabler::create("com.apple.WebCore - Fullscreen video");
</span><span class="cx"> } else
</span><ins>+#endif
</ins><span class="cx"> _displaySleepDisabler = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>