Title: [93660] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (93659 => 93660)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-23 23:34:26 UTC (rev 93659)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-23 23:37:22 UTC (rev 93660)
@@ -1,3 +1,23 @@
+2011-08-23 Lucas Forschler <[email protected]>
+
+ Merged 93260
+
+ 2011-08-17 Jeff Miller <[email protected]>
+
+ Work-in-progress on Soft link against AVFoundationCF and CoreMedia
+ https://bugs.webkit.org/show_bug.cgi?id=65725
+
+ Don't bother with SOFT_LINK_LIBRARY(libdispatch), we're going to continue to statically link to it since
+ the DLL will have already been loaded by other parts of AAS and is guaranteed to be available if AVFoundation
+ is enabled.
+
+ Reviewed by Anders Carlsson.
+
+ No new tests; no functional change.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Removed SOFT_LINK_DEBUG_LIBRARY(libdispatch) and SOFT_LINK_LIBRARY(libdispatch).
+ (WebCore::MediaPlayerPrivateAVFoundationCF::isAvailable): Don't check for libdispatch.
+
2011-08-18 Lucas Forschler <[email protected]>
Merged 93219
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (93659 => 93660)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2011-08-23 23:34:26 UTC (rev 93659)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2011-08-23 23:37:22 UTC (rev 93660)
@@ -59,7 +59,6 @@
// FIXME: AVFoundationCF doesn't currently deliver a debug version.
SOFT_LINK_LIBRARY(AVFoundationCF)
SOFT_LINK_DEBUG_LIBRARY(CoreMedia)
-SOFT_LINK_DEBUG_LIBRARY(libdispatch)
#else
#pragma comment(lib, "AVFoundationCF.lib")
#pragma comment(lib, "CoreMedia.lib")
@@ -68,7 +67,6 @@
// Use the soft link macros so we can easily test for the existence of the dlls.
SOFT_LINK_LIBRARY(AVFoundationCF)
SOFT_LINK_LIBRARY(CoreMedia)
-SOFT_LINK_LIBRARY(libdispatch)
#endif // DEBUG_ALL
using namespace std;
@@ -753,7 +751,7 @@
bool MediaPlayerPrivateAVFoundationCF::isAvailable()
{
- return AVFoundationCFLibrary() && CoreMediaLibrary() && libdispatchLibrary();
+ return AVFoundationCFLibrary() && CoreMediaLibrary();
}
float MediaPlayerPrivateAVFoundationCF::mediaTimeForTimeValue(float timeValue) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
