diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/xml/XPathPredicate.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/xml/XPathPredicate.cpp')
| -rw-r--r-- | WebCore/xml/XPathPredicate.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/WebCore/xml/XPathPredicate.cpp b/WebCore/xml/XPathPredicate.cpp index 7b3e4d8..2a6482f 100644 --- a/WebCore/xml/XPathPredicate.cpp +++ b/WebCore/xml/XPathPredicate.cpp @@ -233,8 +233,6 @@ Value Union::evaluate() const { Value lhsResult = subExpr(0)->evaluate(); Value rhs = subExpr(1)->evaluate(); - if (!lhsResult.isNodeSet() || !rhs.isNodeSet()) - return NodeSet(); NodeSet& resultSet = lhsResult.modifiableNodeSet(); const NodeSet& rhsNodes = rhs.toNodeSet(); |