WebCore:

        Reviewed by Darin.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=9649
        The no-svg build broke after r15091

        * bindings/objc/DOMInternal.h: Added #if XPATH_SUPPORT/#endif.
        * bindings/objc/DOMInternal.mm: Ditto.
        (raiseDOMException):
        * bindings/objc/DOMXPath.h: Ditto.
        * bindings/objc/DOMXPath.mm: Ditto.
        * bindings/objc/DOMXPathInternal.h: Ditto.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a8d8386967fed665c468270013e6492e00ed6d50..0b022748108f17f63e9dc2d65539224959b20324 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2006-06-29  David Kilzer  <ddkilzer@kilzer.net>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=9649
+        The no-svg build broke after r15091
+
+        * bindings/objc/DOMInternal.h: Added #if XPATH_SUPPORT/#endif.
+        * bindings/objc/DOMInternal.mm: Ditto.
+        (raiseDOMException):
+        * bindings/objc/DOMXPath.h: Ditto.
+        * bindings/objc/DOMXPath.mm: Ditto.
+        * bindings/objc/DOMXPathInternal.h: Ditto.
+
 2006-06-29  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Tim O.

diff --git a/WebCore/bindings/objc/DOMInternal.h b/WebCore/bindings/objc/DOMInternal.h
index addce4efb5372e52588b64ee9a1c9deaabb98bb8..639bfde894a488ed35e5376e27af4b722b4e6986 100644 (file)
--- a/WebCore/bindings/objc/DOMInternal.h
+++ b/WebCore/bindings/objc/DOMInternal.h
@@ -160,6 +160,8 @@ ALLOW_DOM_CAST(RectImpl)
 ALLOW_DOM_CAST(StyleSheet)
 ALLOW_DOM_CAST(StyleSheetList)
 ALLOW_DOM_CAST(TreeWalker)
+#if XPATH_SUPPORT
 ALLOW_DOM_CAST(XPathExpression)
 ALLOW_DOM_CAST(XPathNSResolver)
 ALLOW_DOM_CAST(XPathResult)
+#endif // XPATH_SUPPORT

diff --git a/WebCore/bindings/objc/DOMInternal.mm b/WebCore/bindings/objc/DOMInternal.mm
index 826c40af355b1814a96c3d964f4e7da375ba1fc2..2a01b3a0d264d720f86ccfaebd00745ca0a1581e 100644 (file)
--- a/WebCore/bindings/objc/DOMInternal.mm
+++ b/WebCore/bindings/objc/DOMInternal.mm
@@ -75,7 +75,9 @@ void removeDOMWrapper(DOMObjectInternal* impl)
 NSString * const DOMException = @"DOMException";
 NSString * const DOMRangeException = @"DOMRangeException";
 NSString * const DOMEventException = @"DOMEventException";
+#if XPATH_SUPPORT
 NSString * const DOMXPathException = @"DOMXPathException";
+#endif // XPATH_SUPPORT
 
 void raiseDOMException(ExceptionCode ec)
 {
@@ -90,9 +92,11 @@ void raiseDOMException(ExceptionCode ec)
     } else if (ec >= EventExceptionOffset && ec <= EventExceptionMax) {
         name = DOMEventException;
         code -= EventExceptionOffset;
+#if XPATH_SUPPORT
     } else if (ec >= XPathExceptionOffset && ec <= XPathExceptionMax) {
         name = DOMXPathException;
         code -= XPathExceptionOffset;
+#endif // XPATH_SUPPORT
     }
 
     NSString *reason = [NSString stringWithFormat:@"*** Exception received from DOM API: %d", code];

diff --git a/WebCore/bindings/objc/DOMXPath.h b/WebCore/bindings/objc/DOMXPath.h
index 9ad7176f5747bab5a859d79059623d8f71ed59e4..f4ea8d9f0b44286e43b7c0c250cf2f4df453351e 100644 (file)
--- a/WebCore/bindings/objc/DOMXPath.h
+++ b/WebCore/bindings/objc/DOMXPath.h
@@ -23,6 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#if XPATH_SUPPORT
+
 #import <WebCore/DOMCore.h>
 
 extern NSString * const DOMXPathException;
@@ -71,3 +73,5 @@ enum {
 - (id <DOMXPathNSResolver>)createNSResolver:(DOMNode *)nodeResolver;
 - (DOMXPathResult *)evaluate:(NSString *)expression :(DOMNode *)contextNode :(id <DOMXPathNSResolver>)resolver :(unsigned short)type :(DOMXPathResult *)result;
 @end
+
+#endif // XPATH_SUPPORT

diff --git a/WebCore/bindings/objc/DOMXPath.mm b/WebCore/bindings/objc/DOMXPath.mm
index 39187d950f9d813e79b8912b4afbb03d70cb41a1..c0a1742c72a3ac33c77d7fe881c661e1c83e3b3e 100644 (file)
--- a/WebCore/bindings/objc/DOMXPath.mm
+++ b/WebCore/bindings/objc/DOMXPath.mm
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "DOMXPath.h"
 
+#if XPATH_SUPPORT
+
 #import "DOMInternal.h"
 #import "DOMXPathInternal.h"
 #import "Document.h"
@@ -303,3 +305,4 @@ using WebCore::XPathResult;
 
 @end
 
+#endif // XPATH_SUPPORT

diff --git a/WebCore/bindings/objc/DOMXPathInternal.h b/WebCore/bindings/objc/DOMXPathInternal.h
index 00a951f7025457c8d4c4ef1508d2054eb94759b3..d4835191a9464fbfcc5608946a8c2c85dfda2514 100644 (file)
--- a/WebCore/bindings/objc/DOMXPathInternal.h
+++ b/WebCore/bindings/objc/DOMXPathInternal.h
@@ -23,6 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#if XPATH_SUPPORT
+
 #import "DOMXPath.h"
 #import "XPathExpression.h"
 #import "XPathNSResolver.h"
@@ -43,3 +45,4 @@
 - (WebCore::XPathNSResolver *)_xpathNSResolver;
 @end
 
+#endif // XPATH_SUPPORT