Always enable ENABLE(XPATH)
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Oct 2011 17:21:28 +0000 (17:21 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Oct 2011 17:21:28 +0000 (17:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=70217

Reviewed by Eric Seidel.

.:

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsWinCE.cmake:
* Source/cmakeconfig.h.cmake:
* configure.ac:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

As discussed on webkit-dev, we're reducing the complexity of WebKit by
removing unneeded configuration options.  ENABLE(XPATH) is enabled on
every port, so we are removing the ability to disable the feature.

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* UseJSC.cmake:
* WebCore.pro:
* bindings/js/JSCustomXPathNSResolver.cpp:
* bindings/js/JSCustomXPathNSResolver.h:
* bindings/js/JSDOMBinding.cpp:
(WebCore::setDOMException):
* bindings/js/JSExceptionBase.cpp:
(WebCore::toExceptionBase):
* bindings/js/JSXPathResultCustom.cpp:
* bindings/objc/DOMCustomXPathNSResolver.h:
* bindings/objc/DOMCustomXPathNSResolver.mm:
* bindings/objc/DOMInternal.h:
* bindings/objc/DOMUtility.mm:
(JSC::createDOMWrapper):
* bindings/objc/DOMXPath.mm:
(kit):
* bindings/objc/PublicDOMInterfaces.h:
* bindings/v8/V8DOMWrapper.cpp:
(WebCore::V8DOMWrapper::getXPathNSResolver):
* bindings/v8/V8DOMWrapper.h:
* bindings/v8/V8Proxy.cpp:
(WebCore::V8Proxy::setDOMException):
* bindings/v8/V8Proxy.h:
* bindings/v8/custom/V8CustomXPathNSResolver.cpp:
* bindings/v8/custom/V8CustomXPathNSResolver.h:
* bindings/v8/custom/V8DocumentCustom.cpp:
(WebCore::V8Document::evaluateCallback):
* dom/Document.cpp:
* dom/Document.h:
* dom/Document.idl:
* dom/ExceptionCode.cpp:
(WebCore::getExceptionCodeDescription):
* dom/ExceptionCode.h:
* features.pri:
* inspector/InspectorDOMAgent.cpp:
* page/DOMWindow.idl:
* xml/NativeXPathNSResolver.cpp:
* xml/NativeXPathNSResolver.h:
* xml/XPathEvaluator.cpp:
* xml/XPathEvaluator.h:
* xml/XPathEvaluator.idl:
* xml/XPathException.h:
* xml/XPathException.idl:
* xml/XPathExpression.cpp:
* xml/XPathExpression.h:
* xml/XPathExpression.idl:
* xml/XPathExpressionNode.cpp:
* xml/XPathExpressionNode.h:
* xml/XPathFunctions.cpp:
* xml/XPathFunctions.h:
* xml/XPathGrammar.y:
* xml/XPathNSResolver.cpp:
* xml/XPathNSResolver.h:
* xml/XPathNSResolver.idl:
* xml/XPathNodeSet.cpp:
* xml/XPathNodeSet.h:
* xml/XPathParser.cpp:
* xml/XPathParser.h:
* xml/XPathPath.cpp:
* xml/XPathPath.h:
* xml/XPathPredicate.cpp:
* xml/XPathPredicate.h:
* xml/XPathResult.cpp:
* xml/XPathResult.h:
* xml/XPathResult.idl:
* xml/XPathStep.cpp:
* xml/XPathStep.h:
* xml/XPathUtil.cpp:
* xml/XPathUtil.h:
* xml/XPathValue.cpp:
* xml/XPathValue.h:
* xml/XPathVariableReference.cpp:
* xml/XPathVariableReference.h:

Source/WebKit/chromium:

* features.gypi:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/win:

* Interfaces/DOMWindow.idl:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* Scripts/build-webkit:

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:
* win/tools/vsprops/FeatureDefinesCairo.vsprops:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

90 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/UseJSC.cmake
Source/WebCore/WebCore.pro
Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
Source/WebCore/bindings/js/JSCustomXPathNSResolver.h
Source/WebCore/bindings/js/JSDOMBinding.cpp
Source/WebCore/bindings/js/JSExceptionBase.cpp
Source/WebCore/bindings/js/JSXPathResultCustom.cpp
Source/WebCore/bindings/objc/DOMCustomXPathNSResolver.h
Source/WebCore/bindings/objc/DOMCustomXPathNSResolver.mm
Source/WebCore/bindings/objc/DOMInternal.h
Source/WebCore/bindings/objc/DOMUtility.mm
Source/WebCore/bindings/objc/DOMXPath.mm
Source/WebCore/bindings/objc/PublicDOMInterfaces.h
Source/WebCore/bindings/v8/V8DOMWrapper.cpp
Source/WebCore/bindings/v8/V8DOMWrapper.h
Source/WebCore/bindings/v8/V8Proxy.cpp
Source/WebCore/bindings/v8/V8Proxy.h
Source/WebCore/bindings/v8/custom/V8CustomXPathNSResolver.cpp
Source/WebCore/bindings/v8/custom/V8CustomXPathNSResolver.h
Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/Document.idl
Source/WebCore/dom/ExceptionCode.cpp
Source/WebCore/dom/ExceptionCode.h
Source/WebCore/features.pri
Source/WebCore/inspector/InspectorDOMAgent.cpp
Source/WebCore/page/DOMWindow.idl
Source/WebCore/xml/NativeXPathNSResolver.cpp
Source/WebCore/xml/NativeXPathNSResolver.h
Source/WebCore/xml/XPathEvaluator.cpp
Source/WebCore/xml/XPathEvaluator.h
Source/WebCore/xml/XPathEvaluator.idl
Source/WebCore/xml/XPathException.h
Source/WebCore/xml/XPathException.idl
Source/WebCore/xml/XPathExpression.cpp
Source/WebCore/xml/XPathExpression.h
Source/WebCore/xml/XPathExpression.idl
Source/WebCore/xml/XPathExpressionNode.cpp
Source/WebCore/xml/XPathExpressionNode.h
Source/WebCore/xml/XPathFunctions.cpp
Source/WebCore/xml/XPathFunctions.h
Source/WebCore/xml/XPathGrammar.y
Source/WebCore/xml/XPathNSResolver.cpp
Source/WebCore/xml/XPathNSResolver.h
Source/WebCore/xml/XPathNSResolver.idl
Source/WebCore/xml/XPathNodeSet.cpp
Source/WebCore/xml/XPathNodeSet.h
Source/WebCore/xml/XPathParser.cpp
Source/WebCore/xml/XPathParser.h
Source/WebCore/xml/XPathPath.cpp
Source/WebCore/xml/XPathPath.h
Source/WebCore/xml/XPathPredicate.cpp
Source/WebCore/xml/XPathPredicate.h
Source/WebCore/xml/XPathResult.cpp
Source/WebCore/xml/XPathResult.h
Source/WebCore/xml/XPathResult.idl
Source/WebCore/xml/XPathStep.cpp
Source/WebCore/xml/XPathStep.h
Source/WebCore/xml/XPathUtil.cpp
Source/WebCore/xml/XPathUtil.h
Source/WebCore/xml/XPathValue.cpp
Source/WebCore/xml/XPathValue.h
Source/WebCore/xml/XPathVariableReference.cpp
Source/WebCore/xml/XPathVariableReference.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit/win/ChangeLog
Source/WebKit/win/Interfaces/DOMWindow.idl
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsWinCE.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/build-webkit
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
configure.ac

index 800938f..dd75aec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsWinCE.cmake:
+        * Source/cmakeconfig.h.cmake:
+        * configure.ac:
+
 2011-10-18  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Merge QML plugin for WebKit2 with the original WebKit1 plugin
index 44113f1..11bc545 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-18  Gavin Barraclough  <barraclough@apple.com>
 
         Indexed arguments on the Arguments object should be enumerable.
index 6ddbbf9..238ed8b 100644 (file)
@@ -112,7 +112,6 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
index ea9f2fb..cab32ca 100644 (file)
@@ -389,6 +389,11 @@ SET(WebCore_IDL_FILES
     xml/XMLHttpRequestProgressEvent.idl
     xml/XMLHttpRequestUpload.idl
     xml/XMLSerializer.idl
+    xml/XPathEvaluator.idl
+    xml/XPathException.idl
+    xml/XPathExpression.idl
+    xml/XPathNSResolver.idl
+    xml/XPathResult.idl
     xml/XSLTProcessor.idl
 )
 
@@ -1583,16 +1588,6 @@ IF (ENABLE_BLOB OR ENABLE_FILE_SYSTEM)
     )
 ENDIF ()
 
-IF (ENABLE_XPATH)
-    LIST(APPEND WebCore_IDL_FILES
-        xml/XPathEvaluator.idl
-        xml/XPathException.idl
-        xml/XPathExpression.idl
-        xml/XPathNSResolver.idl
-        xml/XPathResult.idl
-    )
-ENDIF ()
-
 IF (ENABLE_SVG)
     LIST(APPEND WebCore_SOURCES
         css/SVGCSSComputedStyleDeclaration.cpp
index ff6dc03..21ac5df 100644 (file)
@@ -1,3 +1,92 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        As discussed on webkit-dev, we're reducing the complexity of WebKit by
+        removing unneeded configuration options.  ENABLE(XPATH) is enabled on
+        every port, so we are removing the ability to disable the feature.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * UseJSC.cmake:
+        * WebCore.pro:
+        * bindings/js/JSCustomXPathNSResolver.cpp:
+        * bindings/js/JSCustomXPathNSResolver.h:
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::setDOMException):
+        * bindings/js/JSExceptionBase.cpp:
+        (WebCore::toExceptionBase):
+        * bindings/js/JSXPathResultCustom.cpp:
+        * bindings/objc/DOMCustomXPathNSResolver.h:
+        * bindings/objc/DOMCustomXPathNSResolver.mm:
+        * bindings/objc/DOMInternal.h:
+        * bindings/objc/DOMUtility.mm:
+        (JSC::createDOMWrapper):
+        * bindings/objc/DOMXPath.mm:
+        (kit):
+        * bindings/objc/PublicDOMInterfaces.h:
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::getXPathNSResolver):
+        * bindings/v8/V8DOMWrapper.h:
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::setDOMException):
+        * bindings/v8/V8Proxy.h:
+        * bindings/v8/custom/V8CustomXPathNSResolver.cpp:
+        * bindings/v8/custom/V8CustomXPathNSResolver.h:
+        * bindings/v8/custom/V8DocumentCustom.cpp:
+        (WebCore::V8Document::evaluateCallback):
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/Document.idl:
+        * dom/ExceptionCode.cpp:
+        (WebCore::getExceptionCodeDescription):
+        * dom/ExceptionCode.h:
+        * features.pri:
+        * inspector/InspectorDOMAgent.cpp:
+        * page/DOMWindow.idl:
+        * xml/NativeXPathNSResolver.cpp:
+        * xml/NativeXPathNSResolver.h:
+        * xml/XPathEvaluator.cpp:
+        * xml/XPathEvaluator.h:
+        * xml/XPathEvaluator.idl:
+        * xml/XPathException.h:
+        * xml/XPathException.idl:
+        * xml/XPathExpression.cpp:
+        * xml/XPathExpression.h:
+        * xml/XPathExpression.idl:
+        * xml/XPathExpressionNode.cpp:
+        * xml/XPathExpressionNode.h:
+        * xml/XPathFunctions.cpp:
+        * xml/XPathFunctions.h:
+        * xml/XPathGrammar.y:
+        * xml/XPathNSResolver.cpp:
+        * xml/XPathNSResolver.h:
+        * xml/XPathNSResolver.idl:
+        * xml/XPathNodeSet.cpp:
+        * xml/XPathNodeSet.h:
+        * xml/XPathParser.cpp:
+        * xml/XPathParser.h:
+        * xml/XPathPath.cpp:
+        * xml/XPathPath.h:
+        * xml/XPathPredicate.cpp:
+        * xml/XPathPredicate.h:
+        * xml/XPathResult.cpp:
+        * xml/XPathResult.h:
+        * xml/XPathResult.idl:
+        * xml/XPathStep.cpp:
+        * xml/XPathStep.h:
+        * xml/XPathUtil.cpp:
+        * xml/XPathUtil.h:
+        * xml/XPathValue.cpp:
+        * xml/XPathValue.h:
+        * xml/XPathVariableReference.cpp:
+        * xml/XPathVariableReference.h:
+
 2011-10-18  Chris Fleizach  <cfleizach@apple.com>
 
         AX: buttons of number type <input> controls are not fully accessible
