<!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>[185923] 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/185923">185923</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-24 13:48:13 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable -Winconsistent-missing-override when building with Xcode
https://bugs.webkit.org/show_bug.cgi?id=146288
Reviewed by Sam Weinig.
* Configurations/Base.xcconfig:
* Modules/encryptedmedia/MediaKeySession.h:
* Modules/webdatabase/DatabaseTask.h:
* html/DateTimeLocalInputType.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.h:
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
(WebCore::MediaPlayerPrivateAVFoundation::platformLayer): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::supportsScanning): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::fileSize): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::engineDescription): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::platformErrorCode): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::notifyTrackModeChanged): Deleted.
* platform/graphics/avfoundation/VideoTrackPrivateAVF.h:
(WebCore::VideoTrackPrivateAVF::trackIndex): Deleted.
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
(WebCore::CDMSessionAVFoundationObjC::type): Deleted.
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
(WebCore::CDMSessionMediaSourceAVFObjC::type): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsAcceleratedRendering): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::canPlayToWirelessPlaybackTarget): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedCredential): Deleted.
(WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedRequestToContinueWithoutCredential): Deleted.
(WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedCancellation): Deleted.
(WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedRequestToPerformDefaultHandling): Deleted.
(WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedChallengeRejection): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsFullscreen): Deleted.
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
(WebCore::MediaPlayerPrivateQTKit::supportsScanning): Deleted.
(WebCore::MediaPlayerPrivateQTKit::networkState): Deleted.
(WebCore::MediaPlayerPrivateQTKit::readyState): Deleted.
(WebCore::MediaPlayerPrivateQTKit::maximumDurationToCacheMediaTime): Deleted.
(WebCore::MediaPlayerPrivateQTKit::engineDescription): Deleted.
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/SerializedPlatformRepresentationMac.h:
(WebCore::SerializedPlatformRepresentationMac::platformType): Deleted.
* platform/mac/ThemeMac.h:
(WebCore::ThemeMac::controlRequiresPreWhiteSpace): Deleted.
* testing/MockCDM.cpp:
(WebCore::MockCDMSession::setClient): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h</a></li>
<li><a href="#trunkSourceWebCorehtmlDateTimeLocalInputTypeh">trunk/Source/WebCore/html/DateTimeLocalInputType.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationVideoTrackPrivateAVFh">trunk/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h</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>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMach">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMach">trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMach">trunk/Source/WebCore/platform/mac/ThemeMac.h</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMcpp">trunk/Source/WebCore/testing/MockCDM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/ChangeLog 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2015-06-24 Anders Carlsson <andersca@apple.com>
+
+ Enable -Winconsistent-missing-override when building with Xcode
+ https://bugs.webkit.org/show_bug.cgi?id=146288
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/Base.xcconfig:
+ * Modules/encryptedmedia/MediaKeySession.h:
+ * Modules/webdatabase/DatabaseTask.h:
+ * html/DateTimeLocalInputType.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ (WebCore::MediaPlayerPrivateAVFoundation::platformLayer): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundation::supportsScanning): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundation::fileSize): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundation::engineDescription): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundation::platformErrorCode): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundation::notifyTrackModeChanged): Deleted.
+ * platform/graphics/avfoundation/VideoTrackPrivateAVF.h:
+ (WebCore::VideoTrackPrivateAVF::trackIndex): Deleted.
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
+ (WebCore::CDMSessionAVFoundationObjC::type): Deleted.
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+ (WebCore::CDMSessionMediaSourceAVFObjC::type): Deleted.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsAcceleratedRendering): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::canPlayToWirelessPlaybackTarget): Deleted.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedCredential): Deleted.
+ (WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedRequestToContinueWithoutCredential): Deleted.
+ (WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedCancellation): Deleted.
+ (WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedRequestToPerformDefaultHandling): Deleted.
+ (WebCore::WebCoreNSURLAuthenticationChallengeClient::receivedChallengeRejection): Deleted.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsFullscreen): Deleted.
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ (WebCore::MediaPlayerPrivateQTKit::supportsScanning): Deleted.
+ (WebCore::MediaPlayerPrivateQTKit::networkState): Deleted.
+ (WebCore::MediaPlayerPrivateQTKit::readyState): Deleted.
+ (WebCore::MediaPlayerPrivateQTKit::maximumDurationToCacheMediaTime): Deleted.
+ (WebCore::MediaPlayerPrivateQTKit::engineDescription): Deleted.
+ * platform/mac/ScrollAnimatorMac.h:
+ * platform/mac/SerializedPlatformRepresentationMac.h:
+ (WebCore::SerializedPlatformRepresentationMac::platformType): Deleted.
+ * platform/mac/ThemeMac.h:
+ (WebCore::ThemeMac::controlRequiresPreWhiteSpace): Deleted.
+ * testing/MockCDM.cpp:
+ (WebCore::MockCDMSession::setClient): Deleted.
+
</ins><span class="cx"> 2015-06-24 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Improve JSDOMPromise callPromiseFunction naming
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx"> PREBINDING = NO;
</span><del>-WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option -Wno-inconsistent-missing-override;
</del><ins>+WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
</ins><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -85,9 +85,9 @@
</span><span class="cx"> void addKeyTimerFired();
</span><span class="cx">
</span><span class="cx"> // CDMSessionClient
</span><del>- virtual void sendMessage(Uint8Array*, String destinationURL);
- virtual void sendError(MediaKeyErrorCode, unsigned long systemCode);
- virtual String mediaKeysStorageDirectory() const;
</del><ins>+ virtual void sendMessage(Uint8Array*, String destinationURL) override;
+ virtual void sendError(MediaKeyErrorCode, unsigned long systemCode) override;
+ virtual String mediaKeysStorageDirectory() const override;
</ins><span class="cx">
</span><span class="cx"> MediaKeys* m_keys;
</span><span class="cx"> String m_keySystem;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -107,9 +107,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void doPerformTask();
</del><ins>+ virtual void doPerformTask() override;
</ins><span class="cx"> #if !LOG_DISABLED
</span><del>- virtual const char* debugTaskName() const;
</del><ins>+ virtual const char* debugTaskName() const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_setVersionInNewDatabase;
</span><span class="lines">@@ -127,9 +127,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void doPerformTask();
</del><ins>+ virtual void doPerformTask() override;
</ins><span class="cx"> #if !LOG_DISABLED
</span><del>- virtual const char* debugTaskName() const;
</del><ins>+ virtual const char* debugTaskName() const override;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -145,9 +145,9 @@
</span><span class="cx"> SQLTransactionBackend* transaction() const { return m_transaction.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void doPerformTask();
</del><ins>+ virtual void doPerformTask() override;
</ins><span class="cx"> #if !LOG_DISABLED
</span><del>- virtual const char* debugTaskName() const;
</del><ins>+ virtual const char* debugTaskName() const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<SQLTransactionBackend> m_transaction;
</span><span class="lines">@@ -163,9 +163,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void doPerformTask();
</del><ins>+ virtual void doPerformTask() override;
</ins><span class="cx"> #if !LOG_DISABLED
</span><del>- virtual const char* debugTaskName() const;
</del><ins>+ virtual const char* debugTaskName() const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Vector<String>& m_tableNames;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDateTimeLocalInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DateTimeLocalInputType.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DateTimeLocalInputType.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/html/DateTimeLocalInputType.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> virtual DateComponents::Type dateType() const override;
</span><span class="cx"> virtual double valueAsDate() const override;
</span><span class="cx"> virtual void setValueAsDate(double, ExceptionCode&) const override;
</span><del>- virtual StepRange createStepRange(AnyStepHandling) const;
</del><ins>+ virtual StepRange createStepRange(AnyStepHandling) const override;
</ins><span class="cx"> virtual bool parseToDateComponentsInternal(const UChar*, unsigned length, DateComponents*) const override;
</span><span class="cx"> virtual bool setMillisecondToDateComponents(double, DateComponents*) const override;
</span><span class="cx"> virtual bool isDateTimeLocalField() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> explicit ScrollingCoordinatorIOS(Page*);
</span><span class="cx"> virtual ~ScrollingCoordinatorIOS();
</span><span class="cx">
</span><del>- virtual void pageDestroyed();
</del><ins>+ virtual void pageDestroyed() override;
</ins><span class="cx">
</span><span class="cx"> virtual void commitTreeStateIfNeeded() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> explicit ScrollingCoordinatorMac(Page*);
</span><span class="cx"> virtual ~ScrollingCoordinatorMac();
</span><span class="cx">
</span><del>- virtual void pageDestroyed();
</del><ins>+ virtual void pageDestroyed() override;
</ins><span class="cx">
</span><span class="cx"> virtual void commitTreeStateIfNeeded() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -150,15 +150,15 @@
</span><span class="cx"> // MediaPlayerPrivatePrivateInterface overrides.
</span><span class="cx"> virtual void load(const String& url) override;
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String&, MediaSourcePrivateClient*);
</del><ins>+ virtual void load(const String&, MediaSourcePrivateClient*) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> virtual void load(MediaStreamPrivate*) { }
</span><span class="cx"> #endif
</span><del>- virtual void cancelLoad() = 0;
</del><ins>+ virtual void cancelLoad() override = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void prepareToPlay() override;
</span><del>- virtual PlatformMedia platformMedia() const = 0;
</del><ins>+ virtual PlatformMedia platformMedia() const override = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void play() override;
</span><span class="cx"> virtual void pause() override;
</span><span class="lines">@@ -168,14 +168,14 @@
</span><span class="cx"> virtual bool hasAudio() const override { return m_cachedHasAudio; }
</span><span class="cx"> virtual void setVisible(bool) override;
</span><span class="cx"> virtual MediaTime durationMediaTime() const override;
</span><del>- virtual MediaTime currentMediaTime() const = 0;
</del><ins>+ virtual MediaTime currentMediaTime() const override = 0;
</ins><span class="cx"> virtual void seek(const MediaTime&) override;
</span><span class="cx"> virtual void seekWithTolerance(const MediaTime&, const MediaTime&, const MediaTime&) override;
</span><span class="cx"> virtual bool seeking() const override;
</span><span class="cx"> virtual bool paused() const override;
</span><del>- virtual void setVolume(float) = 0;
</del><ins>+ virtual void setVolume(float) override = 0;
</ins><span class="cx"> virtual bool hasClosedCaptions() const override { return m_cachedHasCaptions; }
</span><del>- virtual void setClosedCaptionsVisible(bool) = 0;
</del><ins>+ virtual void setClosedCaptionsVisible(bool) override = 0;
</ins><span class="cx"> virtual MediaPlayer::NetworkState networkState() const override { return m_networkState; }
</span><span class="cx"> virtual MediaPlayer::ReadyState readyState() const override { return m_readyState; }
</span><span class="cx"> virtual MediaTime maxMediaTimeSeekable() const override;
</span><span class="lines">@@ -183,22 +183,22 @@
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> buffered() const override;
</span><span class="cx"> virtual bool didLoadingProgress() const override;
</span><span class="cx"> virtual void setSize(const IntSize&) override;
</span><del>- virtual void paint(GraphicsContext*, const FloatRect&) = 0;
- virtual void paintCurrentFrameInContext(GraphicsContext*, const FloatRect&) = 0;
</del><ins>+ virtual void paint(GraphicsContext*, const FloatRect&) override = 0;
+ virtual void paintCurrentFrameInContext(GraphicsContext*, const FloatRect&) override = 0;
</ins><span class="cx"> virtual void setPreload(MediaPlayer::Preload) override;
</span><del>- virtual PlatformLayer* platformLayer() const { return 0; }
- virtual bool supportsAcceleratedRendering() const = 0;
</del><ins>+ virtual PlatformLayer* platformLayer() const override { return 0; }
+ virtual bool supportsAcceleratedRendering() const override = 0;
</ins><span class="cx"> virtual void acceleratedRenderingStateChanged() override;
</span><span class="cx"> virtual bool shouldMaintainAspectRatio() const override { return m_shouldMaintainAspectRatio; }
</span><span class="cx"> virtual void setShouldMaintainAspectRatio(bool) override;
</span><span class="cx"> virtual bool canSaveMediaData() const override;
</span><span class="cx">
</span><del>- virtual MediaPlayer::MovieLoadType movieLoadType() const;
- virtual void prepareForRendering();
</del><ins>+ virtual MediaPlayer::MovieLoadType movieLoadType() const override;
+ virtual void prepareForRendering() override;
</ins><span class="cx">
</span><del>- virtual bool supportsFullscreen() const;
- virtual bool supportsScanning() const { return true; }
- unsigned long long fileSize() const { return totalBytes(); }
</del><ins>+ virtual bool supportsFullscreen() const override;
+ virtual bool supportsScanning() const override { return true; }
+ unsigned long long fileSize() const override { return totalBytes(); }
</ins><span class="cx">
</span><span class="cx"> // Required interfaces for concrete derived classes.
</span><span class="cx"> virtual void createAVAssetForURL(const String&) = 0;
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> virtual void platformPause() = 0;
</span><span class="cx"> virtual void checkPlayability() = 0;
</span><span class="cx"> virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance) = 0;
</span><del>- virtual unsigned long long totalBytes() const = 0;
</del><ins>+ virtual unsigned long long totalBytes() const override = 0;
</ins><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const = 0;
</span><span class="cx"> virtual MediaTime platformMaxTimeSeekable() const = 0;
</span><span class="cx"> virtual MediaTime platformMinTimeSeekable() const = 0;
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> virtual void createVideoLayer() = 0;
</span><span class="cx"> virtual void destroyVideoLayer() = 0;
</span><span class="cx">
</span><del>- virtual bool hasAvailableVideoFrame() const = 0;
</del><ins>+ virtual bool hasAvailableVideoFrame() const override = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool hasContextRenderer() const = 0;
</span><span class="cx"> virtual bool hasLayerRenderer() const = 0;
</span><span class="lines">@@ -291,12 +291,12 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer* player() { return m_player; }
</span><span class="cx">
</span><del>- virtual String engineDescription() const { return "AVFoundation"; }
- virtual long platformErrorCode() const { return assetErrorCode(); }
</del><ins>+ virtual String engineDescription() const override { return "AVFoundation"; }
+ virtual long platformErrorCode() const override { return assetErrorCode(); }
</ins><span class="cx">
</span><span class="cx"> virtual void trackModeChanged() override;
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><del>- virtual void notifyTrackModeChanged() { }
</del><ins>+ virtual void notifyTrackModeChanged() override { }
</ins><span class="cx"> virtual void synchronizeTextTrackState() { }
</span><span class="cx"> #endif
</span><span class="cx"> void processNewAndRemovedTextTracks(const Vector<RefPtr<InbandTextTrackPrivateAVF>>&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationVideoTrackPrivateAVFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(VideoTrackPrivateAVF)
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- virtual int trackIndex() const { return m_index; }
</del><ins>+ virtual int trackIndex() const override { return m_index; }
</ins><span class="cx"> virtual Kind kind() const override { return m_kind; }
</span><span class="cx"> virtual AtomicString id() const override { return m_id; }
</span><span class="cx"> virtual AtomicString label() const override { return m_label; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> CDMSessionAVFoundationObjC(MediaPlayerPrivateAVFoundationObjC* parent);
</span><span class="cx"> virtual ~CDMSessionAVFoundationObjC() { }
</span><span class="cx">
</span><del>- virtual CDMSessionType type() { return CDMSessionTypeAVFoundationObjC; }
</del><ins>+ virtual CDMSessionType type() override { return CDMSessionTypeAVFoundationObjC; }
</ins><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><span class="cx"> virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -42,15 +42,15 @@
</span><span class="cx"> CDMSessionMediaSourceAVFObjC(const Vector<int>& protocolVersions);
</span><span class="cx"> virtual ~CDMSessionMediaSourceAVFObjC();
</span><span class="cx">
</span><del>- virtual CDMSessionType type() { return CDMSessionTypeMediaSourceAVFObjC; }
</del><ins>+ virtual CDMSessionType type() override { return CDMSessionTypeMediaSourceAVFObjC; }
</ins><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><span class="cx"> virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx"> virtual void releaseKeys() override;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx">
</span><del>- virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *, bool& shouldIgnore);
- virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *, bool& shouldIgnore);
</del><ins>+ virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *, bool& shouldIgnore) override;
+ virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *, bool& shouldIgnore) override;
</ins><span class="cx">
</span><span class="cx"> void setStreamSession(AVStreamSession *);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> void canPlayFastReverseDidChange(bool);
</span><span class="cx"> void canPlayFastForwardDidChange(bool);
</span><span class="cx">
</span><del>- virtual void setShouldBufferData(bool);
</del><ins>+ virtual void setShouldBufferData(bool) override;
</ins><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><span class="cx"> void outputMediaDataWillChange(AVPlayerItemVideoOutput*);
</span><span class="lines">@@ -142,70 +142,70 @@
</span><span class="cx">
</span><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span><del>- virtual void cancelLoad();
</del><ins>+ virtual void cancelLoad() override;
</ins><span class="cx">
</span><del>- virtual PlatformMedia platformMedia() const;
</del><ins>+ virtual PlatformMedia platformMedia() const override;
</ins><span class="cx">
</span><del>- virtual void platformSetVisible(bool);
- virtual void platformPlay();
- virtual void platformPause();
</del><ins>+ virtual void platformSetVisible(bool) override;
+ virtual void platformPlay() override;
+ virtual void platformPause() override;
</ins><span class="cx"> virtual MediaTime currentMediaTime() const override;
</span><del>- virtual void setVolume(float);
- virtual void setClosedCaptionsVisible(bool);
- virtual void paint(GraphicsContext*, const FloatRect&);
- virtual void paintCurrentFrameInContext(GraphicsContext*, const FloatRect&);
- virtual PlatformLayer* platformLayer() const;
</del><ins>+ virtual void setVolume(float) override;
+ virtual void setClosedCaptionsVisible(bool) override;
+ virtual void paint(GraphicsContext*, const FloatRect&) override;
+ virtual void paintCurrentFrameInContext(GraphicsContext*, const FloatRect&) override;
+ virtual PlatformLayer* platformLayer() const override;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void setVideoFullscreenLayer(PlatformLayer*);
- virtual void setVideoFullscreenFrame(FloatRect);
- virtual void setVideoFullscreenGravity(MediaPlayer::VideoGravity);
</del><ins>+ virtual void setVideoFullscreenLayer(PlatformLayer*) override;
+ virtual void setVideoFullscreenFrame(FloatRect) override;
+ virtual void setVideoFullscreenGravity(MediaPlayer::VideoGravity) override;
</ins><span class="cx"> virtual void setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode) override;
</span><span class="cx">
</span><span class="cx"> virtual NSArray *timedMetadata() const override;
</span><del>- virtual String accessLog() const;
- virtual String errorLog() const;
</del><ins>+ virtual String accessLog() const override;
+ virtual String errorLog() const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool supportsAcceleratedRendering() const { return true; }
- virtual MediaTime mediaTimeForTimeValue(const MediaTime&) const;
- virtual double maximumDurationToCacheMediaTime() const;
</del><ins>+ virtual bool supportsAcceleratedRendering() const override { return true; }
+ virtual MediaTime mediaTimeForTimeValue(const MediaTime&) const override;
+ virtual double maximumDurationToCacheMediaTime() const override;
</ins><span class="cx">
</span><del>- virtual void createAVPlayer();
- virtual void createAVPlayerItem();
</del><ins>+ virtual void createAVPlayer() override;
+ virtual void createAVPlayerItem() override;
</ins><span class="cx"> virtual void createAVPlayerLayer();
</span><del>- virtual void createAVAssetForURL(const String& url);
- virtual MediaPlayerPrivateAVFoundation::ItemStatus playerItemStatus() const;
- virtual MediaPlayerPrivateAVFoundation::AssetStatus assetStatus() const;
- virtual long assetErrorCode() const;
</del><ins>+ virtual void createAVAssetForURL(const String& url) override;
+ virtual MediaPlayerPrivateAVFoundation::ItemStatus playerItemStatus() const override;
+ virtual MediaPlayerPrivateAVFoundation::AssetStatus assetStatus() const override;
+ virtual long assetErrorCode() const override;
</ins><span class="cx">
</span><del>- virtual void checkPlayability();
</del><ins>+ virtual void checkPlayability() override;
</ins><span class="cx"> virtual void setRateDouble(double) override;
</span><del>- virtual double rate() const;
</del><ins>+ virtual double rate() const override;
</ins><span class="cx"> void setPreservesPitch(bool) override;
</span><del>- virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance);
- virtual unsigned long long totalBytes() const;
- virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const;
- virtual MediaTime platformMinTimeSeekable() const;
- virtual MediaTime platformMaxTimeSeekable() const;
- virtual MediaTime platformDuration() const;
- virtual MediaTime platformMaxTimeLoaded() const;
- virtual void beginLoadingMetadata();
- virtual void sizeChanged();
</del><ins>+ virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance) override;
+ virtual unsigned long long totalBytes() const override;
+ virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const override;
+ virtual MediaTime platformMinTimeSeekable() const override;
+ virtual MediaTime platformMaxTimeSeekable() const override;
+ virtual MediaTime platformDuration() const override;
+ virtual MediaTime platformMaxTimeLoaded() const override;
+ virtual void beginLoadingMetadata() override;
+ virtual void sizeChanged() override;
</ins><span class="cx">
</span><del>- virtual bool hasAvailableVideoFrame() const;
</del><ins>+ virtual bool hasAvailableVideoFrame() const override;
</ins><span class="cx">
</span><del>- virtual void createContextVideoRenderer();
- virtual void destroyContextVideoRenderer();
</del><ins>+ virtual void createContextVideoRenderer() override;
+ virtual void destroyContextVideoRenderer() override;
</ins><span class="cx">
</span><del>- virtual void createVideoLayer();
- virtual void destroyVideoLayer();
</del><ins>+ virtual void createVideoLayer() override;
+ virtual void destroyVideoLayer() override;
</ins><span class="cx">
</span><del>- virtual bool hasContextRenderer() const;
- virtual bool hasLayerRenderer() const;
</del><ins>+ virtual bool hasContextRenderer() const override;
+ virtual bool hasLayerRenderer() const override;
</ins><span class="cx">
</span><span class="cx"> virtual void updateVideoLayerGravity() override;
</span><span class="cx">
</span><del>- virtual bool hasSingleSecurityOrigin() const;
</del><ins>+ virtual bool hasSingleSecurityOrigin() const override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual bool requiresTextTrackRepresentation() const override;
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> void setAVPlayerItem(AVPlayerItem *);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
</span><del>- virtual AudioSourceProvider* audioSourceProvider();
</del><ins>+ virtual AudioSourceProvider* audioSourceProvider() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void createImageGenerator();
</span><span class="lines">@@ -236,13 +236,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><del>- virtual MediaPlayer::MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&);
- virtual MediaPlayer::MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned);
- virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&);
</del><ins>+ virtual MediaPlayer::MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) override;
+ virtual MediaPlayer::MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) override;
+ virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><del>- std::unique_ptr<CDMSession> createSession(const String& keySystem);
</del><ins>+ std::unique_ptr<CDMSession> createSession(const String& keySystem) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual String languageOfPrimaryAudioTrack() const override;
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> virtual MediaPlayer::WirelessPlaybackTargetType wirelessPlaybackTargetType() const override;
</span><span class="cx"> virtual bool wirelessVideoPlaybackDisabled() const override;
</span><span class="cx"> virtual void setWirelessVideoPlaybackDisabled(bool) override;
</span><del>- virtual bool canPlayToWirelessPlaybackTarget() const { return true; }
</del><ins>+ virtual bool canPlayToWirelessPlaybackTarget() const override { return true; }
</ins><span class="cx"> void updateDisableExternalPlayback();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -414,28 +414,28 @@
</span><span class="cx"> virtual void refAuthenticationClient() override { ref(); }
</span><span class="cx"> virtual void derefAuthenticationClient() override { deref(); }
</span><span class="cx">
</span><del>- virtual void receivedCredential(const AuthenticationChallenge&, const Credential& credential)
</del><ins>+ virtual void receivedCredential(const AuthenticationChallenge&, const Credential& credential) override
</ins><span class="cx"> {
</span><span class="cx"> [[m_challenge sender] useCredential:credential.nsCredential() forAuthenticationChallenge:m_challenge.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
</del><ins>+ virtual void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&) override
</ins><span class="cx"> {
</span><span class="cx"> [[m_challenge sender] continueWithoutCredentialForAuthenticationChallenge:m_challenge.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void receivedCancellation(const AuthenticationChallenge&)
</del><ins>+ virtual void receivedCancellation(const AuthenticationChallenge&) override
</ins><span class="cx"> {
</span><span class="cx"> [[m_challenge sender] cancelAuthenticationChallenge:m_challenge.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
</del><ins>+ virtual void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&) override
</ins><span class="cx"> {
</span><span class="cx"> if ([[m_challenge sender] respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)])
</span><span class="cx"> [[m_challenge sender] performDefaultHandlingForAuthenticationChallenge:m_challenge.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void receivedChallengeRejection(const AuthenticationChallenge&)
</del><ins>+ virtual void receivedChallengeRejection(const AuthenticationChallenge&) override
</ins><span class="cx"> {
</span><span class="cx"> if ([[m_challenge sender] respondsToSelector:@selector(rejectProtectionSpaceAndContinueWithChallenge:)])
</span><span class="cx"> [[m_challenge sender] rejectProtectionSpaceAndContinueWithChallenge:m_challenge.get()];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> virtual PlatformMedia platformMedia() const override;
</span><span class="cx"> virtual PlatformLayer* platformLayer() const override;
</span><span class="cx">
</span><del>- virtual bool supportsFullscreen() const { return true; }
</del><ins>+ virtual bool supportsFullscreen() const override { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void play() override;
</span><span class="cx"> void playInternal();
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual bool isCurrentPlaybackTargetWireless() const override;
</span><del>- virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) override;
</span><span class="cx"> bool wirelessVideoPlaybackDisabled() const override { return false; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -73,69 +73,69 @@
</span><span class="cx"> static void clearMediaCacheForSite(const String&);
</span><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span><del>- PlatformMedia platformMedia() const;
- PlatformLayer* platformLayer() const;
</del><ins>+ PlatformMedia platformMedia() const override;
+ PlatformLayer* platformLayer() const override;
</ins><span class="cx">
</span><span class="cx"> FloatSize naturalSize() const override;
</span><del>- bool hasVideo() const;
- bool hasAudio() const;
- bool supportsFullscreen() const;
- virtual bool supportsScanning() const { return true; }
</del><ins>+ bool hasVideo() const override;
+ bool hasAudio() const override;
+ bool supportsFullscreen() const override;
+ virtual bool supportsScanning() const override { return true; }
</ins><span class="cx">
</span><del>- void load(const String& url);
</del><ins>+ void load(const String& url) override;
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String&, MediaSourcePrivateClient*);
</del><ins>+ virtual void load(const String&, MediaSourcePrivateClient*) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> virtual void load(MediaStreamPrivate*) { }
</span><span class="cx"> #endif
</span><del>- void cancelLoad();
</del><ins>+ void cancelLoad() override;
</ins><span class="cx"> void loadInternal(const String& url);
</span><span class="cx"> void resumeLoad();
</span><span class="cx">
</span><del>- void play();
- void pause();
- void prepareToPlay();
</del><ins>+ void play() override;
+ void pause() override;
+ void prepareToPlay() override;
</ins><span class="cx">
</span><del>- bool paused() const;
- bool seeking() const;
</del><ins>+ bool paused() const override;
+ bool seeking() const override;
</ins><span class="cx">
</span><span class="cx"> virtual MediaTime durationMediaTime() const override;
</span><span class="cx"> virtual MediaTime currentMediaTime() const override;
</span><span class="cx"> virtual void seek(const MediaTime&) override;
</span><span class="cx">
</span><del>- void setRate(float);
</del><ins>+ void setRate(float) override;
</ins><span class="cx"> virtual double rate() const override;
</span><del>- void setVolume(float);
- void setPreservesPitch(bool);
</del><ins>+ void setVolume(float) override;
+ void setPreservesPitch(bool) override;
</ins><span class="cx">
</span><del>- bool hasClosedCaptions() const;
- void setClosedCaptionsVisible(bool);
</del><ins>+ bool hasClosedCaptions() const override;
+ void setClosedCaptionsVisible(bool) override;
</ins><span class="cx">
</span><del>- void setPreload(MediaPlayer::Preload);
</del><ins>+ void setPreload(MediaPlayer::Preload) override;
</ins><span class="cx">
</span><del>- MediaPlayer::NetworkState networkState() const { return m_networkState; }
- MediaPlayer::ReadyState readyState() const { return m_readyState; }
</del><ins>+ MediaPlayer::NetworkState networkState() const override { return m_networkState; }
+ MediaPlayer::ReadyState readyState() const override { return m_readyState; }
</ins><span class="cx">
</span><del>- std::unique_ptr<PlatformTimeRanges> buffered() const;
- MediaTime maxMediaTimeSeekable() const;
- bool didLoadingProgress() const;
- unsigned long long totalBytes() const;
</del><ins>+ std::unique_ptr<PlatformTimeRanges> buffered() const override;
+ MediaTime maxMediaTimeSeekable() const override;
+ bool didLoadingProgress() const override;
+ unsigned long long totalBytes() const override;
</ins><span class="cx">
</span><del>- void setVisible(bool);
- void setSize(const IntSize&);
</del><ins>+ void setVisible(bool) override;
+ void setSize(const IntSize&) override;
</ins><span class="cx">
</span><del>- virtual bool hasAvailableVideoFrame() const;
</del><ins>+ virtual bool hasAvailableVideoFrame() const override;
</ins><span class="cx">
</span><del>- void paint(GraphicsContext*, const FloatRect&);
- void paintCurrentFrameInContext(GraphicsContext*, const FloatRect&);
- virtual void prepareForRendering();
</del><ins>+ void paint(GraphicsContext*, const FloatRect&) override;
+ void paintCurrentFrameInContext(GraphicsContext*, const FloatRect&) override;
+ virtual void prepareForRendering() override;
</ins><span class="cx">
</span><del>- bool supportsAcceleratedRendering() const;
- void acceleratedRenderingStateChanged();
</del><ins>+ bool supportsAcceleratedRendering() const override;
+ void acceleratedRenderingStateChanged() override;
</ins><span class="cx">
</span><del>- bool hasSingleSecurityOrigin() const;
- MediaPlayer::MovieLoadType movieLoadType() const;
</del><ins>+ bool hasSingleSecurityOrigin() const override;
+ MediaPlayer::MovieLoadType movieLoadType() const override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canSaveMediaData() const override;
</span><span class="cx">
</span><span class="lines">@@ -170,18 +170,18 @@
</span><span class="cx">
</span><span class="cx"> bool isReadyForVideoSetup() const;
</span><span class="cx">
</span><del>- virtual double maximumDurationToCacheMediaTime() const { return 5; }
</del><ins>+ virtual double maximumDurationToCacheMediaTime() const override { return 5; }
</ins><span class="cx">
</span><del>- virtual void setPrivateBrowsingMode(bool);
</del><ins>+ virtual void setPrivateBrowsingMode(bool) override;
</ins><span class="cx">
</span><span class="cx"> NSMutableDictionary* commonMovieAttributes();
</span><span class="cx">
</span><del>- virtual String engineDescription() const { return "QTKit"; }
- virtual long platformErrorCode() const;
</del><ins>+ virtual String engineDescription() const override { return "QTKit"; }
+ virtual long platformErrorCode() const override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual bool isCurrentPlaybackTargetWireless() const override;
</span><del>- virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</del><ins>+ virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
</ins><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) override;
</span><span class="cx"> bool wirelessVideoPlaybackDisabled() const override { return false; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx"> Timer m_sendContentAreaScrolledTimer;
</span><span class="cx"> FloatSize m_contentAreaScrolledTimerScrollDelta;
</span><span class="cx">
</span><del>- virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
- virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);
</del><ins>+ virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier) override;
+ virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx"> virtual bool handleWheelEvent(const PlatformWheelEvent&) override;
</span><span class="lines">@@ -90,37 +90,37 @@
</span><span class="cx">
</span><span class="cx"> virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;
</span><span class="cx">
</span><del>- virtual void cancelAnimations();
</del><ins>+ virtual void cancelAnimations() override;
</ins><span class="cx">
</span><del>- virtual void notifyPositionChanged(const FloatSize& delta);
- virtual void contentAreaWillPaint() const;
- virtual void mouseEnteredContentArea() const;
- virtual void mouseExitedContentArea() const;
- virtual void mouseMovedInContentArea() const;
- virtual void mouseEnteredScrollbar(Scrollbar*) const;
- virtual void mouseExitedScrollbar(Scrollbar*) const;
- virtual void willStartLiveResize();
- virtual void contentsResized() const;
- virtual void willEndLiveResize();
- virtual void contentAreaDidShow() const;
- virtual void contentAreaDidHide() const;
</del><ins>+ virtual void notifyPositionChanged(const FloatSize& delta) override;
+ virtual void contentAreaWillPaint() const override;
+ virtual void mouseEnteredContentArea() const override;
+ virtual void mouseExitedContentArea() const override;
+ virtual void mouseMovedInContentArea() const override;
+ virtual void mouseEnteredScrollbar(Scrollbar*) const override;
+ virtual void mouseExitedScrollbar(Scrollbar*) const override;
+ virtual void willStartLiveResize() override;
+ virtual void contentsResized() const override;
+ virtual void willEndLiveResize() override;
+ virtual void contentAreaDidShow() const override;
+ virtual void contentAreaDidHide() const override;
</ins><span class="cx"> void didBeginScrollGesture() const;
</span><span class="cx"> void didEndScrollGesture() const;
</span><span class="cx"> void mayBeginScrollGesture() const;
</span><span class="cx">
</span><span class="cx"> virtual void lockOverlayScrollbarStateToHidden(bool shouldLockState) override final;
</span><span class="cx">
</span><del>- virtual void didAddVerticalScrollbar(Scrollbar*);
- virtual void willRemoveVerticalScrollbar(Scrollbar*);
- virtual void didAddHorizontalScrollbar(Scrollbar*);
- virtual void willRemoveHorizontalScrollbar(Scrollbar*);
</del><ins>+ virtual void didAddVerticalScrollbar(Scrollbar*) override;
+ virtual void willRemoveVerticalScrollbar(Scrollbar*) override;
+ virtual void didAddHorizontalScrollbar(Scrollbar*) override;
+ virtual void willRemoveHorizontalScrollbar(Scrollbar*) override;
</ins><span class="cx">
</span><span class="cx"> void invalidateScrollbarPartLayers(Scrollbar*) override;
</span><span class="cx">
</span><del>- virtual void verticalScrollbarLayerDidChange();
- virtual void horizontalScrollbarLayerDidChange();
</del><ins>+ virtual void verticalScrollbarLayerDidChange() override;
+ virtual void horizontalScrollbarLayerDidChange() override;
</ins><span class="cx">
</span><del>- virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*);
</del><ins>+ virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*) override;
</ins><span class="cx">
</span><span class="cx"> virtual void notifyContentAreaScrolled(const FloatSize& delta) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isEqual(const SerializedPlatformRepresentation&) const override;
</span><span class="cx">
</span><del>- virtual PlatformType platformType() const { return SerializedPlatformRepresentation::ObjC; }
</del><ins>+ virtual PlatformType platformType() const override { return SerializedPlatformRepresentation::ObjC; }
</ins><span class="cx">
</span><span class="cx"> id nativeValue() const { return m_nativeValue.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -40,20 +40,20 @@
</span><span class="cx"> ThemeMac() { }
</span><span class="cx"> virtual ~ThemeMac() { }
</span><span class="cx">
</span><del>- virtual int baselinePositionAdjustment(ControlPart) const;
</del><ins>+ virtual int baselinePositionAdjustment(ControlPart) const override;
</ins><span class="cx">
</span><del>- virtual Optional<FontDescription> controlFont(ControlPart, const FontCascade&, float zoomFactor) const;
</del><ins>+ virtual Optional<FontDescription> controlFont(ControlPart, const FontCascade&, float zoomFactor) const override;
</ins><span class="cx">
</span><del>- virtual LengthSize controlSize(ControlPart, const FontCascade&, const LengthSize&, float zoomFactor) const;
- virtual LengthSize minimumControlSize(ControlPart, const FontCascade&, float zoomFactor) const;
</del><ins>+ virtual LengthSize controlSize(ControlPart, const FontCascade&, const LengthSize&, float zoomFactor) const override;
+ virtual LengthSize minimumControlSize(ControlPart, const FontCascade&, float zoomFactor) const override;
</ins><span class="cx">
</span><del>- virtual LengthBox controlPadding(ControlPart, const FontCascade&, const LengthBox& zoomedBox, float zoomFactor) const;
- virtual LengthBox controlBorder(ControlPart, const FontCascade&, const LengthBox& zoomedBox, float zoomFactor) const;
</del><ins>+ virtual LengthBox controlPadding(ControlPart, const FontCascade&, const LengthBox& zoomedBox, float zoomFactor) const override;
+ virtual LengthBox controlBorder(ControlPart, const FontCascade&, const LengthBox& zoomedBox, float zoomFactor) const override;
</ins><span class="cx">
</span><del>- virtual bool controlRequiresPreWhiteSpace(ControlPart part) const { return part == PushButtonPart; }
</del><ins>+ virtual bool controlRequiresPreWhiteSpace(ControlPart part) const override { return part == PushButtonPart; }
</ins><span class="cx">
</span><span class="cx"> virtual void paint(ControlPart, ControlStates*, GraphicsContext*, const FloatRect&, float zoomFactor, ScrollView*) override;
</span><del>- virtual void inflateControlPaintRect(ControlPart, const ControlStates*, FloatRect&, float zoomFactor) const;
</del><ins>+ virtual void inflateControlPaintRect(ControlPart, const ControlStates*, FloatRect&, float zoomFactor) const override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Once RenderThemeMac is converted over to use Theme then this can be internal to ThemeMac.
</span><span class="cx"> static NSView* ensuredView(ScrollView*, const ControlStates*, bool useUnparentedView = false);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDM.cpp (185922 => 185923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDM.cpp 2015-06-24 20:32:27 UTC (rev 185922)
+++ trunk/Source/WebCore/testing/MockCDM.cpp 2015-06-24 20:48:13 UTC (rev 185923)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> MockCDMSession();
</span><span class="cx"> virtual ~MockCDMSession() { }
</span><span class="cx">
</span><del>- virtual void setClient(CDMSessionClient* client) { m_client = client; }
</del><ins>+ virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</ins><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><span class="cx"> virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx"> virtual void releaseKeys() override;
</span></span></pre>
</div>
</div>
</body>
</html>