diff options
author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebCore/WebCore.pri | |
parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebCore/WebCore.pri')
-rw-r--r-- | WebCore/WebCore.pri | 203 |
1 files changed, 7 insertions, 196 deletions
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri index ff65cae..b0effee 100644 --- a/WebCore/WebCore.pri +++ b/WebCore/WebCore.pri @@ -1,5 +1,6 @@ include(../common.pri) +include(features.pri) CONFIG(standalone_package) { isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated @@ -7,199 +8,6 @@ CONFIG(standalone_package) { isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated } -CONFIG(minimal) { - DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0 -} - -## load mobilityconfig if mobility is available -load(mobilityconfig, true) - -## Define default features macros for optional components -## (look for defs in config.h and included files!) -# Try to locate sqlite3 source -CONFIG(QTDIR_build) { - SQLITE3SRCDIR = $$QT_SOURCE_TREE/src/3rdparty/sqlite/ -} else { - SQLITE3SRCDIR = $$(SQLITE3SRCDIR) - isEmpty(SQLITE3SRCDIR) { - SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ - } -} - -contains(DEFINES, ENABLE_SINGLE_THREADED=1) { - DEFINES+=ENABLE_DATABASE=0 ENABLE_DOM_STORAGE=0 ENABLE_ICONDATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 -} - -# turn off SQLITE support if we do not have sqlite3 available -!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0 - -!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1 -!contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1 -!contains(DEFINES, ENABLE_EVENTSOURCE=.): DEFINES += ENABLE_EVENTSOURCE=1 -!contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=.): DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1 -!contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1 -!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1 -!contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1 -!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0 -!contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0 -!contains(DEFINES, ENABLE_FILE_SYSTEM=.): DEFINES += ENABLE_FILE_SYSTEM=0 - -# turn on SQLITE support if any of the dependent features are turned on -!contains(DEFINES, ENABLE_SQLITE=.) { - contains(DEFINES, ENABLE_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) { - DEFINES += ENABLE_SQLITE=1 - } else { - DEFINES += ENABLE_SQLITE=0 - } -} - -!contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0 -!contains(DEFINES, ENABLE_FILTERS=.): DEFINES += ENABLE_FILTERS=1 -!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1 -#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1 -!contains(DEFINES, ENABLE_WCSS=.): DEFINES += ENABLE_WCSS=0 -!contains(DEFINES, ENABLE_WML=.): DEFINES += ENABLE_WML=0 -!contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1 -!contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1 -!contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0 -!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=0 -!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1 -!contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1 -!contains(DEFINES, ENABLE_METER_TAG=.): DEFINES += ENABLE_METER_TAG=1 -!contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1 -!contains(DEFINES, ENABLE_BLOB_SLICE=.): DEFINES += ENABLE_BLOB_SLICE=0 -!contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1 -!contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0 -!contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0 - -greaterThan(QT_MINOR_VERSION, 5) { - !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1 -} - -# SVG support -!contains(DEFINES, ENABLE_SVG=0) { - !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1 - !contains(DEFINES, ENABLE_SVG_FONTS=.): DEFINES += ENABLE_SVG_FONTS=1 - !contains(DEFINES, ENABLE_SVG_FOREIGN_OBJECT=.): DEFINES += ENABLE_SVG_FOREIGN_OBJECT=1 - !contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1 - !contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1 - !contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1 -} else { - DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0 -} - -# HTML5 datalist support -!contains(DEFINES, ENABLE_DATALIST=.): DEFINES += ENABLE_DATALIST=1 - -# Tiled Backing Store support -greaterThan(QT_MINOR_VERSION, 5) { - !contains(DEFINES, ENABLE_TILED_BACKING_STORE=.): DEFINES += ENABLE_TILED_BACKING_STORE=1 -} - -# Nescape plugins support (NPAPI) -!contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=.) { - unix|win32-*:!embedded:!wince*: { - DEFINES += ENABLE_NETSCAPE_PLUGIN_API=1 - } else { - DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0 - } -} - -# Web Socket support. -!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1 - -# Web Timing support. -!contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=0 - -# XSLT support with QtXmlPatterns -!contains(DEFINES, ENABLE_XSLT=.) { - contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1 - else:DEFINES += ENABLE_XSLT=0 -} - -# geolocation support if QtMobility exists -!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_GEOLOCATION=.) { - contains(MOBILITY_CONFIG, location) { - DEFINES += ENABLE_GEOLOCATION=1 - } -} - -# Bearer management is part of Qt 4.7 -# for older version, check for mobility with bearer -!contains(DEFINES, ENABLE_QT_BEARER=.) { - !lessThan(QT_MINOR_VERSION, 7) { - DEFINES += ENABLE_QT_BEARER=1 - } else { - contains(MOBILITY_CONFIG, bearer) { - DEFINES += ENABLE_QT_BEARER=1 - } - } -} - -# Enable touch event support with Qt 4.6 -!lessThan(QT_MINOR_VERSION, 6): DEFINES += ENABLE_TOUCH_EVENTS=1 - -# HTML5 Media Support -# We require QtMultimedia or Phonon -!contains(DEFINES, ENABLE_VIDEO=.) { - DEFINES -= ENABLE_VIDEO=1 - DEFINES += ENABLE_VIDEO=0 - - !lessThan(QT_MINOR_VERSION, 6):contains(MOBILITY_CONFIG, multimedia) { - DEFINES -= ENABLE_VIDEO=0 - DEFINES += ENABLE_VIDEO=1 - } else:contains(QT_CONFIG, phonon) { - DEFINES -= ENABLE_VIDEO=0 - DEFINES += ENABLE_VIDEO=1 - } -} - -# Used to compute defaults for the build-webkit script -CONFIG(compute_defaults) { - message($$DEFINES) - error("Done computing defaults") -} - -contains(DEFINES, ENABLE_WCSS=1) { - contains(DEFINES, ENABLE_XHTMLMP=0) { - DEFINES -= ENABLE_XHTMLMP=0 - DEFINES += ENABLE_XHTMLMP=1 - } -} - -## Forward enabled feature macros to JavaScript enabled features macros -FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1 -contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1 -contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1 -contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0): DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in -contains(DEFINES, ENABLE_DATAGRID=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=1 -contains(DEFINES, ENABLE_EVENTSOURCE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_EVENTSOURCE=1 -contains(DEFINES, ENABLE_DATABASE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1 -contains(DEFINES, ENABLE_DATALIST=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATALIST=1 -contains(DEFINES, ENABLE_DOM_STORAGE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1 -contains(DEFINES, ENABLE_SHARED_SCRIPT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_SCRIPT=1 -contains(DEFINES, ENABLE_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WORKERS=1 -contains(DEFINES, ENABLE_SHARED_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1 -contains(DEFINES, ENABLE_VIDEO=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1 -contains(DEFINES, ENABLE_XPATH=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1 -contains(DEFINES, ENABLE_XSLT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1 -contains(DEFINES, ENABLE_XBL=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1 -contains(DEFINES, ENABLE_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1 -contains(DEFINES, ENABLE_WCSS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WCSS=1 -contains(DEFINES, ENABLE_WML=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WML=1 -contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1 -contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1 -contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1 -contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1 -contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1 -contains(DEFINES, ENABLE_WEB_TIMING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_TIMING=1 -contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1 -contains(DEFINES, ENABLE_TILED_BACKING_STORE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TILED_BACKING_STORE=1 -contains(DEFINES, ENABLE_NOTIFICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_NOTIFICATIONS=1 -contains(DEFINES, ENABLE_METER_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_METER_TAG=1 -contains(DEFINES, ENABLE_PROGRESS_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_PROGRESS_TAG=1 -contains(DEFINES, ENABLE_GEOLOCATION=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_GEOLOCATION=1 - ## Derived source generators MATHML_NAMES = $$PWD/mathml/mathtags.in @@ -293,6 +101,7 @@ IDL_BINDINGS += \ dom/Comment.idl \ dom/CompositionEvent.idl \ dom/CustomEvent.idl \ + dom/DeviceMotionEvent.idl \ dom/DeviceOrientationEvent.idl \ dom/DocumentFragment.idl \ dom/Document.idl \ @@ -483,18 +292,20 @@ IDL_BINDINGS += \ storage/DatabaseCallback.idl \ storage/DatabaseSync.idl \ storage/IDBAny.idl \ + storage/IDBCursor.idl \ storage/IDBDatabaseError.idl \ storage/IDBDatabaseException.idl \ - storage/IDBDatabaseRequest.idl \ + storage/IDBDatabase.idl \ storage/IDBErrorEvent.idl \ storage/IDBEvent.idl \ + storage/IDBFactory.idl \ storage/IDBIndex.idl \ storage/IDBKey.idl \ storage/IDBKeyRange.idl \ - storage/IDBObjectStoreRequest.idl \ + storage/IDBObjectStore.idl \ storage/IDBRequest.idl \ storage/IDBSuccessEvent.idl \ - storage/IDBFactory.idl \ + storage/IDBTransaction.idl \ storage/Storage.idl \ storage/StorageEvent.idl \ storage/SQLError.idl \ |