diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 08:15:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 08:15:24 -0700 |
| commit | fa91a01aee5d4a80ca6c80f722116b850f09996c (patch) | |
| tree | f72740e60d3c3d4f0ab144e88c03d1f134944ce3 /Source/cmakeconfig.h.cmake | |
| parent | 96f37d6d1b390f6690858789706ee6ec25bc1677 (diff) | |
| parent | feebf8e7a79ad68b04a1a948e2b8078d6e5f0048 (diff) | |
| download | external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.zip external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.gz external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.bz2 | |
Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f
* changes:
Merge WebKit at r78450: Update ThirdPartyProject.prop
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
Merge WebKit at r78450: FrameLoader::url() removed
Merge WebKit at r78450: HTMLParserQuirks removed
Merge WebKit at r78450: TextRun::padding() renamed
Merge WebKit at r78450: Use new FontMetrics
Merge WebKit at r78450: GraphicsContext current path removed
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
Merge WebKit at r78450: IntRect::bottom()/right() renamed
Merge WebKit at r78450: Fix remaining conflicts
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
Merge WebKit at r78450: Fix conflicts in media controls
Merge WebKit at r78450: Fix Makefiles
Merge WebKit at r78450: Initial merge by git.
Diffstat (limited to 'Source/cmakeconfig.h.cmake')
| -rw-r--r-- | Source/cmakeconfig.h.cmake | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake new file mode 100644 index 0000000..f92fda5 --- /dev/null +++ b/Source/cmakeconfig.h.cmake @@ -0,0 +1,45 @@ +#ifndef CMAKECONFIG_H +#define CMAKECONFIG_H + +#define WEBKIT_USER_AGENT_MAJOR_VERSION @USER_AGENT_VERSION_MAJOR@ +#define WEBKIT_USER_AGENT_MINOR_VERSION @USER_AGENT_VERSION_MINOR@ + +#define ENABLE_AS_IMAGE @ENABLE_AS_IMAGE_VALUE@ +#define ENABLE_BLOB @ENABLE_BLOB_VALUE@ +#define ENABLE_CHANNEL_MESSAGING @ENABLE_CHANNEL_MESSAGING_VALUE@ +#define ENABLE_DATABASE @ENABLE_DATABASE_VALUE@ +#define ENABLE_DATAGRID @ENABLE_DATAGRID_VALUE@ +#define ENABLE_DATALIST @ENABLE_DATALIST_VALUE@ +#define ENABLE_DOM_STORAGE @ENABLE_DOM_STORAGE_VALUE@ +#define ENABLE_EVENTSOURCE @ENABLE_EVENTSOURCE_VALUE@ +#define ENABLE_FAST_MOBILE_SCROLLING @ENABLE_FAST_MOBILE_SCROLLING_VALUE@ +#define ENABLE_FILTERS @ENABLE_FILTERS_VALUE@ +#define ENABLE_FTPDIR @ENABLE_FTPDIR_VALUE@ +#define ENABLE_GEOLOCATION @ENABLE_GEOLOCATION_VALUE@ +#define ENABLE_GLIB_SUPPORT @ENABLE_GLIB_SUPPORT_VALUE@ +#define ENABLE_ICONDATABASE @ENABLE_ICONDATABASE_VALUE@ +#define ENABLE_INSPECTOR @ENABLE_INSPECTOR_VALUE@ +#define ENABLE_JAVASCRIPT_DEBUGGER @ENABLE_JAVASCRIPT_DEBUGGER_VALUE@ +#define ENABLE_JIT @ENABLE_JIT_VALUE@ +#define ENABLE_MATHML @ENABLE_MATHML_VALUE@ +#define ENABLE_NETSCAPE_PLUGIN_API @ENABLE_NETSCAPE_PLUGIN_API_VALUE@ +#define ENABLE_NOTIFICATIONS @ENABLE_NOTIFICATIONS_VALUE@ +#define ENABLE_OFFLINE_WEB_APPLICATIONS @ENABLE_OFFLINE_WEB_APPLICATIONS_VALUE@ +#define ENABLE_ORIENTATION_EVENTS @ENABLE_ORIENTATION_EVENTS_VALUE@ +#define ENABLE_PROGRESS_TAG @ENABLE_PROGRESS_TAG_VALUE@ +#define ENABLE_SHARED_WORKERS @ENABLE_SHARED_WORKERS_VALUE@ +#define ENABLE_SVG @ENABLE_SVG_VALUE@ +#define ENABLE_SVG_ANIMATION @ENABLE_SVG_ANIMATION_VALUE@ +#define ENABLE_SVG_FONTS @ENABLE_SVG_FONTS_VALUE@ +#define ENABLE_SVG_FOREIGN_OBJECT @ENABLE_SVG_FOREIGN_OBJECT_VALUE@ +#define ENABLE_SVG_USE @ENABLE_SVG_USE_VALUE@ +#define ENABLE_TOUCH_EVENTS @ENABLE_TOUCH_EVENTS_VALUE@ +#define ENABLE_VIDEO @ENABLE_VIDEO_VALUE@ +#define ENABLE_WEB_SOCKETS @ENABLE_WEB_SOCKETS_VALUE@ +#define ENABLE_WML @ENABLE_WML_VALUE@ +#define ENABLE_WORKERS @ENABLE_WORKERS_VALUE@ +#define ENABLE_XHTMLMP @ENABLE_XHTMLMP_VALUE@ +#define ENABLE_XPATH @ENABLE_XPATH_VALUE@ +#define ENABLE_XSLT @ENABLE_XSLT_VALUE@ + +#endif /* CMAKECONFIG_H */ |