From 5f1ab04193ad0130ca8204aadaceae083aca9881 Mon Sep 17 00:00:00 2001 From: Feng Qian Date: Wed, 17 Jun 2009 12:12:20 -0700 Subject: Get WebKit r44544. --- WebCore/xml/XPathPath.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'WebCore/xml/XPathPath.h') diff --git a/WebCore/xml/XPathPath.h b/WebCore/xml/XPathPath.h index 46e57ff..dc77971 100644 --- a/WebCore/xml/XPathPath.h +++ b/WebCore/xml/XPathPath.h @@ -1,6 +1,6 @@ /* - * path.h - Copyright 2005 Frerich Raabe - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2005 Frerich Raabe + * Copyright (C) 2006, 2009 Apple Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,6 +47,8 @@ namespace WebCore { virtual Value evaluate() const; private: + virtual Value::Type resultType() const { return Value::NodeSetValue; } + Expression* m_expr; Vector m_predicates; }; @@ -55,7 +57,7 @@ namespace WebCore { public: LocationPath(); virtual ~LocationPath(); - void setAbsolute(bool value) { m_absolute = value; } + void setAbsolute(bool value) { m_absolute = value; setIsContextNodeSensitive(!m_absolute); } virtual Value evaluate() const; void evaluate(NodeSet& nodes) const; // nodes is an input/output parameter @@ -64,7 +66,7 @@ namespace WebCore { void insertFirstStep(Step* step); private: - void optimizeStepPair(unsigned index); + virtual Value::Type resultType() const { return Value::NodeSetValue; } Vector m_steps; bool m_absolute; @@ -79,6 +81,8 @@ namespace WebCore { virtual Value evaluate() const; private: + virtual Value::Type resultType() const { return Value::NodeSetValue; } + Filter* m_filter; LocationPath* m_path; }; -- cgit v1.1