index a276c67..375d23c 100644 (file)
@@ -111,7 +111,6 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
index eef7b8a..a14ae44 100644 (file)
@@ -376,13 +376,6 @@ else
 webcore_cppflags += -DENABLE_MEDIA_STREAM=0
 endif # END ENABLE_MEDIA_STREAM
 
-# ----
-# XPath Support
-# ----
-if ENABLE_XPATH
-FEATURE_DEFINES += ENABLE_XPATH=1
-webcore_cppflags += -DENABLE_XPATH=1
-
 # XPath grammar
 # NOTE: older versions of bison do not inject an inclusion guard, so we do it
 $(GENSOURCES_WEBCORE)/XPathGrammar.h: $(GENSOURCES_WEBCORE)/XPathGrammar.cpp
@@ -395,7 +388,6 @@ $(GENSOURCES_WEBCORE)/XPathGrammar.cpp: $(WebCore)/xml/XPathGrammar.y
        cat $(GENSOURCES_WEBCORE)/XPathGrammar.cpp.h $(GENSOURCES_WEBCORE)/XPathGrammar.hpp >> $(GENSOURCES_WEBCORE)/XPathGrammar.h
        echo '#endif' >> $(GENSOURCES_WEBCORE)/XPathGrammar.h
        rm -f $(GENSOURCES_WEBCORE)/XPathGrammar.cpp.h $(GENSOURCES_WEBCORE)/XPathGrammar.hpp
-endif # END ENABLE_XPATH
 
 # ----
 # XSLT Support
index 2cf292c..4fb6e36 100644 (file)
@@ -578,6 +578,16 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSXMLHttpRequestUpload.h \
        DerivedSources/WebCore/JSXMLSerializer.cpp \
        DerivedSources/WebCore/JSXMLSerializer.h \
