Title: [94603] branches/safari-534.51-branch/Source
Diff
Modified: branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog (94602 => 94603)
--- branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog 2011-09-06 22:17:07 UTC (rev 94602)
+++ branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog 2011-09-06 22:19:28 UTC (rev 94603)
@@ -1,5 +1,22 @@
2011-09-06 Mark Rowe <[email protected]>
+ Merge r94251.
+
+ 2011-08-31 Jeff Miller <[email protected]>
+
+ REGRESSION(92210): AVFoundation media engine is disabled on OS X
+ https://bugs.webkit.org/show_bug.cgi?id=67316
+
+ Move the definition of WTF_USE_AVFOUNDATION on the Mac back to _javascript_Core/wtf/Platform.h,
+ since WebKit2 doesn't have access to WebCore/config.h on this platform. This reverts the
+ changes that were made in r92210.
+
+ Reviewed by Darin Adler.
+
+ * wtf/Platform.h: Added definition of WTF_USE_AVFOUNDATION on the Mac.
+
+2011-09-06 Mark Rowe <[email protected]>
+
Merge r94478.
2011-09-02 Filip Pizlo <[email protected]>
Modified: branches/safari-534.51-branch/Source/_javascript_Core/wtf/Platform.h (94602 => 94603)
--- branches/safari-534.51-branch/Source/_javascript_Core/wtf/Platform.h 2011-09-06 22:17:07 UTC (rev 94602)
+++ branches/safari-534.51-branch/Source/_javascript_Core/wtf/Platform.h 2011-09-06 22:19:28 UTC (rev 94603)
@@ -1222,4 +1222,8 @@
#endif
#endif
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#define WTF_USE_AVFOUNDATION 1
+#endif
+
#endif /* WTF_Platform_h */
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (94602 => 94603)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-09-06 22:17:07 UTC (rev 94602)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-09-06 22:19:28 UTC (rev 94603)
@@ -1,3 +1,22 @@
+2011-09-06 Mark Rowe <[email protected]>
+
+ Merge r94251.
+
+ 2011-08-31 Jeff Miller <[email protected]>
+
+ REGRESSION(92210): AVFoundation media engine is disabled on OS X
+ https://bugs.webkit.org/show_bug.cgi?id=67316
+
+ Move the definition of WTF_USE_AVFOUNDATION on the Mac back to _javascript_Core/wtf/Platform.h,
+ since WebKit2 doesn't have access to WebCore/config.h on this platform. This reverts the
+ changes that were made in r92210.
+
+ Reviewed by Darin Adler.
+
+ No new tests, covered by existing media tests.
+
+ * config.h: Removed definition of WTF_USE_AVFOUNDATION on the Mac, add a comment about fixing this on Windows in the future.
+
2011-08-29 Lucas Forschler <[email protected]>
Merged 92982
Modified: branches/safari-534.51-branch/Source/WebCore/config.h (94602 => 94603)
--- branches/safari-534.51-branch/Source/WebCore/config.h 2011-09-06 22:17:07 UTC (rev 94602)
+++ branches/safari-534.51-branch/Source/WebCore/config.h 2011-09-06 22:19:28 UTC (rev 94603)
@@ -256,10 +256,8 @@
#include <bridge/npruntime_internal.h>
#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-#define WTF_USE_AVFOUNDATION 1
-#endif
-
+// 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)
#define WTF_USE_AVFOUNDATION 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
