Title: [88741] trunk/Source/WebCore
- Revision
- 88741
- Author
- [email protected]
- Date
- 2011-06-13 17:53:47 -0700 (Mon, 13 Jun 2011)
Log Message
2011-06-13 Steve Block <[email protected]>
Reviewed by Darin Adler.
Remove Android defines from WebCore/config.h
https://bugs.webkit.org/show_bug.cgi?id=62602
No new tests, build cleanup only.
* config.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88740 => 88741)
--- trunk/Source/WebCore/ChangeLog 2011-06-14 00:42:09 UTC (rev 88740)
+++ trunk/Source/WebCore/ChangeLog 2011-06-14 00:53:47 UTC (rev 88741)
@@ -1,3 +1,14 @@
+2011-06-13 Steve Block <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ Remove Android defines from WebCore/config.h
+ https://bugs.webkit.org/show_bug.cgi?id=62602
+
+ No new tests, build cleanup only.
+
+ * config.h:
+
2011-06-13 Adam Barth <[email protected]>
Reviewed by David Levin.
Modified: trunk/Source/WebCore/config.h (88740 => 88741)
--- trunk/Source/WebCore/config.h 2011-06-14 00:42:09 UTC (rev 88740)
+++ trunk/Source/WebCore/config.h 2011-06-14 00:53:47 UTC (rev 88741)
@@ -109,41 +109,6 @@
#endif /* OS(WINDOWS) */
-#if PLATFORM(ANDROID)
-// Android uses a single set of include directories when building WebKit and
-// _javascript_Core. Since WebCore/ is included before _javascript_Core/, Android
-// includes _javascript_Core/config.h explicitly here to make sure it gets picked
-// up.
-#include <_javascript_Core/config.h>
-
-#define WEBCORE_NAVIGATOR_VENDOR "Google Inc."
-// This must be defined before we include FastMalloc.h, below.
-#define USE_SYSTEM_MALLOC 1
-#define LOG_DISABLED 1
-#include <wtf/Assertions.h>
-// Central place to set which optional features Android uses.
-#define ENABLE_CHANNEL_MESSAGING 1
-#define ENABLE_DOM_STORAGE 1
-#undef ENABLE_FTPDIR // Enabled by default in Platform.h
-#define ENABLE_FTPDIR 0
-#ifndef ENABLE_SVG
-#define ENABLE_SVG 0
-#endif
-#define ENABLE_VIDEO 1
-#define ENABLE_WORKERS 1
-#define ENABLE_XBL 0
-#define ENABLE_XHTMLMP 0
-#define ENABLE_XPATH 0
-#define ENABLE_XSLT 0
-#define ENABLE_ARCHIVE 0
-#define ENABLE_OFFLINE_WEB_APPLICATIONS 1
-#undef ENABLE_GEOLOCATION // Disabled by default in Platform.h
-#define ENABLE_GEOLOCATION 1
-#undef ENABLE_INSPECTOR // Enabled by default in Platform.h
-#define ENABLE_INSPECTOR 0
-#define ENABLE_EVENT_SOURCE 0
-#endif /* PLATFORM(ANDROID) */
-
#ifdef __cplusplus
// These undefs match up with defines in WebCorePrefix.h for Mac OS X.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