+       DerivedSources/WebCore/JSXPathEvaluator.cpp \
+       DerivedSources/WebCore/JSXPathEvaluator.h \
+       DerivedSources/WebCore/JSXPathException.cpp \
+       DerivedSources/WebCore/JSXPathException.h \
+       DerivedSources/WebCore/JSXPathExpression.cpp \
+       DerivedSources/WebCore/JSXPathExpression.h \
+       DerivedSources/WebCore/JSXPathNSResolver.cpp \
+       DerivedSources/WebCore/JSXPathNSResolver.h \
+       DerivedSources/WebCore/JSXPathResult.cpp \
+       DerivedSources/WebCore/JSXPathResult.h \
        DerivedSources/WebCore/JSXSLTProcessor.cpp \
        DerivedSources/WebCore/JSXSLTProcessor.h \
        DerivedSources/WebCore/MathMLElementFactory.cpp \
@@ -596,7 +606,9 @@ webcore_built_sources += \
        DerivedSources/WebCore/XMLNSNames.cpp \
        DerivedSources/WebCore/XMLNSNames.h \
        DerivedSources/WebCore/XMLViewerCSS.h \
-       DerivedSources/WebCore/XMLViewerJS.h 
+       DerivedSources/WebCore/XMLViewerJS.h \
+       DerivedSources/WebCore/XPathGrammar.cpp \
+       DerivedSources/WebCore/XPathGrammar.h
 
 webcore_sources += \
        Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp \
@@ -4277,25 +4289,6 @@ webcore_built_sources += \
 endif # END ENABLE_FILE_SYSTEM
 
 # ----
-# XPath Support
-# ----
-if ENABLE_XPATH
-webcore_built_sources += \
-       DerivedSources/WebCore/JSXPathEvaluator.cpp \
-       DerivedSources/WebCore/JSXPathEvaluator.h \
-       DerivedSources/WebCore/JSXPathException.cpp \
-       DerivedSources/WebCore/JSXPathException.h \
-       DerivedSources/WebCore/JSXPathExpression.cpp \
-       DerivedSources/WebCore/JSXPathExpression.h \
-       DerivedSources/WebCore/JSXPathNSResolver.cpp \
-       DerivedSources/WebCore/JSXPathNSResolver.h \
-       DerivedSources/WebCore/JSXPathResult.cpp \
-       DerivedSources/WebCore/JSXPathResult.h \
-       DerivedSources/WebCore/XPathGrammar.cpp \
-       DerivedSources/WebCore/XPathGrammar.h
-endif # END ENABLE_XPATH
-
-# ----
 # SVG Support
 #
 # FIXME: allow a more fine-grained inclusion/generation of sources per SVG feature
