Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 124 deletions

diff --git a/WebCore/Configurations/FeatureDefines.xcconfig b/WebCore/Configurations/FeatureDefines.xcconfig
deleted file mode 100644
index 46d5de4..0000000
--- a/WebCore/Configurations/FeatureDefines.xcconfig
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
-// Copyright (C) 2009 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-// The contents of this file must be kept in sync with FeatureDefines.xcconfig in JavaScriptCore,
-// WebCore and WebKit.  Also the default values of the ENABLE_FEATURE_NAME macros in build-webkit
-// should match the values below, but they do not need to be in the same order.
-
-// Keep this list of features (not enabled/disabled state) in sync with FeatureDefines.vsprops
-// and FeatureDefinesCairo.vsprops in WebKitLibraries/win/tools/vsprops.
-
-// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
-
-ENABLE_LINK_PREFETCH = ;
-
-ENABLE_ACCELERATED_2D_CANVAS = $(ENABLE_ACCELERATED_2D_CANVAS_$(REAL_PLATFORM_NAME));
-ENABLE_ACCELERATED_2D_CANVAS_macosx = $(ENABLE_ACCELERATED_2D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1060 = ;
-ENABLE_ACCELERATED_2D_CANVAS_macosx_1070 = ;
-
-ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(REAL_PLATFORM_NAME));
-ENABLE_3D_CANVAS_macosx = $(ENABLE_3D_CANVAS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_3D_CANVAS_macosx_1060 = ENABLE_3D_CANVAS;
-ENABLE_3D_CANVAS_macosx_1070 = ENABLE_3D_CANVAS;
-
-ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(REAL_PLATFORM_NAME));
-ENABLE_3D_RENDERING_iphoneos = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_iphonesimulator = $(ENABLE_3D_RENDERING_iphoneos);
-ENABLE_3D_RENDERING_macosx = $(ENABLE_3D_RENDERING_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
-ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
-
-ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
-ENABLE_BLOB_macosx = ENABLE_BLOB;
-
-ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
-ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
-
-ENABLE_CLIENT_BASED_GEOLOCATION = $(ENABLE_CLIENT_BASED_GEOLOCATION_$(REAL_PLATFORM_NAME));
-ENABLE_CLIENT_BASED_GEOLOCATION_macosx = ENABLE_CLIENT_BASED_GEOLOCATION;
-
-ENABLE_DATABASE = ENABLE_DATABASE;
-ENABLE_DATAGRID = ;
-
-ENABLE_DATALIST = $(ENABLE_DATALIST_$(REAL_PLATFORM_NAME));
-ENABLE_DATALIST_macosx = ENABLE_DATALIST;
-
-ENABLE_DEVICE_ORIENTATION = ;
-ENABLE_DIRECTORY_UPLOAD = ;
-ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
-ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
-
-ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
-ENABLE_FILTERS_macosx = ENABLE_FILTERS;
-
-ENABLE_FILE_SYSTEM = ;
-ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
-ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
-
-ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
-ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
-
-ENABLE_IMAGE_RESIZER = ;
-ENABLE_INDEXED_DATABASE = ;
-ENABLE_INPUT_SPEECH = ;
-ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
-ENABLE_MATHML = ENABLE_MATHML;
-ENABLE_METER_TAG = ENABLE_METER_TAG;
-ENABLE_NOTIFICATIONS = ;
-ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
-ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
-
-ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_SHARED_WORKERS_macosx = ENABLE_SHARED_WORKERS;
-
-ENABLE_SVG = ENABLE_SVG;
-ENABLE_SVG_ANIMATION = ENABLE_SVG_ANIMATION;
-ENABLE_SVG_AS_IMAGE = ENABLE_SVG_AS_IMAGE;
-
-ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(REAL_PLATFORM_NAME));
-ENABLE_SVG_DOM_OBJC_BINDINGS_macosx = ENABLE_SVG_DOM_OBJC_BINDINGS;
-
-ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_SVG_FOREIGN_OBJECT = ENABLE_SVG_FOREIGN_OBJECT;
-ENABLE_SVG_USE = ENABLE_SVG_USE;
-ENABLE_VIDEO = ENABLE_VIDEO;
-
-ENABLE_WEB_AUDIO = ;
-
-ENABLE_WEB_SOCKETS = $(ENABLE_WEB_SOCKETS_$(REAL_PLATFORM_NAME));
-ENABLE_WEB_SOCKETS_macosx = ENABLE_WEB_SOCKETS;
-
-ENABLE_WEB_TIMING = ;
-ENABLE_WML = ;
-
-ENABLE_WORKERS = $(ENABLE_WORKERS_$(REAL_PLATFORM_NAME));
-ENABLE_WORKERS_macosx = ENABLE_WORKERS;
-
-ENABLE_XHTMLMP = ;
-ENABLE_XPATH = ENABLE_XPATH;
-ENABLE_XSLT = ENABLE_XSLT;
-
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);