<!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>[180366] 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/180366">180366</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 14:42:28 -0800 (Thu, 19 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move more CoreMedia soft-linked functions to CoreMediaSoftLink.{cpp,h}
<http://webkit.org/b/141791>
Reviewed by Alexey Proskuryakov.
* Configurations/WebCore.unexp:
- Remove five more symbols.
* Modules/plugins/QuickTimePluginReplacement.mm:
- Remove all local soft-links and include CoreMediaSoftLink.h.
Note that SOFT_LINK_FRAMEWORK_OPTIONAL() should not have been
used here since we didn't use the optional function soft-link
method.
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.vcxproj/WebCoreCFNetwork.props:
* WebCore.xcodeproj/project.pbxproj:
- Add CoreMediaSPI.h to the project.
* platform/cf/CoreMediaSoftLink.cpp:
* platform/cf/CoreMediaSoftLink.h:
- Add three cross-platform symbols, five Cocoa-only symbols, and
two Windows-only symbols (based on current usage, not
availability on each platform).
- Include CoreMediaSPI.h header.
- Include <CoreMedia/CoreMedia.h> instead of just CMTime.h.
* platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
- Remove all CoreMedia soft-linked functions. Constants remain.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
- Remove one CoreMedia soft-linked method.
* platform/graphics/avfoundation/MediaTimeAVFoundation.cpp:
- Remove all CoreMedia soft-linked funtions. With this change,
we are already realizing space savings for duplicate
SOFT_LINK_FRAMEWORK() calls. (On Windows, there was code
generated for many unused functions included by
CoreMediaSoftLinking.h.)
* platform/graphics/avfoundation/cf/CoreMediaSoftLinking.h:
- Remove all CoreMedia soft-linked funtions. Constants remain.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
- Remove duplicate header included by CoreMediaSoftLink.h.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
- Remove all CoreMedia soft-linked funtions. Constants remain.
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
- Remove three CoreMedia soft-linked methods.
* platform/mac/PlatformClockCM.mm:
- Remove two CoreMedia soft-linked methods.
* platform/mac/SerializedPlatformRepresentationMac.mm:
- Remove only CoreMedia soft-linked funtion. It wasn't even
used.
* platform/mediastream/mac/AVVideoCaptureSource.mm:
- Remove two CoreMedia soft-linked method.
* platform/spi/cf/CoreMediaSPI.h:
- Add for SPI from CMNotificationCenter.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCoreunexp">trunk/Source/WebCore/Configurations/WebCore.unexp</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm">trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreCFNetworkprops">trunk/Source/WebCore/WebCore.vcxproj/WebCoreCFNetwork.props</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformcfCoreMediaSoftLinkcpp">trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfCoreMediaSoftLinkh">trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaTimeAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfCoreMediaSoftLinkingh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/CoreMediaSoftLinking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformClockCMmm">trunk/Source/WebCore/platform/mac/PlatformClockCM.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMacmm">trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicfCoreMediaSPIh">trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/ChangeLog 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2015-02-19 David Kilzer <ddkilzer@apple.com>
+
+ Move more CoreMedia soft-linked functions to CoreMediaSoftLink.{cpp,h}
+ <http://webkit.org/b/141791>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/WebCore.unexp:
+ - Remove five more symbols.
+
+ * Modules/plugins/QuickTimePluginReplacement.mm:
+ - Remove all local soft-links and include CoreMediaSoftLink.h.
+ Note that SOFT_LINK_FRAMEWORK_OPTIONAL() should not have been
+ used here since we didn't use the optional function soft-link
+ method.
+
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.vcxproj/WebCoreCFNetwork.props:
+ * WebCore.xcodeproj/project.pbxproj:
+ - Add CoreMediaSPI.h to the project.
+
+ * platform/cf/CoreMediaSoftLink.cpp:
+ * platform/cf/CoreMediaSoftLink.h:
+ - Add three cross-platform symbols, five Cocoa-only symbols, and
+ two Windows-only symbols (based on current usage, not
+ availability on each platform).
+ - Include CoreMediaSPI.h header.
+ - Include <CoreMedia/CoreMedia.h> instead of just CMTime.h.
+
+ * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
+ - Remove all CoreMedia soft-linked functions. Constants remain.
+
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ - Remove one CoreMedia soft-linked method.
+
+ * platform/graphics/avfoundation/MediaTimeAVFoundation.cpp:
+ - Remove all CoreMedia soft-linked funtions. With this change,
+ we are already realizing space savings for duplicate
+ SOFT_LINK_FRAMEWORK() calls. (On Windows, there was code
+ generated for many unused functions included by
+ CoreMediaSoftLinking.h.)
+
+ * platform/graphics/avfoundation/cf/CoreMediaSoftLinking.h:
+ - Remove all CoreMedia soft-linked funtions. Constants remain.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ - Remove duplicate header included by CoreMediaSoftLink.h.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ - Remove all CoreMedia soft-linked funtions. Constants remain.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ - Remove three CoreMedia soft-linked methods.
+
+ * platform/mac/PlatformClockCM.mm:
+ - Remove two CoreMedia soft-linked methods.
+
+ * platform/mac/SerializedPlatformRepresentationMac.mm:
+ - Remove only CoreMedia soft-linked funtion. It wasn't even
+ used.
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ - Remove two CoreMedia soft-linked method.
+
+ * platform/spi/cf/CoreMediaSPI.h:
+ - Add for SPI from CMNotificationCenter.h.
+
</ins><span class="cx"> 2015-02-19 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Columns are splitting unsplittable content.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCoreunexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.unexp (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.unexp 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/Configurations/WebCore.unexp 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -28,13 +28,11 @@
</span><span class="cx"> # Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
</span><span class="cx"> _AudioConverterConvertComplexBuffer
</span><span class="cx"> _AudioConverterNew
</span><del>-_CMTimebaseGetTime
</del><span class="cx"> _MTAudioProcessingTapGetSourceAudio
</span><span class="cx"> _MTAudioProcessingTapGetStorage
</span><span class="cx">
</span><span class="cx"> # Source/WebCore/platform/mac/PlatformClockCM.mm
</span><span class="cx"> _CMAudioDeviceClockCreate
</span><del>-_CMTimeGetSeconds
</del><span class="cx"> _CMTimebaseCreateWithMasterClock
</span><span class="cx"> _CMTimebaseSetRate
</span><span class="cx"> _CMTimebaseSetTime
</span><span class="lines">@@ -47,13 +45,6 @@
</span><span class="cx"> _CMSampleBufferGetFormatDescription
</span><span class="cx"> _CMSampleBufferGetSampleTimingInfo
</span><span class="cx">
</span><del>-# Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
-_CMTimeCompare
-_CMTimeMake
-
-# Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
-_CMTimeRangeGetEnd
-
</del><span class="cx"> # Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
</span><span class="cx"> _MACaptionAppearanceAddSelectedLanguage
</span><span class="cx"> _MACaptionAppearanceCopyBackgroundColor
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import "QuickTimePluginReplacement.h"
</span><span class="cx">
</span><ins>+#import "CoreMediaSoftLink.h"
</ins><span class="cx"> #import "Event.h"
</span><span class="cx"> #import "HTMLPlugInElement.h"
</span><span class="cx"> #import "HTMLVideoElement.h"
</span><span class="lines">@@ -46,15 +47,11 @@
</span><span class="cx"> #import "UserAgentScripts.h"
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><del>-#import <CoreMedia/CoreMedia.h>
</del><span class="cx"> #import <Foundation/NSString.h>
</span><span class="cx"> #import <JavaScriptCore/JavaScriptCore.h>
</span><span class="cx"> #import <JavaScriptCore/APICast.h>
</span><span class="cx"> #import <wtf/text/Base64.h>
</span><span class="cx">
</span><del>-SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)
-SOFT_LINK(CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
-
</del><span class="cx"> typedef AVMetadataItem AVMetadataItemType;
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVMetadataItem)
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -8826,6 +8826,9 @@
</span><span class="cx"> <ClInclude Include="..\platform\spi\cg\CoreGraphicsSPI.h">
</span><span class="cx"> <Filter>platform\spi\cg</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\platform\spi\cf\CoreMediaSPI.h">
+ <Filter>platform\spi\cf</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\platform\sql\SQLiteDatabase.h">
</span><span class="cx"> <Filter>platform\sql</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreCFNetworkprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreCFNetwork.props (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreCFNetwork.props 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreCFNetwork.props 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <AdditionalIncludeDirectories>$(ProjectDir)..\platform\network\cf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</del><ins>+ <AdditionalIncludeDirectories>$(ProjectDir)..\platform\network\cf;$(ProjectDir)..\platform\spi\cf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1597,6 +1597,7 @@
</span><span class="cx"> 443817FF1A91B2F8006E04F2 /* CoreMediaSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 443817FD1A91B2F8006E04F2 /* CoreMediaSoftLink.cpp */; };
</span><span class="cx"> 443818001A91B2F8006E04F2 /* CoreMediaSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 443817FE1A91B2F8006E04F2 /* CoreMediaSoftLink.h */; };
</span><span class="cx"> 443F04270E75C8FB007E5407 /* NetworkStateNotifierIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */; };
</span><ins>+ 4449A4051A964B0000B64AD5 /* CoreMediaSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */; };
</ins><span class="cx"> 444D4E230F708B2E003158E0 /* WebCoreURLResponseIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */; };
</span><span class="cx"> 4476531B133170990006B789 /* SSLKeyGeneratorIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */; };
</span><span class="cx"> 447958041643B49A001E0A7F /* ParsedContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 447958031643B47B001E0A7F /* ParsedContentType.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8676,6 +8677,7 @@
</span><span class="cx"> 443817FD1A91B2F8006E04F2 /* CoreMediaSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreMediaSoftLink.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 443817FE1A91B2F8006E04F2 /* CoreMediaSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreMediaSoftLink.h; sourceTree = "<group>"; };
</span><span class="cx"> 443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStateNotifierIOS.mm; sourceTree = "<group>"; };
</span><ins>+ 4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreMediaSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponseIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SSLKeyGeneratorIOS.cpp; path = ios/SSLKeyGeneratorIOS.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 447958021643B47B001E0A7F /* ParsedContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentType.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16268,6 +16270,7 @@
</span><span class="cx"> 65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
</span><span class="cx"> CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */,
</span><span class="cx"> CE12525A1A1C018200864480 /* CFNetworkSPI.h */,
</span><ins>+ 4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = cf;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -23708,6 +23711,7 @@
</span><span class="cx"> 9746AF2114F4DDE6003E7A71 /* Coordinates.h in Headers */,
</span><span class="cx"> CE1252371A15BDBE00864480 /* CoreGraphicsSPI.h in Headers */,
</span><span class="cx"> 443818001A91B2F8006E04F2 /* CoreMediaSoftLink.h in Headers */,
</span><ins>+ 4449A4051A964B0000B64AD5 /* CoreMediaSPI.h in Headers */,
</ins><span class="cx"> 1C6466251A12C38E0094603C /* CoreTextSPI.h in Headers */,
</span><span class="cx"> 862F129E18C1576F005C54AF /* CountedUserActivity.h in Headers */,
</span><span class="cx"> A80E6D040A1989CA007FB8C5 /* Counter.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfCoreMediaSoftLinkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -26,13 +26,31 @@
</span><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx">
</span><ins>+#include "CoreMediaSPI.h"
</ins><span class="cx"> #include "SoftLinking.h"
</span><del>-#include <CoreMedia/CMTime.h>
</del><ins>+#include <CoreMedia/CoreMedia.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> SOFT_LINK_FRAMEWORK(CoreMedia)
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
</ins><span class="cx"> SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
</span><ins>+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
</ins><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
+#endif // PLATFORM(COCOA)
+
+#if PLATFORM(WIN)
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
+SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
+#endif // PLATFORM(WIN)
+
</ins><span class="cx"> #endif // USE(AVFOUNDATION)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfCoreMediaSoftLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -27,12 +27,45 @@
</span><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx">
</span><ins>+#include "CoreMediaSPI.h"
</ins><span class="cx"> #include "SoftLinking.h"
</span><del>-#include <CoreMedia/CMTime.h>
</del><ins>+#include <CoreMedia/CoreMedia.h>
</ins><span class="cx">
</span><ins>+SOFT_LINK_FUNCTION_DECL(CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
+#define CMTimeCompare softLink_CMTimeCompare
+SOFT_LINK_FUNCTION_DECL(CMTimeGetSeconds, Float64, (CMTime time), (time))
+#define CMTimeGetSeconds softLink_CMTimeGetSeconds
+SOFT_LINK_FUNCTION_DECL(CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
+#define CMTimeMake softLink_CMTimeMake
</ins><span class="cx"> SOFT_LINK_FUNCTION_DECL(CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
</span><span class="cx"> #define CMTimeMakeWithSeconds softLink_CMTimeMakeWithSeconds
</span><ins>+SOFT_LINK_FUNCTION_DECL(CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
+#define CMTimeRangeGetEnd softLink_CMTimeRangeGetEnd
</ins><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+
+SOFT_LINK_FUNCTION_DECL(CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
+#define CMNotificationCenterGetDefaultLocalCenter softLink_CMNotificationCenterGetDefaultLocalCenter
+SOFT_LINK_FUNCTION_DECL(CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
+#define CMNotificationCenterAddListener softLink_CMNotificationCenterAddListener
+SOFT_LINK_FUNCTION_DECL(CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
+#define CMNotificationCenterRemoveListener softLink_CMNotificationCenterRemoveListener
+SOFT_LINK_FUNCTION_DECL(CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
+#define CMTimebaseGetTime softLink_CMTimebaseGetTime
+SOFT_LINK_FUNCTION_DECL(CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
+#define CMTimeCopyAsDictionary softLink_CMTimeCopyAsDictionary
+
+#endif // PLATFORM(COCOA)
+
+#if PLATFORM(WIN)
+
+SOFT_LINK_FUNCTION_DECL(CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
+#define CMTimeAdd softLink_CMTimeAdd
+SOFT_LINK_FUNCTION_DECL(CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
+#define CMTimeMakeFromDictionary softLink_CMTimeMakeFromDictionary
+
+#endif // PLATFORM(WIN)
+
</ins><span class="cx"> #endif // USE(AVFOUNDATION)
</span><span class="cx">
</span><span class="cx"> #endif // CoreMediaSoftLink_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationAudioSourceProviderAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "AudioChannel.h"
</span><span class="cx"> #import "AudioSourceProviderClient.h"
</span><span class="cx"> #import "CARingBuffer.h"
</span><ins>+#import "CoreMediaSoftLink.h"
</ins><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaTimeAVFoundation.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="lines">@@ -56,15 +57,6 @@
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVMutableAudioMix)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVMutableAudioMixInputParameters)
</span><span class="cx">
</span><del>-typedef struct opaqueCMNotificationCenter *CMNotificationCenterRef;
-typedef void (*CMNotificationCallback)(CMNotificationCenterRef inCenter, const void *inListener, CFStringRef inNotificationName, const void *inNotifyingObject, CFTypeRef inNotificationPayload);
-
-SOFT_LINK(CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
-SOFT_LINK(CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
-SOFT_LINK(CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
-SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
-SOFT_LINK(CoreMedia, CMTimebaseGetEffectiveRate, Float64, (CMTimebaseRef timebase), (timebase))
-
</del><span class="cx"> SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef)
</span><span class="cx"> SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_TimeJumped, CFStringRef)
</span><span class="cx"> #define kCMTimebaseNotification_EffectiveRateChanged getkCMTimebaseNotification_EffectiveRateChanged()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -95,8 +95,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeGetSeconds, Float64, __cdecl, (CMTime time), (time))
-#define CMTimeGetSeconds softLink_CMTimeGetSeconds
</del><span class="cx"> SOFT_LINK_DLL_IMPORT(CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, __cdecl, (CMSampleBufferRef sbuf), (sbuf))
</span><span class="cx"> #define CMSampleBufferGetDataBuffer softLink_CMSampleBufferGetDataBuffer
</span><span class="cx"> SOFT_LINK_DLL_IMPORT(CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, __cdecl, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaTimeAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.cpp (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.cpp 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.cpp 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,15 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CoreMediaSoftLink.h"
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-#include <CoreMedia/CoreMedia.h>
-#include "CoreMediaSoftLinking.h"
-#else
-#include "SoftLinking.h"
-SOFT_LINK_FRAMEWORK(CoreMedia)
-SOFT_LINK(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static bool CMTimeHasFlags(const CMTime& cmTime, uint32_t flags)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfCoreMediaSoftLinkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CoreMediaSoftLinking.h (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CoreMediaSoftLinking.h 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CoreMediaSoftLinking.h 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,26 +33,6 @@
</span><span class="cx"> SOFT_LINK_LIBRARY(CoreMedia)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// Functions
-
-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeAdd, CMTime, __cdecl, (CMTime addend1, CMTime addend2), (addend1, addend2))
-#define CMTimeAdd softLink_CMTimeAdd
-
-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeCompare, int32_t, __cdecl, (CMTime time1, CMTime time2), (time1, time2))
-#define CMTimeCompare softLink_CMTimeCompare
-
-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeGetSeconds, Float64, __cdecl, (CMTime time), (time))
-#define CMTimeGetSeconds softLink_CMTimeGetSeconds
-
-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeMake, CMTime, __cdecl, (int64_t value, int32_t timescale), (value, timescale))
-#define CMTimeMake softLink_CMTimeMake
-
-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeMakeFromDictionary, CMTime, __cdecl, (CFDictionaryRef dict), (dict))
-#define CMTimeMakeFromDictionary softLink_CMTimeMakeFromDictionary
-
-SOFT_LINK_DLL_IMPORT(CoreMedia, CMTimeRangeGetEnd, CMTime, __cdecl, (CMTimeRange range), (range))
-#define CMTimeRangeGetEnd softLink_CMTimeRangeGetEnd
-
</del><span class="cx"> // Variables
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_VARIABLE_DLL_IMPORT(CoreMedia, kCMTimeZero, const CMTime);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> #include <AVFoundationCF/AVCFAssetResourceLoader.h>
</span><span class="cx"> #endif
</span><span class="cx"> #include <AVFoundationCF/AVFoundationCF.h>
</span><del>-#include <CoreMedia/CoreMedia.h>
</del><span class="cx"> #include <d3d9.h>
</span><span class="cx"> #include <delayimp.h>
</span><span class="cx"> #include <dispatch/dispatch.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> #import <Foundation/NSGeometry.h>
</span><span class="cx"> #import <QuartzCore/CoreImage.h>
</span><span class="cx"> #endif
</span><del>-#import <CoreMedia/CoreMedia.h>
</del><span class="cx">
</span><span class="cx"> #if USE(VIDEOTOOLBOX)
</span><span class="cx"> #import <CoreVideo/CoreVideo.h>
</span><span class="lines">@@ -155,10 +154,6 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(VideoToolbox)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-SOFT_LINK(CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
-SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
-SOFT_LINK(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
-
</del><span class="cx"> SOFT_LINK(CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
</span><span class="cx"> SOFT_LINK(CoreVideo, CVPixelBufferGetHeight, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
</span><span class="cx"> SOFT_LINK(CoreVideo, CVPixelBufferGetBaseAddress, void*, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE) && USE(AVFOUNDATION)
</span><span class="cx">
</span><span class="cx"> #import "CDMSessionMediaSourceAVFObjC.h"
</span><ins>+#import "CoreMediaSoftLink.h"
</ins><span class="cx"> #import "FileSystem.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaSourcePrivateAVFObjC.h"
</span><span class="lines">@@ -61,15 +62,6 @@
</span><span class="cx"> SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVStreamSession);
</span><span class="cx"> SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVVideoPerformanceMetrics)
</span><span class="cx">
</span><del>-typedef struct opaqueCMNotificationCenter *CMNotificationCenterRef;
-typedef void (*CMNotificationCallback)(CMNotificationCenterRef inCenter, const void *inListener, CFStringRef inNotificationName, const void *inNotifyingObject, CFTypeRef inNotificationPayload);
-
-SOFT_LINK(CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
-SOFT_LINK(CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
-SOFT_LINK(CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
-SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
-SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
-
</del><span class="cx"> SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef)
</span><span class="cx"> #define kCMTimebaseNotification_EffectiveRateChanged getkCMTimebaseNotification_EffectiveRateChanged()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import "WebVideoFullscreenModel.h"
</span><span class="cx"> #import <AVFoundation/AVTime.h>
</span><del>-#import <CoreMedia/CMTime.h>
</del><span class="cx"> #import <UIKit/UIKit.h>
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecksIOS.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="lines">@@ -66,10 +65,7 @@
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIColor)
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(CoreMedia)
</span><del>-SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
-SOFT_LINK(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
</del><span class="cx"> SOFT_LINK(CoreMedia, CMTimeRangeContainsTime, Boolean, (CMTimeRange range, CMTime time), (range, time))
</span><del>-SOFT_LINK(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
</del><span class="cx"> SOFT_LINK(CoreMedia, CMTimeRangeMake, CMTimeRange, (CMTime start, CMTime duration), (start, duration))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMTimeSubtract, CMTime, (CMTime minuend, CMTime subtrahend), (minuend, subtrahend))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMTimeMaximum, CMTime, (CMTime time1, CMTime time2), (time1, time2))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformClockCMmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformClockCM.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformClockCM.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/mac/PlatformClockCM.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -47,9 +47,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time))
</span><del>-SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
</del><span class="cx"> SOFT_LINK(CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))
</span><del>-SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #import <runtime/ArrayBuffer.h>
</span><span class="cx"> #import <runtime/JSArrayBuffer.h>
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><del>-#import <CoreMedia/CoreMedia.h>
</del><span class="cx"> #import <Foundation/NSString.h>
</span><span class="cx"> #import <JavaScriptCore/APICast.h>
</span><span class="cx"> #import <JavaScriptCore/JavaScriptCore.h>
</span><span class="lines">@@ -42,9 +41,6 @@
</span><span class="cx"> #import <JavaScriptCore/JSObjectRef.h>
</span><span class="cx"> #import <wtf/text/Base64.h>
</span><span class="cx">
</span><del>-SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)
-SOFT_LINK(CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
-
</del><span class="cx"> typedef AVMetadataItem AVMetadataItemType;
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVMetadataItem)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (180365 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-02-19 22:18:17 UTC (rev 180365)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #import "AVCaptureDeviceManager.h"
</span><span class="cx"> #import "BlockExceptions.h"
</span><ins>+#import "CoreMediaSoftLink.h"
</ins><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaConstraints.h"
</span><span class="cx"> #import "MediaStreamSourceStates.h"
</span><span class="lines">@@ -75,8 +76,6 @@
</span><span class="cx">
</span><span class="cx"> SOFT_LINK(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf));
</span><span class="cx"> SOFT_LINK(CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf));
</span><del>-SOFT_LINK(CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
-SOFT_LINK(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
</del><span class="cx"> SOFT_LINK(CoreMedia, CMVideoFormatDescriptionGetDimensions, CMVideoDimensions, (CMVideoFormatDescriptionRef videoDesc), (videoDesc));
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCoreMediaSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h (0 => 180366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h 2015-02-19 22:42:28 UTC (rev 180366)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CoreMediaSPI_h
+#define CoreMediaSPI_h
+
+#if PLATFORM(COCOA)
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <CoreMedia/CMNotificationCenter.h>
+#else
+typedef struct opaqueCMNotificationCenter *CMNotificationCenterRef;
+typedef void (*CMNotificationCallback)(CMNotificationCenterRef inCenter, const void *inListener, CFStringRef inNotificationName, const void *inNotifyingObject, CFTypeRef inNotificationPayload);
+#endif
+
+WTF_EXTERN_C_BEGIN
+CMNotificationCenterRef CMNotificationCenterGetDefaultLocalCenter(void);
+OSStatus CMNotificationCenterAddListener(CMNotificationCenterRef inCenter, const void *inListener, CMNotificationCallback inCallBack, CFStringRef inNotificationName, const void *inObjectToObserve, UInt32 inFlags);
+OSStatus CMNotificationCenterRemoveListener(CMNotificationCenterRef inCenter, const void *inListener, CMNotificationCallback inCallBack, CFStringRef inNotificationName, const void *inObject);
+WTF_EXTERN_C_END
+
+#endif // PLATFORM(COCOA)
+
+#endif // CoreMediaSPI_h
</ins></span></pre>
</div>
</div>
</body>
</html>