index 5f6daa6..6cc5954 100644 (file)
@@ -32,6 +32,7 @@ LIST(APPEND WebCore_SOURCES
     bindings/js/JSConsoleCustom.cpp
     bindings/js/JSCoordinatesCustom.cpp
     bindings/js/JSCustomVoidCallback.cpp
+    bindings/js/JSCustomXPathNSResolver.cpp
     bindings/js/JSDictionary.cpp
     bindings/js/JSDOMBinding.cpp
     bindings/js/JSDOMFormDataCustom.cpp
@@ -127,6 +128,7 @@ LIST(APPEND WebCore_SOURCES
     bindings/js/JSWebKitPointCustom.cpp
     bindings/js/JSXMLHttpRequestCustom.cpp
     bindings/js/JSXMLHttpRequestUploadCustom.cpp
+    bindings/js/JSXPathResultCustom.cpp
     bindings/js/JSXSLTProcessorCustom.cpp
     bindings/js/JavaScriptCallFrame.cpp
     bindings/js/PageScriptDebugServer.cpp
@@ -208,14 +210,6 @@ IF (ENABLE_SHARED_WORKERS)
     )
 ENDIF ()
 
-IF (ENABLE_XPATH)
-    LIST(APPEND WebCore_SOURCES
-        bindings/js/JSCustomXPathNSResolver.cpp
-        bindings/js/JSXPathResultCustom.cpp
-    )
-ENDIF ()
-
-
 IF (ENABLE_NOTIFICATIONS)
     LIST(APPEND WebCore_SOURCES
         bindings/js/JSDesktopNotificationsCustom.cpp
index 5835fa7..ca59749 100644 (file)
@@ -1238,11 +1238,26 @@ SOURCES += \
     storage/StorageTracker.cpp \
     testing/Internals.cpp \
     xml/DOMParser.cpp \
+    xml/NativeXPathNSResolver.cpp \
     xml/XMLHttpRequest.cpp \
     xml/XMLHttpRequestProgressEventThrottle.cpp \
     xml/XMLHttpRequestUpload.cpp \
     xml/XMLErrors.cpp \
     xml/XMLSerializer.cpp \
+    xml/XPathEvaluator.cpp \
+    xml/XPathExpression.cpp \
+    xml/XPathExpressionNode.cpp \
+    xml/XPathFunctions.cpp \
+    xml/XPathNodeSet.cpp \
+    xml/XPathNSResolver.cpp \
+    xml/XPathParser.cpp \
+    xml/XPathPath.cpp \
+    xml/XPathPredicate.cpp \
+    xml/XPathResult.cpp \
+    xml/XPathStep.cpp \
+    xml/XPathUtil.cpp \
+    xml/XPathValue.cpp \
+    xml/XPathVariableReference.cpp \
     xml/parser/NewXMLDocumentParser.cpp \
     xml/parser/XMLCharacterReferenceParser.cpp \
     xml/parser/XMLDocumentParser.cpp \
@@ -3133,25 +3148,6 @@ contains(DEFINES, ENABLE_VIDEO=1) {
     }
 }
 
-contains(DEFINES, ENABLE_XPATH=1) {
-    SOURCES += \
-        xml/NativeXPathNSResolver.cpp \
-        xml/XPathEvaluator.cpp \
-        xml/XPathExpression.cpp \
-        xml/XPathExpressionNode.cpp \
-        xml/XPathFunctions.cpp \
-        xml/XPathNodeSet.cpp \
-        xml/XPathNSResolver.cpp \
-        xml/XPathParser.cpp \
-        xml/XPathPath.cpp \
-        xml/XPathPredicate.cpp \
-        xml/XPathResult.cpp \
-        xml/XPathStep.cpp \
-        xml/XPathUtil.cpp \
-        xml/XPathValue.cpp \
-        xml/XPathVariableReference.cpp
-}
-
 contains(DEFINES, ENABLE_FULLSCREEN_API=1) {
     SOURCES += \
         rendering/RenderFullScreen.cpp
index 9309997..76da8dd 100644 (file)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(XPATH)
-
 #include "JSCustomXPathNSResolver.h"
 
 #include "Console.h"
@@ -109,5 +106,3 @@ String JSCustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(XPATH)
index 7d66494..a58cb49 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef JSCustomXPathNSResolver_h
 #define JSCustomXPathNSResolver_h
 
-#if ENABLE(XPATH)
-
 #include "XPathNSResolver.h"
 #include <runtime/JSValue.h>
 #include <wtf/Forward.h>
@@ -61,6 +59,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(XPATH)
-
 #endif // JSCustomXPathNSResolver_h
index 8d271f6..5a62e3b 100644 (file)
@@ -45,9 +45,7 @@
 #include "JSSVGException.h"
 #endif
 #include "JSXMLHttpRequestException.h"
-#if ENABLE(XPATH)
 #include "JSXPathException.h"
-#endif
 #include "OperationNotAllowedException.h"
 #include "RangeException.h"
 #include "SQLException.h"
@@ -233,11 +231,9 @@ void setDOMException(ExecState* exec, ExceptionCode ec)
             errorObject = toJS(exec, globalObject, SVGException::create(description).get());
             break;
 #endif
-#if ENABLE(XPATH)
         case XPathExceptionType:
             errorObject = toJS(exec, globalObject, XPathException::create(description));
             break;
-#endif
 #if ENABLE(SQL_DATABASE)
         case SQLExceptionType:
             errorObject = toJS(exec, globalObject, SQLException::create(description));
index efcb092..8a51e0c 100644 (file)
@@ -37,9 +37,7 @@
 #if ENABLE(SVG)
 #include "JSSVGException.h"
 #endif
-#if ENABLE(XPATH)
 #include "JSXPathException.h"
-#endif
 
 namespace WebCore {
 
@@ -57,10 +55,8 @@ ExceptionBase* toExceptionBase(JSC::JSValue value)
     if (SVGException* svgException = toSVGException(value))
         return reinterpret_cast<ExceptionBase*>(svgException);
 #endif
-#if ENABLE(XPATH)
     if (XPathException* pathException = toXPathException(value))
         return reinterpret_cast<ExceptionBase*>(pathException);
-#endif
 #if ENABLE(SQL_DATABASE)
     if (SQLException* pathException = toSQLException(value))
         return reinterpret_cast<ExceptionBase*>(pathException);
index 2341b43..028e4d8 100644 (file)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(XPATH)
-
 #include "JSXPathResult.h"
 
 #include "JSDOMBinding.h"
@@ -56,5 +53,3 @@ void JSXPathResult::visitChildren(JSCell* cell, SlotVisitor& visitor)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(XPATH)
index 2609e90..610d108 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DOMCustomXPathNSResolver_h
 #define DOMCustomXPathNSResolver_h
 
-#if ENABLE(XPATH)
-
 #include "XPathNSResolver.h"
 
 #include "DOMXPathNSResolver.h"
@@ -51,6 +49,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(XPATH)
-
 #endif // DOMCustomXPathNSResolver_h
index 670c836..30ae6f5 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DOMCustomXPathNSResolver.h"
 
-#if ENABLE(XPATH)
-
 #include "BlockExceptions.h"
 #include "PlatformString.h"
 
@@ -54,5 +52,3 @@ String DOMCustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(XPATH)
index 6d2442b..d22b318 100644 (file)
@@ -44,18 +44,14 @@ namespace JSC {
 
 namespace WebCore {
     class NodeFilter;
-#if ENABLE(XPATH)
     class XPathNSResolver;
-#endif
 }
 
 @interface DOMNodeFilter : DOMObject <DOMNodeFilter>
 @end
 
-#if ENABLE(XPATH)
 @interface DOMNativeXPathNSResolver : DOMObject <DOMXPathNSResolver>
 @end
-#endif // ENABLE(XPATH)
 
 // Helper functions for DOM wrappers and gluing to Objective-C
 
@@ -83,10 +79,8 @@ inline void addDOMWrapper(NSObject* wrapper, Source impl)
 DOMNodeFilter *kit(WebCore::NodeFilter*);
 WebCore::NodeFilter* core(DOMNodeFilter *);
 
-#if ENABLE(XPATH)
 DOMNativeXPathNSResolver *kit(WebCore::XPathNSResolver*);
 WebCore::XPathNSResolver* core(DOMNativeXPathNSResolver *);
-#endif // ENABLE(XPATH)
 
 inline NSTimeInterval kit(double msSinceEpoch)
 {
index 2b8c474..40b311f 100644 (file)
@@ -47,6 +47,8 @@
 #import "DOMStyleSheetInternal.h"
 #import "DOMStyleSheetListInternal.h"
 #import "DOMTreeWalkerInternal.h"
+#import "DOMXPathExpressionInternal.h"
+#import "DOMXPathResultInternal.h"
 #import "JSCSSRule.h"
 #import "JSCSSRuleList.h"
 #import "JSCSSStyleDeclaration.h"
 #import "WebScriptObjectPrivate.h"
 #import "runtime_root.h"
 
-#if ENABLE(XPATH)
-#import "DOMXPathExpressionInternal.h"
-#import "DOMXPathResultInternal.h"
-#endif
-
 // FIXME: Couldn't get an include of "DOMDOMImplementationInternal.h" to work here.
 DOMImplementation *kit(WebCore::DOMImplementationFront*);
 
@@ -117,10 +114,8 @@ static inline id createDOMWrapper(JSC::JSObject* object)
     WRAP(StyleSheet)
     WRAP(StyleSheetList)
     WRAP(TreeWalker)
-#if ENABLE(XPATH)
     WRAP(XPathExpression)
     WRAP(XPathResult)
-#endif
 
     // This must be after the HTMLOptionsCollection check, because it's a subclass in the JavaScript
     // binding, but not a subclass in the ObjC binding.
index d1c07d7..8a3c080 100644 (file)
@@ -25,9 +25,6 @@
  */
 
 #import "config.h"
-
-#if ENABLE(XPATH)
-
 #import "DOMInternal.h" // import first to make the private/public trick work
 #import "DOMXPath.h"
 
@@ -82,5 +79,3 @@ DOMNativeXPathNSResolver *kit(WebCore::XPathNSResolver* impl)
     addDOMWrapper(wrapper, impl);
     return [wrapper autorelease];    
 }
-
-#endif // ENABLE(XPATH)
index f1dc031..de59c1f 100644 (file)
 - (DOMTreeWalker *)createTreeWalker:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
 - (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
 - (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
-#if ENABLE_XPATH
 - (DOMXPathExpression *)createExpression:(NSString *)expression :(id <DOMXPathNSResolver>)resolver AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED;
 - (DOMXPathExpression *)createExpression:(NSString *)expression resolver:(id <DOMXPathNSResolver>)resolver AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
 - (id <DOMXPathNSResolver>)createNSResolver:(DOMNode *)nodeResolver AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
 - (DOMXPathResult *)evaluate:(NSString *)expression :(DOMNode *)contextNode :(id <DOMXPathNSResolver>)resolver :(unsigned short)type :(DOMXPathResult *)inResult AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED;
 - (DOMXPathResult *)evaluate:(NSString *)expression contextNode:(DOMNode *)contextNode resolver:(id <DOMXPathNSResolver>)resolver type:(unsigned short)type inResult:(DOMXPathResult *)inResult AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
-#endif
 - (BOOL)execCommand:(NSString *)command userInterface:(BOOL)userInterface value:(NSString *)value AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
 - (BOOL)execCommand:(NSString *)command userInterface:(BOOL)userInterface AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
 - (BOOL)execCommand:(NSString *)command AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
index ccf95f4..90f83f2 100644 (file)
@@ -459,7 +459,6 @@ PassRefPtr<EventListener> V8DOMWrapper::getEventListener(v8::Local<v8::Value> va
 #endif
 }
 
-#if ENABLE(XPATH)
 // XPath-related utilities
 RefPtr<XPathNSResolver> V8DOMWrapper::getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy)
 {
@@ -470,6 +469,5 @@ RefPtr<XPathNSResolver> V8DOMWrapper::getXPathNSResolver(v8::Handle<v8::Value> v
         resolver = V8CustomXPathNSResolver::create(value->ToObject());
     return resolver;
 }
-#endif
 
 }  // namespace WebCore
index eb22051..748e827 100644 (file)
@@ -90,10 +90,8 @@ namespace WebCore {
 
         static PassRefPtr<EventListener> getEventListener(v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup);
 
-#if ENABLE(XPATH)
         // XPath-related utilities
         static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy = 0);
-#endif
 
         // Wrap JS node filter in C++.
         static PassRefPtr<NodeFilter> wrapNativeNodeFilter(v8::Handle<v8::Value>);
index 80a21a0..42ad015 100644 (file)
@@ -676,11 +676,9 @@ void V8Proxy::setDOMException(int exceptionCode)
         exception = toV8(SVGException::create(description));
         break;
 #endif
-#if ENABLE(XPATH)
     case XPathExceptionType:
         exception = toV8(XPathException::create(description));
         break;
-#endif
 #if ENABLE(SQL_DATABASE)
     case SQLExceptionType:
         exception = toV8(SQLException::create(description));
index b34c7a8..17f32e4 100644 (file)
@@ -293,10 +293,7 @@ namespace WebCore {
         static const char* eventExceptionName(int exceptionCode);
         static const char* xmlHttpRequestExceptionName(int exceptionCode);
         static const char* domExceptionName(int exceptionCode);
-
-#if ENABLE(XPATH)
         static const char* xpathExceptionName(int exceptionCode);
-#endif
 
 #if ENABLE(SVG)
         static const char* svgExceptionName(int exceptionCode);
index 01448d9..a6035e5 100644 (file)
@@ -30,8 +30,6 @@
 #include "config.h"
 #include "V8CustomXPathNSResolver.h"
 
-#if ENABLE(XPATH)
-
 #include "PlatformString.h"
 #include "V8Binding.h"
 #include "V8Proxy.h"
@@ -90,5 +88,3 @@ String V8CustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(XPATH)
index 9677252..72260e4 100644 (file)
@@ -32,8 +32,6 @@
 #ifndef V8CustomXPathNSResolver_h
 #define V8CustomXPathNSResolver_h
 
-#if ENABLE(XPATH)
-
 #include "XPathNSResolver.h"
 #include <v8.h>
 #include <wtf/Forward.h>
@@ -61,6 +59,4 @@ private:
 
 } // namespace WebCore
 
-#endif  // ENABLE(XPATH)
-
 #endif  // V8CustomXPathNSResolver_h
index 7cad58e..e6ba75b 100644 (file)
@@ -63,7 +63,6 @@
 
 namespace WebCore {
 
-#if ENABLE(XPATH)
 v8::Handle<v8::Value> V8Document::evaluateCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.Document.evaluate()");
@@ -94,7 +93,6 @@ v8::Handle<v8::Value> V8Document::evaluateCallback(const v8::Arguments& args)
 
     return toV8(result.release());
 }
-#endif
 
 v8::Handle<v8::Value> V8Document::getCSSCanvasContextCallback(const v8::Arguments& args)
 {
index 5703c26..b94c9c4 100644 (file)
 #include "XMLHttpRequestProgressEvent.h"
 #include "XMLNSNames.h"
 #include "XMLNames.h"
+#include "XPathEvaluator.h"
+#include "XPathExpression.h"
+#include "XPathNSResolver.h"
+#include "XPathResult.h"
 #include "htmlediting.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/HashFunctions.h>
 #include "SharedWorkerRepository.h"
 #endif
 
-#if ENABLE(XPATH)
-#include "XPathEvaluator.h"
-#include "XPathExpression.h"
-#include "XPathNSResolver.h"
-#include "XPathResult.h"
-#endif
-
 #if ENABLE(XSLT)
 #include "XSLTProcessor.h"
 #endif
@@ -4313,8 +4310,6 @@ Vector<String> Document::formElementsState() const
     return stateVector;
 }
 
-#if ENABLE(XPATH)
-
 PassRefPtr<XPathExpression> Document::createExpression(const String& expression,
                                                        XPathNSResolver* resolver,
                                                        ExceptionCode& ec)
@@ -4343,8 +4338,6 @@ PassRefPtr<XPathResult> Document::evaluate(const String& expression,
     return m_xpathEvaluator->evaluate(expression, contextNode, resolver, type, result, ec);
 }
 
-#endif // ENABLE(XPATH)
-
 void Document::setStateForNewFormElements(const Vector<String>& stateVector)
 {
     // Walk the state vector backwards so that the value to use for each
index 2827199..72705f0 100644 (file)
@@ -129,6 +129,10 @@ class TextResourceDecoder;
 class DocumentParser;
 class TreeWalker;
 class XMLHttpRequest;
+class XPathEvaluator;
+class XPathExpression;
+class XPathNSResolver;
+class XPathResult;
 
 #if ENABLE(SVG)
 class SVGDocumentExtensions;
@@ -138,13 +142,6 @@ class SVGDocumentExtensions;
 class TransformSource;
 #endif
 
-#if ENABLE(XPATH)
-class XPathEvaluator;
-class XPathExpression;
-class XPathNSResolver;
-class XPathResult;
-#endif
-
 #if ENABLE(DASHBOARD_SUPPORT)
 struct DashboardRegionValue;
 #endif
@@ -900,7 +897,6 @@ public:
 
     void setDocType(PassRefPtr<DocumentType>);
 
-#if ENABLE(XPATH)
     // XPathEvaluator methods
     PassRefPtr<XPathExpression> createExpression(const String& expression,
                                                  XPathNSResolver* resolver,
@@ -912,8 +908,7 @@ public:
                                      unsigned short type,
                                      XPathResult* result,
                                      ExceptionCode& ec);
-#endif // ENABLE(XPATH)
-    
+
     enum PendingSheetLayout { NoLayoutWithPendingSheets, DidLayoutWithPendingSheets, IgnoreLayoutWithPendingSheets };
 
     bool didLayoutWithPendingStylesheets() const { return m_pendingSheetLayout == DidLayoutWithPendingSheets; }
@@ -1336,14 +1331,12 @@ private:
     FixedArray<CollectionCache, NumUnnamedDocumentCachedTypes> m_collectionInfo;
     FixedArray<NamedCollectionMap, NumNamedDocumentCachedTypes> m_nameCollectionInfo;
 
-#if ENABLE(XPATH)
     RefPtr<XPathEvaluator> m_xpathEvaluator;
-#endif
-    
+
 #if ENABLE(SVG)
     OwnPtr<SVGDocumentExtensions> m_svgExtensions;
 #endif
-    
+
 #if ENABLE(DASHBOARD_SUPPORT)
     Vector<DashboardRegionValue> m_dashboardRegions;
     bool m_hasDashboardRegions;
index 99ad4f4..f8e69e3 100644 (file)
@@ -111,7 +111,7 @@ module core {
 
         [OldStyleObjC] CSSStyleDeclaration getOverrideStyle(in [Optional=CallWithDefaultValue] Element element,
                                                             in [Optional=CallWithDefaultValue] DOMString pseudoElement);
-#if defined(ENABLE_XPATH) && ENABLE_XPATH
+
         // DOM Level 3 XPath (XPathEvaluator interface)
         [OldStyleObjC] XPathExpression createExpression(in [Optional=CallWithDefaultValue] DOMString expression,
                                                         in [Optional=CallWithDefaultValue] XPathNSResolver resolver)
@@ -123,7 +123,6 @@ module core {
                                                       in [Optional=CallWithDefaultValue] unsigned short type,
                                                       in [Optional=CallWithDefaultValue] XPathResult inResult)
             raises(DOMException);
-#endif // ENABLE_XPATH
 
         // Common extensions
 
index bb602ac..0604faf 100644 (file)
 #include "IDBDatabaseException.h"
 #include "RangeException.h"
 #include "XMLHttpRequestException.h"
+#include "XPathException.h"
 
 #if ENABLE(SVG)
 #include "SVGException.h"
 #endif
 
-#if ENABLE(XPATH)
-#include "XPathException.h"
-#endif
-
 #if ENABLE(SQL_DATABASE)
 #include "SQLException.h"
 #endif
@@ -137,7 +134,6 @@ static const char* const xmlHttpRequestExceptionDescriptions[] = {
     "The user aborted a request in synchronous requests."
 };
 
-#if ENABLE(XPATH)
 static const char* const xpathExceptionNames[] = {
     "INVALID_EXPRESSION_ERR",
     "TYPE_ERR"
@@ -147,7 +143,6 @@ static const char* const xpathExceptionDescriptions[] = {
     "The expression had a syntax error or otherwise is not a legal expression according to the rules of the specific XPathEvaluator.",
     "The expression could not be converted to return the specified type."
 };
-#endif
 
 #if ENABLE(SVG)
 static const char* const svgExceptionNames[] = {
@@ -298,7 +293,6 @@ void getExceptionCodeDescription(ExceptionCode ec, ExceptionCodeDescription& des
         nameTableSize = WTF_ARRAY_LENGTH(xmlHttpRequestExceptionNames);
         // XMLHttpRequest exception codes start with 101 and we don't want 100 empty elements in the name array
         nameTableOffset = XMLHttpRequestException::NETWORK_ERR;
-#if ENABLE(XPATH)
     } else if (code >= XPathException::XPathExceptionOffset && code <= XPathException::XPathExceptionMax) {
         type = XPathExceptionType;
         typeName = "DOM XPath";
@@ -308,7 +302,6 @@ void getExceptionCodeDescription(ExceptionCode ec, ExceptionCodeDescription& des
         nameTableSize = WTF_ARRAY_LENGTH(xpathExceptionNames);
         // XPath exception codes start with 51 and we don't want 51 empty elements in the name array
         nameTableOffset = XPathException::INVALID_EXPRESSION_ERR;
-#endif
 #if ENABLE(SVG)
     } else if (code >= SVGException::SVGExceptionOffset && code <= SVGException::SVGExceptionMax) {
         type = SVGExceptionType;
index 6579731..56c62ba 100644 (file)
@@ -67,10 +67,8 @@ namespace WebCore {
         DOMExceptionType,
         RangeExceptionType,
         EventExceptionType,
-        XMLHttpRequestExceptionType
-#if ENABLE(XPATH)
-        , XPathExceptionType
-#endif
+        XMLHttpRequestExceptionType,
+        XPathExceptionType
 #if ENABLE(SVG)
         , SVGExceptionType
 #endif
index 452e44b..8f7ed79 100644 (file)
@@ -50,7 +50,6 @@ isEmpty(HAVE_QRAWFONT) {
 !contains(DEFINES, ENABLE_QUOTA=.): DEFINES += ENABLE_QUOTA=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_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1
 !contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1
 !contains(DEFINES, ENABLE_DETAILS=.): DEFINES += ENABLE_DETAILS=1
@@ -189,7 +188,6 @@ contains(DEFINES, ENABLE_SHARED_SCRIPT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_
 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_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
 contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
index 4319a99..300c17c 100644 (file)
 #include "ScriptEventListener.h"
 #include "StyleSheetList.h"
 #include "Text.h"
-
-#if ENABLE(XPATH)
 #include "XPathResult.h"
-#endif
 
 #include "markup.h"
 
@@ -232,7 +229,6 @@ public:
 
     virtual void match(ListHashSet<Node*>& resultCollector)
     {
-#if ENABLE(XPATH)
         if (m_query.isEmpty())
             return;
 
@@ -251,9 +247,6 @@ public:
                 node = static_cast<Attr*>(node)->ownerElement();
             resultCollector.add(node);
         }
-#else
-        UNUSED_PARAM(resultCollector);
-#endif
     }
 };
 
index 5b6c093..c5b8edd 100644 (file)
@@ -629,11 +629,9 @@ module window {
         attribute WebKitAnimationListConstructor WebKitAnimationList;
 #endif
 
-#if defined(ENABLE_XPATH) && ENABLE_XPATH
         attribute XPathEvaluatorConstructor XPathEvaluator;
         attribute XPathResultConstructor XPathResult;
         attribute XPathExceptionConstructor XPathException;
-#endif
 
 #if defined(ENABLE_SVG) && ENABLE_SVG
         // Expose all implemented SVG 1.1 interfaces, excluding the SVG MI interfaces:
index 11faea6..a980ea0 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NativeXPathNSResolver.h"
 
-#if ENABLE(XPATH)
-
 #include "Node.h"
 #include "PlatformString.h"
 #include "XMLNames.h"
@@ -54,5 +52,3 @@ String NativeXPathNSResolver::lookupNamespaceURI(const String& prefix)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(XPATH)
index 212b929..559624f 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NativeXPathNSResolver_h
 #define NativeXPathNSResolver_h
 
-#if ENABLE(XPATH)
-
 #include "XPathNSResolver.h"
 #include "Node.h"
 #include <wtf/RefPtr.h>
@@ -48,6 +46,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(XPATH)
-
 #endif // NativeXPathNSResolver_h
index 8fb203f..68f29fa 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathEvaluator.h"
 
-#if ENABLE(XPATH)
-
 #include "ExceptionCode.h"
 #include "NativeXPathNSResolver.h"
 #include "Node.h"
@@ -39,7 +37,7 @@
 namespace WebCore {
 
 using namespace XPath;
-    
+
 PassRefPtr<XPathExpression> XPathEvaluator::createExpression(const String& expression,
                                                              XPathNSResolver* resolver,
                                                              ExceptionCode& ec)
@@ -73,5 +71,3 @@ PassRefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression,
 }
 
 }
-
-#endif // ENABLE(XPATH)
index 70322a4..ca35f21 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathEvaluator_h
 #define XPathEvaluator_h
 
-#if ENABLE(XPATH)
-
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/PassRefPtr.h>
@@ -57,6 +55,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathEvaluator_h
index 05e9f25..3529f64 100644 (file)
@@ -20,7 +20,6 @@
 module xpath {
     interface [
         CanBeConstructed,
-        Conditional=XPATH
     ] XPathEvaluator {
         XPathExpression createExpression(in [Optional=CallWithDefaultValue] DOMString expression,
                                          in [Optional=CallWithDefaultValue] XPathNSResolver resolver)
index 45ad628..7ee9bc3 100644 (file)
@@ -31,8 +31,6 @@
 
 #include "ExceptionBase.h"
 
-#if ENABLE(XPATH)
-
 namespace WebCore {
 
     class XPathException : public ExceptionBase {
@@ -59,6 +57,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathException_h
index b57df57..d43c57a 100644 (file)
@@ -29,7 +29,6 @@
 module xpath {
 
     interface [
-        Conditional=XPATH,
         DontCheckEnums
     ] XPathException {
 
index 91ac06c..5f36253 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathExpression.h"
 
-#if ENABLE(XPATH)
-
 #include "Document.h"
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -93,5 +91,3 @@ PassRefPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, unsigned sh
 }
 
 }
-
-#endif // ENABLE(XPATH)
index 633ec80..3124939 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathExpression_h
 #define XPathExpression_h
 
-#if ENABLE(XPATH)
-
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/PassRefPtr.h>
@@ -61,6 +59,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathExpression_h
index 7bade78..3dc2614 100644 (file)
 
 module xpath {
 
-
-    interface [
-        Conditional=XPATH
-    ] XPathExpression {
+    interface XPathExpression {
         [OldStyleObjC] XPathResult evaluate(in [Optional=CallWithDefaultValue] Node contextNode, 
                                             in [Optional=CallWithDefaultValue] unsigned short type, 
                                             in [Optional=CallWithDefaultValue] XPathResult inResult)
index 4656f8d..9db4888 100644 (file)
 #include "config.h"
 #include "XPathExpressionNode.h"
 
-#if ENABLE(XPATH)
-
 #include "Node.h"
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 namespace XPath {
-    
+
 EvaluationContext& Expression::evaluationContext()
 {
     DEFINE_STATIC_LOCAL(EvaluationContext, evaluationContext, ());
@@ -55,5 +53,3 @@ Expression::~Expression()
 
 }
 }
-
-#endif // ENABLE(XPATH)
index 4b5baa8..8945cf3 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathExpressionNode_h
 #define XPathExpressionNode_h
 
-#if ENABLE(XPATH)
-
 #include "Node.h"
 #include "XPathValue.h"
 #include <wtf/HashMap.h>
@@ -100,7 +98,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // EXPRESSION_H
-
index 8336de9..7b3f58f 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "XPathFunctions.h"
 
-#if ENABLE(XPATH)
-
 #include "Element.h"
 #include "NamedNodeMap.h"
 #include "ProcessingInstruction.h"
@@ -735,5 +733,3 @@ Function* createFunction(const String& name, const Vector<Expression*>& args)
 
 }
 }
-
-#endif // ENABLE(XPATH)
index 62d687f..08698a7 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathFunctions_h
 #define XPathFunctions_h
 
-#if ENABLE(XPATH)
-
 #include "XPathExpressionNode.h"
 
 namespace WebCore {
@@ -55,6 +53,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathFunctions_h
index 14e9fa3..2eba5b3 100644 (file)
@@ -29,8 +29,6 @@
 
 #include "config.h"
 
-#if ENABLE(XPATH)
-
 #include "XPathFunctions.h"
 #include "XPathNSResolver.h"
 #include "XPathParser.h"
@@ -554,5 +552,3 @@ UnaryExpr:
     ;
 
 %%
-
-#endif
index 3dde1f2..12aeeba 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathNSResolver.h"
 
-#if ENABLE(XPATH)
-
 namespace WebCore {
 
 XPathNSResolver::~XPathNSResolver()
@@ -36,5 +34,3 @@ XPathNSResolver::~XPathNSResolver()
 }
 
 }
-
-#endif // ENABLE(XPATH)
index 7b7fd2e..a62ad20 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathNSResolver_h
 #define XPathNSResolver_h
 
-#if ENABLE(XPATH)
-
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 
@@ -45,6 +43,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathNSResolver_h
index 4664dd7..e1d4e0e 100644 (file)
@@ -22,7 +22,6 @@ module xpath {
 
     interface [
         ObjCProtocol,
-        Conditional=XPATH,
         OmitConstructor
     ] XPathNSResolver {
         [ConvertNullStringTo=Null] DOMString lookupNamespaceURI(in [Optional=CallWithDefaultValue] DOMString prefix);
index a8e4428..a2b50f0 100644 (file)
@@ -24,8 +24,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(XPATH)
 #include "XPathNodeSet.h"
 
 #include "Attr.h"
@@ -202,5 +200,3 @@ Node* NodeSet::anyNode() const
 
 }
 }
-
-#endif // ENABLE(XPATH)
index 619d91c..9135b99 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef XPathNodeSet_h
 #define XPathNodeSet_h
 
-#if ENABLE(XPATH)
-
 #include <wtf/Vector.h>
 #include <wtf/Forward.h>
 
@@ -81,5 +79,4 @@ namespace WebCore {
     }
 }
 
-#endif // ENABLE(XPATH)
 #endif // XPathNodeSet_h
index ba6da7e..62d8ee3 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "XPathParser.h"
 
-#if ENABLE(XPATH)
-
 #include "ExceptionCode.h"
 #include "XPathEvaluator.h"
 #include "XPathException.h"
@@ -634,5 +632,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
 
 }
 }
-
-#endif // ENABLE(XPATH)
index f49b44b..e58c444 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathParser_h
 #define XPathParser_h
 
-#if ENABLE(XPATH)
-
 #include "XPathStep.h"
 #include "XPathPredicate.h"
 
@@ -128,6 +126,4 @@ namespace WebCore {
     }
 }
 
-#endif // ENABLE(XPATH)
-
 #endif
index 1a7ed3f..d9d1fd4 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "XPathPath.h"
 
-#if ENABLE(XPATH)
-
 #include "Document.h"
 #include "XPathPredicate.h"
 #include "XPathStep.h"
@@ -205,5 +203,3 @@ Value Path::evaluate() const
 
 }
 }
-
-#endif // ENABLE(XPATH)
index 7dd17d9..b1a57cb 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathPath_h
 #define XPathPath_h
 
-#if ENABLE(XPATH)
-
 #include "XPathExpressionNode.h"
 #include "XPathNodeSet.h"
 
@@ -89,6 +87,4 @@ namespace WebCore {
     }
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPath_Path_H
index 2a6482f..58cd879 100644 (file)
@@ -26,9 +26,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(XPATH)
-
 #include "XPathPredicate.h"
 
 #include "Node.h"
@@ -278,5 +275,3 @@ bool Predicate::evaluate() const
 
 }
 }
-
-#endif // ENABLE(XPATH)
index 3600154..c639cec 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathPredicate_h
 #define XPathPredicate_h
 
-#if ENABLE(XPATH)
-
 #include "XPathExpressionNode.h"
 #include "XPathValue.h"
 
@@ -123,6 +121,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathPredicate_h
index 1dcde2e..3ea768a 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathResult.h"
 
-#if ENABLE(XPATH)
-
 #include "Document.h"
 #include "Node.h"
 #include "ExceptionCode.h"
@@ -217,5 +215,3 @@ Node* XPathResult::snapshotItem(unsigned long index, ExceptionCode& ec)
 }
 
 }
-
-#endif // ENABLE(XPATH)
index 82a9bce..affc076 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathResult_h
 #define XPathResult_h
 
-#if ENABLE(XPATH)
-
 #include "XPathValue.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
@@ -87,6 +85,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathResult_h
index 551336e..d87443e 100644 (file)
@@ -20,7 +20,6 @@
 module xpath {
 
     interface [
-        Conditional=XPATH,
         CustomMarkFunction
     ] XPathResult {
         const unsigned short ANY_TYPE                       = 0;
index d82cd50..2866ab6 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "XPathStep.h"
 
-#if ENABLE(XPATH)
-
 #include "Attr.h"
 #include "Document.h"
 #include "Element.h"
@@ -394,5 +392,3 @@ void Step::nodesInAxis(Node* context, NodeSet& nodes) const
 
 }
 }
-
-#endif // ENABLE(XPATH)
index b031baf..136fd12 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathStep_h
 #define XPathStep_h
 
-#if ENABLE(XPATH)
-
 #include "Node.h"
 #include "XPathExpressionNode.h"
 #include "XPathNodeSet.h"
@@ -104,6 +102,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPathStep_h
index 3370ffc..4c45fcb 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathUtil.h"
 
-#if ENABLE(XPATH)
-
 #include "ContainerNode.h"
 #include <wtf/text/StringBuilder.h>
 
@@ -98,5 +96,3 @@ bool isValidContextNode(Node* node)
 
 }
 }
-
-#endif // ENABLE(XPATH)
index cfb34dc..e0c8772 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathUtil_h
 #define XPathUtil_h
 
-#if ENABLE(XPATH)
-
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
 
@@ -51,6 +49,4 @@ namespace WebCore {
 
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPath_Util_H
index 29e211e..09ce876 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathValue.h"
 
-#if ENABLE(XPATH)
-
 #include "Node.h"
 #include "XPathExpressionNode.h"
 #include "XPathUtil.h"
@@ -141,5 +139,3 @@ String Value::toString() const
 
 }
 }
-
-#endif // ENABLE(XPATH)
index a0cd24d..ab65716 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef XPathValue_h
 #define XPathValue_h
 
-#if ENABLE(XPATH)
-
 #include "PlatformString.h"
 #include "XPathNodeSet.h"
 
@@ -101,6 +99,4 @@ namespace WebCore {
     }
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPath_Value_H
index efe9cf9..ae2b29a 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "XPathVariableReference.h"
 
-#if ENABLE(XPATH)
-
 #include "Node.h"
 #include "XPathValue.h"
 
@@ -51,5 +49,3 @@ Value VariableReference::evaluate() const
 
 }
 }
-
-#endif // ENABLE(XPATH)
index 5e5a59a..5636812 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef XPathVariableReference_h
 #define XPathVariableReference_h
 
-#if ENABLE(XPATH)
-
 #include "XPathExpressionNode.h"
 
 namespace WebCore {
@@ -47,6 +45,4 @@ namespace WebCore {
     }
 }
 
-#endif // ENABLE(XPATH)
-
 #endif // XPath_VariableReference_H
index 29781ff..03cfaac 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * features.gypi:
+
 2011-10-18  Chris Fleizach  <cfleizach@apple.com>
 
         AX: buttons of number type <input> controls are not fully accessible
index c1c36c6..c9da6b9 100644 (file)
@@ -92,7 +92,6 @@
       'ENABLE_WEB_TIMING=1',
       'ENABLE_WORKERS=1',
       'ENABLE_XHR_RESPONSE_BLOB=1',
-      'ENABLE_XPATH=1',
       'ENABLE_XSLT=1',
       'WTF_USE_LEVELDB=1',
       'WTF_USE_BUILTIN_UTF8_CODEC=1',
index b311e72..5530b26 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-14  Chris Marrin  <cmarrin@apple.com>
 
         Throttle rate of requestAnimationFrame when page is not visible
index 4137deb..9d0796f 100644 (file)
@@ -111,7 +111,6 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
index 97122fc..ec5190d 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * Interfaces/DOMWindow.idl:
+
 2011-10-14  Julien Chaffraix  <jchaffraix@webkit.org>
 
         Remove layerX / layerY from the Windows API
index 6c24811..8f115dc 100644 (file)
@@ -84,8 +84,6 @@ interface IDOMWindow : IDOMObject
 
     //attribute XMLSerializerConstructor XMLSerializer;
 
-    //#ifdef XPATH_SUPPORT
     //attribute XPathEvaluatorConstructor XPathEvaluator;
     //attribute XPathResultConstructor XPathResult;
-    //#endif
 }
index 902e636..a9f2d77 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-18  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Merge QML plugin for WebKit2 with the original WebKit1 plugin
index 4137deb..9d0796f 100644 (file)
@@ -111,7 +111,6 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
index 92cee2b..1287420 100644 (file)
@@ -92,7 +92,6 @@ WEBKIT_FEATURE(ENABLE_TOUCH_ICON_LOADING "Enable Touch Icon Loading" DEFAULT OFF
 WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON HTML)
 WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_DFG_JIT "Enable DFG JIT" DEFAULT OFF)
 
