<!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>[183544] 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/183544">183544</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-29 06:13:00 -0700 (Wed, 29 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch to std::function<>, std::bind() in MediaPlayerPrivateAVFoundationObjC
https://bugs.webkit.org/show_bug.cgi?id=144232
Reviewed by Darin Adler.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
Replace uses of WTF::Function<> and WTF::bind() with the STL alternatives.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183543 => 183544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-29 12:43:55 UTC (rev 183543)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 13:13:00 UTC (rev 183544)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-29 Zan Dobersek <zdobersek@igalia.com>
+
+ Switch to std::function<>, std::bind() in MediaPlayerPrivateAVFoundationObjC
+ https://bugs.webkit.org/show_bug.cgi?id=144232
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
+ Replace uses of WTF::Function<> and WTF::bind() with the STL alternatives.
+
</ins><span class="cx"> 2015-04-29 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Fix crash in WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock().
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (183543 => 183544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-04-29 12:43:55 UTC (rev 183543)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-04-29 13:13:00 UTC (rev 183544)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> static void registerMediaEngine(MediaEngineRegistrar);
</span><span class="cx">
</span><del>- void setAsset(id);
</del><ins>+ void setAsset(RetainPtr<id>);
</ins><span class="cx"> virtual void tracksChanged() override;
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (183543 => 183544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-04-29 12:43:55 UTC (rev 183543)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-04-29 13:13:00 UTC (rev 183544)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #import "WebCoreAVFResourceLoader.h"
</span><span class="cx"> #import "WebCoreCALayerExtras.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><ins>+#import <functional>
</ins><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <runtime/DataView.h>
</span><span class="cx"> #import <runtime/JSCInlines.h>
</span><span class="lines">@@ -69,7 +70,6 @@
</span><span class="cx"> #import <runtime/Uint32Array.h>
</span><span class="cx"> #import <runtime/Uint8Array.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><del>-#import <wtf/Functional.h>
</del><span class="cx"> #import <wtf/ListHashSet.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx"> #import <wtf/text/CString.h>
</span><span class="lines">@@ -1448,7 +1448,7 @@
</span><span class="cx"> return m_cachedTotalBytes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateAVFoundationObjC::setAsset(id asset)
</del><ins>+void MediaPlayerPrivateAVFoundationObjC::setAsset(RetainPtr<id> asset)
</ins><span class="cx"> {
</span><span class="cx"> m_avAsset = asset;
</span><span class="cx"> }
</span><span class="lines">@@ -3193,74 +3193,74 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WTF::Function<void ()> function;
</del><ins>+ std::function<void ()> function;
</ins><span class="cx">
</span><span class="cx"> if (context == MediaPlayerAVFoundationObservationContextAVPlayerLayer) {
</span><span class="cx"> if ([keyPath isEqualToString:@"readyForDisplay"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::firstFrameAvailableDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::firstFrameAvailableDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (context == MediaPlayerAVFoundationObservationContextPlayerItemTrack) {
</span><span class="cx"> if ([keyPath isEqualToString:@"enabled"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::trackEnabledDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::trackEnabledDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (context == MediaPlayerAVFoundationObservationContextPlayerItem && willChange) {
</span><span class="cx"> if ([keyPath isEqualToString:@"playbackLikelyToKeepUp"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackLikelyToKeepUpWillChange, m_callback);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackLikelyToKeepUpWillChange, m_callback);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"playbackBufferEmpty"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferEmptyWillChange, m_callback);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferEmptyWillChange, m_callback);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"playbackBufferFull"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferFullWillChange, m_callback);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferFullWillChange, m_callback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (context == MediaPlayerAVFoundationObservationContextPlayerItem && !willChange) {
</span><span class="cx"> // A value changed for an AVPlayerItem
</span><span class="cx"> if ([keyPath isEqualToString:@"status"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playerItemStatusDidChange, m_callback, [newValue intValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playerItemStatusDidChange, m_callback, [newValue intValue]);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"playbackLikelyToKeepUp"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackLikelyToKeepUpDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackLikelyToKeepUpDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"playbackBufferEmpty"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferEmptyDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferEmptyDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"playbackBufferFull"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferFullDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackBufferFullDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"asset"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::setAsset, m_callback, RetainPtr<NSArray>(newValue));
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::setAsset, m_callback, RetainPtr<id>(newValue));
</ins><span class="cx"> else if ([keyPath isEqualToString:@"loadedTimeRanges"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::loadedTimeRangesDidChange, m_callback, RetainPtr<NSArray>(newValue));
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::loadedTimeRangesDidChange, m_callback, RetainPtr<NSArray>(newValue));
</ins><span class="cx"> else if ([keyPath isEqualToString:@"seekableTimeRanges"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::seekableTimeRangesDidChange, m_callback, RetainPtr<NSArray>(newValue));
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::seekableTimeRangesDidChange, m_callback, RetainPtr<NSArray>(newValue));
</ins><span class="cx"> else if ([keyPath isEqualToString:@"tracks"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::tracksDidChange, m_callback, RetainPtr<NSArray>(newValue));
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::tracksDidChange, m_callback, RetainPtr<NSArray>(newValue));
</ins><span class="cx"> else if ([keyPath isEqualToString:@"hasEnabledAudio"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::hasEnabledAudioDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::hasEnabledAudioDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"presentationSize"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::presentationSizeDidChange, m_callback, FloatSize([newValue sizeValue]));
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::presentationSizeDidChange, m_callback, FloatSize([newValue sizeValue]));
</ins><span class="cx"> else if ([keyPath isEqualToString:@"duration"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, toMediaTime([newValue CMTimeValue]));
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, toMediaTime([newValue CMTimeValue]));
</ins><span class="cx"> else if ([keyPath isEqualToString:@"timedMetadata"] && newValue) {
</span><span class="cx"> MediaTime now;
</span><span class="cx"> CMTime itemTime = [(AVPlayerItemType *)object currentTime];
</span><span class="cx"> if (CMTIME_IS_NUMERIC(itemTime))
</span><span class="cx"> now = std::max(toMediaTime(itemTime), MediaTime::zeroTime());
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue), now);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue), now);
</ins><span class="cx"> } else if ([keyPath isEqualToString:@"canPlayFastReverse"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::canPlayFastReverseDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::canPlayFastReverseDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> else if ([keyPath isEqualToString:@"canPlayFastForward"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::canPlayFastForwardDidChange, m_callback, [newValue boolValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::canPlayFastForwardDidChange, m_callback, [newValue boolValue]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (context == MediaPlayerAVFoundationObservationContextPlayer && !willChange) {
</span><span class="cx"> // A value changed for an AVPlayer.
</span><span class="cx"> if ([keyPath isEqualToString:@"rate"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::rateDidChange, m_callback, [newValue doubleValue]);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::rateDidChange, m_callback, [newValue doubleValue]);
</ins><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> else if ([keyPath isEqualToString:@"externalPlaybackActive"] || [keyPath isEqualToString:@"allowsExternalPlayback"])
</span><del>- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackTargetIsWirelessDidChange, m_callback);
</del><ins>+ function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackTargetIsWirelessDidChange, m_callback);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (function.isNull())
</del><ins>+ if (!function)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto weakThis = m_callback->createWeakPtr();
</span></span></pre>
</div>
</div>
</body>
</html>