Title: [92504] branches/safari-534.51-branch/Source
Diff
Modified: branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog (92503 => 92504)
--- branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog 2011-08-05 20:33:01 UTC (rev 92503)
+++ branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog 2011-08-05 20:33:15 UTC (rev 92504)
@@ -1,3 +1,18 @@
+2011-08-05 Lucas Forschler <[email protected]>
+
+ Merged 92210.
+
+ 2011-08-02 Jeff Miller <[email protected]>
+
+ Move WTF_USE_AVFOUNDATION from _javascript_Core/wtf/platform.h to WebCore/config.h
+ https://bugs.webkit.org/show_bug.cgi?id=65552
+
+ Since this is a WebCore feature, there's no need to define it in _javascript_Core/wtf/platform.h.
+
+ Reviewed by Adam Roben.
+
+ * wtf/Platform.h: Removed WTF_USE_AVFOUNDATION.
+
2011-07-22 Lucas Forschler <[email protected]>
Merged 87103.
Modified: branches/safari-534.51-branch/Source/_javascript_Core/wtf/Platform.h (92503 => 92504)
--- branches/safari-534.51-branch/Source/_javascript_Core/wtf/Platform.h 2011-08-05 20:33:01 UTC (rev 92503)
+++ branches/safari-534.51-branch/Source/_javascript_Core/wtf/Platform.h 2011-08-05 20:33:15 UTC (rev 92504)
@@ -1153,10 +1153,6 @@
#define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-#define WTF_USE_AVFOUNDATION 1
-#endif
-
#if COMPILER(GCC)
#define WARN_UNUSED_RETURN __attribute__ ((warn_unused_result))
#else
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92503 => 92504)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 20:33:01 UTC (rev 92503)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 20:33:15 UTC (rev 92504)
@@ -1,5 +1,22 @@
2011-08-05 Lucas Forschler <[email protected]>
+ Merged 92210.
+
+ 2011-08-02 Jeff Miller <[email protected]>
+
+ Move WTF_USE_AVFOUNDATION from _javascript_Core/wtf/platform.h to WebCore/config.h
+ https://bugs.webkit.org/show_bug.cgi?id=65552
+
+ Since this is a WebCore feature, there's no need to define it in _javascript_Core/wtf/platform.h.
+
+ Reviewed by Adam Roben.
+
+ No change in functionality, so new tests.
+
+ * config.h: Added WTF_USE_AVFOUNDATION.
+
+2011-08-05 Lucas Forschler <[email protected]>
+
Merged 92035.
2011-08-05 Lucas Forschler <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/config.h (92503 => 92504)
--- branches/safari-534.51-branch/Source/WebCore/config.h 2011-08-05 20:33:01 UTC (rev 92503)
+++ branches/safari-534.51-branch/Source/WebCore/config.h 2011-08-05 20:33:15 UTC (rev 92504)
@@ -238,7 +238,6 @@
#endif
#endif /* USE(CG) */
-
#if PLATFORM(WIN) && USE(CG)
#define WTF_USE_SAFARI_THEME 1
#endif
@@ -253,3 +252,7 @@
#include <bridge/npruntime_internal.h>
#endif
+#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#define WTF_USE_AVFOUNDATION 1
+#endif
+
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