index 0cb1c9e..0a512bb 100644 (file)
@@ -47,5 +47,4 @@ WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT OFF HTML)
 WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT OFF)
index 6780615..9136dc1 100644 (file)
@@ -40,7 +40,6 @@
 #cmakedefine01 ENABLE_WEBGL
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WORKERS
-#cmakedefine01 ENABLE_XPATH
 #cmakedefine01 ENABLE_XSLT
 #cmakedefine01 ENABLE_DFG_JIT
 
index fde753d..eaf5907 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/build-webkit:
+
 2011-10-18  Dimitri Glazkov  <dglazkov@chromium.org>
 
         garden-o-matic should not report flaking in expected failures as failures.
index be74f81..b11bf1b 100755 (executable)
@@ -128,7 +128,6 @@ my (
     $webSocketsSupport,
     $webTimingSupport,
     $workersSupport,
-    $xpathSupport,
     $xsltSupport,
 );
 
@@ -322,9 +321,6 @@ my @features = (
     { option => "workers", desc => "Toggle Web Workers support",
       define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk()), value => \$workersSupport },
 
-    { option => "xpath", desc => "Toggle XPath support",
-      define => "ENABLE_XPATH", default => 1, value => \$xpathSupport },
-
     { option => "xslt", desc => "Toggle XSLT support",
       define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
 );
