Move all ANDROID defines to wtf/Platform.h

This patch moves many defines from WebCore/config.h to keep
all of the Android defines together.

Also, WebCore/config.h should not be used by JavaScriptCore
(though currently it is on Android), whereas wtf/Platform.h
is always included.

Some Android defines in WebCore/config.h are already usptreamed,
but will be removed in https://bugs.webkit.org/show_bug.cgi?id=62602

Change-Id: Ic6d8c45f4f846a2a7a2d9766179302526c10e2af

1 files changed, 1 insertions, 130 deletions

diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h
index 513a6c6..2a35610 100644
--- a/Source/WebCore/config.h
+++ b/Source/WebCore/config.h
@@ -109,136 +109,6 @@
 
 #endif /* OS(WINDOWS) */
 
-// ANDROID def should be after all PLATFORM to avoid override.
-#if PLATFORM(ANDROID)
-#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_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
-
-#if ENABLE_SVG
-#if !defined(ENABLE_SVG_ANIMATION)
-#define ENABLE_SVG_ANIMATION 0 // to enable:
-    // fix error: no matching function for call to 'sort(WebCore::SVGSMILElement**, WebCore::SVGSMILElement**, WebCore::PriorityCompare)'
-    // fix error: no matching function for call to 'sort(WebCore::SMILTime*, WebCore::SMILTime*)'
-    // add ENABLE_SVG_ANIMATION=1 to SVG_FLAGS in JavaScriptCore.derived.mk
-#endif
-#define ENABLE_SVG_AS_IMAGE 1
-#define ENABLE_SVG_FILTERS 1
-#define ENABLE_SVG_FONTS 1
-#define ENABLE_SVG_FOREIGN_OBJECT 1
-#define ENABLE_SVG_USE 1
-#endif
-
-#define ENABLE_XBL 0
-#define ENABLE_XHTMLMP 0
-#define ENABLE_XPATH 1
-#define ENABLE_XSLT 1
-#define ENABLE_OFFLINE_WEB_APPLICATIONS 1
-#define ENABLE_TOUCH_EVENTS 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
-#define ENABLE_DEVICE_ORIENTATION 1
-
-#undef ENABLE_APPLICATION_INSTALLED
-#define ENABLE_APPLICATION_INSTALLED 1
-
-#define ENABLE_ANDROID_INSTALLABLE_WEB_APPS 1
-
-// Uses composited RenderLayers for fixed elements
-#undef ENABLE_COMPOSITED_FIXED_ELEMENTS // Disabled by default in Platform.h
-#define ENABLE_COMPOSITED_FIXED_ELEMENTS 1
-
-#define ENABLE_FILE_READER 1
-#define ENABLE_BLOB 1
-
-#define ANDROID_FLATTEN_FRAMESET
-
-#define ANDROID_LAYOUT
-
-#define ANDROID_FIX
-
-// Ensure that the fixed elements are always relative to the top document.
-#define ANDROID_FIXED_ELEMENTS
-
-// Passes the webkit-originated changes of a focused textfield to our UI
-// thread
-#define ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
-
-// Allow us to turn off the blinking caret as desired.
-#define ANDROID_ALLOW_TURNING_OFF_CARET
-
-#define ANDROID_META_SUPPORT
-
-// Converts ListBoxes to dropdown popup lists.
-#define ENABLE_NO_LISTBOX_RENDERING 1
-
-#define ANDROID_MULTIPLE_WINDOWS
-#define ANDROID_CSS_RING
-#define ANDROID_CSS_TAP_HIGHLIGHT_COLOR
-
-#define ANDROID_BLOCK_NETWORK_IMAGE
-
-// Changes needed to support native plugins (npapi.h). If the change is generic,
-// it may be under a different #define (see: PLUGIN_PLATFORM_SETVALUE,
-// PLUGIN_SCHEDULE_TIMER)
-#define ANDROID_PLUGINS
-
-// This enables a portable implementation of NPN_[Un]ScheduleTimer
-// Will submit this as a patch to apple
-#define PLUGIN_SCHEDULE_TIMER
-
-// This adds platformInit() and platformSetValue() to pluginview
-// Will submit this as a patch to apple
-#define PLUGIN_PLATFORM_SETVALUE
-
-// This enables logging the DOM tree, Render tree even for the release build
-#define ANDROID_DOM_LOGGING
-
-// Notify WebViewCore when a clipped out rectangle is drawn,
-// so that all invals are captured by the display tree.
-#define ANDROID_CAPTURE_OFFSCREEN_PAINTS
-
-// Enable dumping the display tree to a file (triggered in WebView.java)
-#define ANDROID_DUMP_DISPLAY_TREE
-
-// Animated GIF support.
-#define ANDROID_ANIMATED_GIF
-
-// apple-touch-icon support in <link> tags
-#define ANDROID_APPLE_TOUCH_ICON
-
-// track changes to the style that may change what is drawn
-#define ANDROID_STYLE_VERSION
-
-// Enable prefetching when specified via the rel element of <link> elements.
-#define ENABLE_LINK_PREFETCH 1
-
-// Enable scrollable divs in separate layers.  This might be upstreamed to
-// webkit.org but for now, it is just an Android feature.
-#define ENABLE_ANDROID_OVERFLOW_SCROLL 1
-
-#if !defined(WTF_USE_CHROME_NETWORK_STACK)
-#define WTF_USE_CHROME_NETWORK_STACK 0
-#endif /* !defined(WTF_USE_CHROME_NETWORK_STACK) */
-
-// This is present in JavaScriptCore/config.h, which Android does not use.
-#define WTF_CHANGES 1
-
-#endif /* PLATFORM(ANDROID) */
-
 #ifdef __cplusplus
 
 // These undefs match up with defines in WebCorePrefix.h for Mac OS X.
@@ -351,3 +221,4 @@ typedef float CGFloat;
 /* protect ourselves from evil X11 defines */
 #include <bridge/npruntime_internal.h>
 #endif
+