Title: [107678] trunk/Source/_javascript_Core
- Revision
- 107678
- Author
- [email protected]
- Date
- 2012-02-14 00:05:50 -0800 (Tue, 14 Feb 2012)
Log Message
Upstream Android's additions to Platform.h
https://bugs.webkit.org/show_bug.cgi?id=78536
Reviewed by Adam Barth.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (107677 => 107678)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-14 07:54:48 UTC (rev 107677)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-14 08:05:50 UTC (rev 107678)
@@ -1,3 +1,12 @@
+2012-02-14 Eric Seidel <[email protected]>
+
+ Upstream Android's additions to Platform.h
+ https://bugs.webkit.org/show_bug.cgi?id=78536
+
+ Reviewed by Adam Barth.
+
+ * wtf/Platform.h:
+
2012-02-12 Mark Hahnenberg <[email protected]>
Replace old strtod with new strtod
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (107677 => 107678)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2012-02-14 07:54:48 UTC (rev 107677)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2012-02-14 08:05:50 UTC (rev 107678)
@@ -459,7 +459,7 @@
#define WTF_USE_CA 1
#endif
-/* USE(SKIA) for Win/Linux, CG for Mac, unless enabled */
+/* USE(SKIA) for Win/Linux/Mac/Android */
#if PLATFORM(CHROMIUM)
#if OS(DARWIN)
#if USE(SKIA_ON_MAC_CHROMIUM)
@@ -470,6 +470,9 @@
#define WTF_USE_ATSUI 1
#define WTF_USE_CORE_TEXT 1
#define WTF_USE_ICCJPEG 1
+#elif OS(ANDROID)
+#define WTF_USE_SKIA 1
+#define WTF_USE_GLES2_RENDERING 0
#else
#define WTF_USE_SKIA 1
#define WTF_USE_CHROMIUM_NET 1
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