index 909536d..e66588b 100644 (file)
@@ -1,3 +1,13 @@
+2011-10-18  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(XPATH)
+        https://bugs.webkit.org/show_bug.cgi?id=70217
+
+        Reviewed by Eric Seidel.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2011-10-17  Adam Roben  <aroben@apple.com>
 
         Windows build fix
index 0c5a61a..fc010eb 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_REQUEST_ANIMATION_FRAME"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_XPATH"
-               Value="ENABLE_XPATH"
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_XSLT"
                Value="ENABLE_XSLT"
                PerformEnvironmentSet="true"
index dcc707a..a7f2587 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_XPATH"
-               Value="ENABLE_XPATH"
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_XSLT"
                Value="ENABLE_XSLT"
                PerformEnvironmentSet="true"
index 0d76cbd..2538e39 100644 (file)
@@ -606,14 +606,6 @@ AC_ARG_ENABLE(media_stream,
               [],[enable_media_stream="no"])
 AC_MSG_RESULT([$enable_media_stream])
 
-# check whether to enable XPath support
-AC_MSG_CHECKING([whether to enable XPath support])
-AC_ARG_ENABLE(xpath,
-              AC_HELP_STRING([--enable-xpath],
-                             [enable support for XPath [default=yes]]),
-              [],[enable_xpath="yes"])
-AC_MSG_RESULT([$enable_xpath])
-
 # check whether to enable XSLT support
 AC_MSG_CHECKING([whether to enable XSLT support])
 AC_ARG_ENABLE(xslt,
@@ -1157,7 +1149,6 @@ AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
 AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
 AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "yes"])
 AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
-AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
 AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
 AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
@@ -1287,7 +1278,6 @@ Features:
  Web Sockets support                                      : $enable_web_sockets
  Web Timing support                                       : $enable_web_timing
  Web Workers support                                      : $enable_workers
- XPATH support                                            : $enable_xpath
  XSLT support                                             : $enable_xslt
  Spellcheck support                                       : $enable_spellcheck
  Animation API                                            : $enable_animation_api