diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-04-21 17:31:08 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-04-22 11:02:03 -0700 |
| commit | 0eec6dc8b27223eddc5f02396f82d4ae887fae02 (patch) | |
| tree | b1bca10c46608ab207844b0bd12048f88d848b98 | |
| parent | a0584f084721f17a0d034361a414cfb4e65736a6 (diff) | |
| download | external_webkit-0eec6dc8b27223eddc5f02396f82d4ae887fae02.zip external_webkit-0eec6dc8b27223eddc5f02396f82d4ae887fae02.tar.gz external_webkit-0eec6dc8b27223eddc5f02396f82d4ae887fae02.tar.bz2 | |
Enable XSLT in Android webkit.
Before this change, the libwebcore size is: 4902184 Bytes
After this change, the libwebcore size is: 5103712 Bytes
The diff is: 200KB.
Change-Id: I2554a043c2686de56c802e8a9e02cce604fb25c0
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 3 | ||||
| -rw-r--r-- | WebCore/Android.mk | 11 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 4 | ||||
| -rw-r--r-- | WebCore/config.h | 2 |
7 files changed, 22 insertions, 4 deletions
@@ -92,6 +92,7 @@ LOCAL_C_INCLUDES := \ external/icu4c/common \ external/icu4c/i18n \ external/libxml2/include \ + external/libxslt \ external/skia/emoji \ external/skia/include/core \ external/skia/include/effects \ @@ -294,7 +295,7 @@ include external/stlport/libstlport.mk endif # Build the list of static libraries -LOCAL_STATIC_LIBRARIES := libxml2 +LOCAL_STATIC_LIBRARIES := libxml2 libxslt ifeq ($(JAVASCRIPT_ENGINE),v8) LOCAL_STATIC_LIBRARIES += libv8 endif diff --git a/CleanSpec.mk b/CleanSpec.mk index cf1cd55..7b7b3c9 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -50,6 +50,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_int $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 00f272a..b06a0f2 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -49,7 +49,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ bindings/scripts/generate-bindings.pl \ ) -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 # CSS GEN := \ diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index d043842..18e8d68 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -31,7 +31,7 @@ js_binding_scripts := \ $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 # CSS GEN := \ @@ -542,6 +542,7 @@ GEN := \ $(intermediates)/bindings/V8XMLHttpRequestProgressEvent.h \ $(intermediates)/bindings/V8XMLHttpRequestUpload.h \ $(intermediates)/bindings/V8XMLSerializer.h \ + $(intermediates)/bindings/V8XSLTProcessor.h \ $(intermediates)/bindings/V8XPathException.h \ $(intermediates)/bindings/V8XPathExpression.h \ $(intermediates)/bindings/V8XPathEvaluator.h \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 54c11f0..9af1bae 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -958,3 +958,14 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ xml/XPathValue.cpp \ xml/XPathVariableReference.cpp \ xml/NativeXPathNSResolver.cpp + +# For XSLT +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + xml/XSLTExtensions.cpp \ + xml/XSLTProcessorLibxslt.cpp \ + xml/XSLTProcessor.cpp \ + xml/XSLTUnicodeSort.cpp \ + xml/XSLStyleSheetLibxslt.cpp \ + xml/XSLImportRule.cpp \ + loader/CachedXSLStyleSheet.cpp \ + dom/TransformSourceLibxslt.cpp diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 29ae3f9..603ca74 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -204,3 +204,7 @@ LOCAL_SRC_FILES += \ # For XPath. LOCAL_SRC_FILES += \ bindings/v8/custom/V8CustomXPathNSResolver.cpp + +# For XSLT. +LOCAL_SRC_FILES += \ + bindings/v8/custom/V8XSLTProcessorCustom.cpp diff --git a/WebCore/config.h b/WebCore/config.h index 00b5d05..863423b 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -111,7 +111,7 @@ #define ENABLE_XBL 0 #define ENABLE_XHTMLMP 0 #define ENABLE_XPATH 1 -#define ENABLE_XSLT 0 +#define ENABLE_XSLT 1 #undef ENABLE_ARCHIVE // Enabled by default in Platform.h #define ENABLE_ARCHIVE 0 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1 |