Diff
Modified: branches/safari-537-branch/Source/WTF/ChangeLog (152543 => 152544)
--- branches/safari-537-branch/Source/WTF/ChangeLog 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WTF/ChangeLog 2013-07-10 20:40:20 UTC (rev 152544)
@@ -1,3 +1,18 @@
+2013-07-10 Lucas Forschler <[email protected]>
+
+ Merge r152426
+
+ 2013-07-05 Brent Fulgham <[email protected]>
+
+ [Windows] Identify OS-level at build-time.
+ https://bugs.webkit.org/show_bug.cgi?id=118428
+
+ Reviewed by Anders Carlsson.
+
+ * WTF.vcxproj/WTFGenerated.make: Check for Legible Output featurs
+ and set build environment as appropriate.
+ * wtf/Platform.h: Activate Legible Output features if present.
+
2013-07-08 Lucas Forschler <[email protected]>
Merge r152052
Modified: branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make (152543 => 152544)
--- branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2013-07-10 20:40:20 UTC (rev 152544)
@@ -1,4 +1,4 @@
-all:
+all: WTFHeaderDetection.h
touch "%ConfigurationBuildDir%\buildfailed"
bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
!IF "$(OFFICIAL_BUILD)"!="1"
@@ -10,4 +10,14 @@
clean:
-del "%ConfigurationBuildDir%\buildfailed"
+ -del "%ConfigurationBuildDir%\include\private\wtf\WTFHeaderDetection.h"
copy-files.cmd clean
+
+# Header detection
+WTFHeaderDetection.h: WTFGenerated.make
+ -mkdir "%ConfigurationBuildDir%\include\private\wtf
+ <<testOSXLevel.cmd
+IF EXIST "%ConfigurationBuildDir%\include\private\wtf\$@" exit
+echo "" > "%ConfigurationBuildDir%\include\private\wtf\$@"
+IF EXIST "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" (echo #define __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 1090 > "%ConfigurationBuildDir%\include\private\wtf\$@")
+<<
Modified: branches/safari-537-branch/Source/WTF/wtf/Platform.h (152543 => 152544)
--- branches/safari-537-branch/Source/WTF/wtf/Platform.h 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WTF/wtf/Platform.h 2013-07-10 20:40:20 UTC (rev 152544)
@@ -625,6 +625,9 @@
#define HAVE_SYS_TIMEB_H 1
#define HAVE_ALIGNED_MALLOC 1
#define HAVE_ISDEBUGGERPRESENT 1
+
+#include <WTF/WTFHeaderDetection.h>
+
#endif
#if OS(WINDOWS)
@@ -960,11 +963,11 @@
#define WTF_USE_COREMEDIA 1
#endif
-#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
#endif
-#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
#endif
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152543 => 152544)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-10 20:40:20 UTC (rev 152544)
@@ -1,3 +1,19 @@
+2013-07-10 Lucas Forschler <[email protected]>
+
+ Merge r152426
+
+ 2013-07-05 Brent Fulgham <[email protected]>
+
+ [Windows] Identify OS-level at build-time.
+ https://bugs.webkit.org/show_bug.cgi?id=118428
+
+ Reviewed by Anders Carlsson.
+
+ * DerivedSources.make: Activate legible output features if present.
+ * WebCorePrefix.h: Activate MSVC 2010 workarounds for CGFloat if
+ building with VS2010.
+ * config.h: Activate legible output features if present.
+
2013-07-09 Lucas Forschler <[email protected]>
Merge r152514
Modified: branches/safari-537-branch/Source/WebCore/DerivedSources.make (152543 => 152544)
--- branches/safari-537-branch/Source/WebCore/DerivedSources.make 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WebCore/DerivedSources.make 2013-07-10 20:40:20 UTC (rev 152544)
@@ -1113,6 +1113,6 @@
all : WebCoreHeaderDetection.h
WebCoreHeaderDetection.h : DerivedSources.make
- if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFBase.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFBase.h" ]; then echo "#define HAVE_AVCF 1" > $@; else echo > $@; fi
+ if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]; then echo "#define HAVE_AVCF_LEGIBLE_OUTPUT 1" > $@; else echo > $@; fi
endif # Windows_NT
Modified: branches/safari-537-branch/Source/WebCore/WebCorePrefix.h (152543 => 152544)
--- branches/safari-537-branch/Source/WebCore/WebCorePrefix.h 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WebCore/WebCorePrefix.h 2013-07-10 20:40:20 UTC (rev 152544)
@@ -138,16 +138,24 @@
#if USE(CG)
#if defined(_MSC_VER) && _MSC_VER <= 1600
+
+#include <WebCore/WebCoreHeaderDetection.h>
+
+#if HAVE(AVCF_LEGIBLE_OUTPUT)
// These must be defined before including CGFloat.h
// This can be removed once we move to VS2012 or newer
#include <wtf/ExportMacros.h>
#include <wtf/MathExtras.h>
#define isnan _isnan
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#include <CoreGraphics/CGFloat.h>
+#endif
#include <CoreGraphics/CoreGraphics.h>
#include <CoreGraphics/CGFloat.h>
#undef isnan
#endif
+#endif
// FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, CoreServices header in CoreGraphics
// We can remove this once the new ColorSync APIs are available in an internal Safari SDK.
Modified: branches/safari-537-branch/Source/WebCore/config.h (152543 => 152544)
--- branches/safari-537-branch/Source/WebCore/config.h 2013-07-10 20:40:00 UTC (rev 152543)
+++ branches/safari-537-branch/Source/WebCore/config.h 2013-07-10 20:40:20 UTC (rev 152544)
@@ -136,7 +136,13 @@
// FIXME: Move this to _javascript_Core/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac.
// https://bugs.webkit.org/show_bug.cgi?id=67334
-#if PLATFORM(WIN) && HAVE(AVCF)
+#if PLATFORM(WIN)
#define WTF_USE_AVFOUNDATION 1
+
+#if HAVE(AVCF_LEGIBLE_OUTPUT)
+#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
+#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
#endif
+#endif
+
