Title: [163343] branches/safari-537.75-branch/Source/WebCore
- Revision
- 163343
- Author
- [email protected]
- Date
- 2014-02-03 16:40:20 -0800 (Mon, 03 Feb 2014)
Log Message
Unreviewed build fix after r162860.
* platform/graphics/MediaPlayer.cpp: Prevent 64-bit build from using QuickTime SDK.
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp: Ditto.
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h: Ditto.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163342 => 163343)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-04 00:37:51 UTC (rev 163342)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-04 00:40:20 UTC (rev 163343)
@@ -1,3 +1,11 @@
+2014-02-03 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix after r162860.
+
+ * platform/graphics/MediaPlayer.cpp: Prevent 64-bit build from using QuickTime SDK.
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp: Ditto.
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h: Ditto.
+
2014-01-27 Brent Fulgham <[email protected]>
Merge r162723.
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp (163342 => 163343)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-04 00:37:51 UTC (rev 163342)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-04 00:40:20 UTC (rev 163343)
@@ -66,8 +66,10 @@
#include "MediaPlayerPrivateWinCE.h"
#define PlatformMediaEngineClassName MediaPlayerPrivate
#elif PLATFORM(WIN)
+#if defined(_M_IX86)
#include "MediaPlayerPrivateQuickTimeVisualContext.h"
#define PlatformMediaEngineClassName MediaPlayerPrivateQuickTimeVisualContext
+#endif
#if USE(AVFOUNDATION)
#include "MediaPlayerPrivateAVFoundationCF.h"
#endif
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (163342 => 163343)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2014-02-04 00:37:51 UTC (rev 163342)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp 2014-02-04 00:40:20 UTC (rev 163343)
@@ -26,6 +26,9 @@
#include "config.h"
#if ENABLE(VIDEO)
+
+#if defined(_M_IX86)
+
#include "MediaPlayerPrivateQuickTimeVisualContext.h"
#include "Cookie.h"
@@ -1271,3 +1274,4 @@
}
#endif
+#endif
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h (163342 => 163343)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h 2014-02-04 00:37:51 UTC (rev 163342)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h 2014-02-04 00:40:20 UTC (rev 163343)
@@ -28,6 +28,9 @@
#if ENABLE(VIDEO)
+// Do not build this component for 64-bit architecture
+#if defined(_M_IX86)
+
#include "MediaPlayerPrivate.h"
#include "Timer.h"
#include <CoreGraphics/CGAffineTransform.h>
@@ -216,3 +219,4 @@
#endif
#endif
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
