Title: [172306] tags/Safari-600.1.2.9/Source/WebCore
- Revision
- 172306
- Author
- lforsch...@apple.com
- Date
- 2014-08-07 16:26:10 -0700 (Thu, 07 Aug 2014)
Log Message
Merge patch from <rdar://problem/17952463>.
Modified Paths
Diff
Modified: tags/Safari-600.1.2.9/Source/WebCore/ChangeLog (172305 => 172306)
--- tags/Safari-600.1.2.9/Source/WebCore/ChangeLog 2014-08-07 23:24:28 UTC (rev 172305)
+++ tags/Safari-600.1.2.9/Source/WebCore/ChangeLog 2014-08-07 23:26:10 UTC (rev 172306)
@@ -1,3 +1,10 @@
+2014-08-07 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Branch-only build workaround.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Use custom
+ DirectX header for branch build.
+
2014-08-07 Lucas Forschler <lforsch...@apple.com>
Merge r172202
Modified: tags/Safari-600.1.2.9/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (172305 => 172306)
--- tags/Safari-600.1.2.9/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-08-07 23:24:28 UTC (rev 172305)
+++ tags/Safari-600.1.2.9/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-08-07 23:26:10 UTC (rev 172306)
@@ -59,7 +59,7 @@
#endif
#include <AVFoundationCF/AVFoundationCF.h>
#include <CoreMedia/CoreMedia.h>
-#include <d3d9.h>
+#include "WebKitQuartzCoreAdditions/WKCACFTypes.h"
#include <delayimp.h>
#include <dispatch/dispatch.h>
#if ENABLE(ENCRYPTED_MEDIA_V2)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
