Commit f769e308 authored by ddkilzer's avatar ddkilzer

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: http://svn.webkit.org/repository/webkit/trunk@15092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e5ae0240
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.
......
......@@ -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
......@@ -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];
......
......@@ -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
......@@ -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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment