Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Side by Side Diff: Source/core/xml/XPathEvaluator.cpp

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/xml/XMLSerializer.cpp ('k') | Source/core/xml/XPathExpression.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2005 Frerich Raabe <raabe@kde.org> 2 * Copyright 2005 Frerich Raabe <raabe@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 21 matching lines...) Expand all
32 #include "core/dom/Node.h" 32 #include "core/dom/Node.h"
33 #include "core/xml/NativeXPathNSResolver.h" 33 #include "core/xml/NativeXPathNSResolver.h"
34 #include "core/xml/XPathExpression.h" 34 #include "core/xml/XPathExpression.h"
35 #include "core/xml/XPathResult.h" 35 #include "core/xml/XPathResult.h"
36 #include "core/xml/XPathUtil.h" 36 #include "core/xml/XPathUtil.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 using namespace XPath; 40 using namespace XPath;
41 41
42 PassRefPtr<XPathExpression> XPathEvaluator::createExpression(const String& expre ssion, XPathNSResolver* resolver, ExceptionState& es) 42 PassRefPtr<XPathExpression> XPathEvaluator::createExpression(const String& expre ssion, XPathNSResolver* resolver, ExceptionState& exceptionState)
43 { 43 {
44 return XPathExpression::createExpression(expression, resolver, es); 44 return XPathExpression::createExpression(expression, resolver, exceptionStat e);
45 } 45 }
46 46
47 PassRefPtr<XPathNSResolver> XPathEvaluator::createNSResolver(Node* nodeResolver) 47 PassRefPtr<XPathNSResolver> XPathEvaluator::createNSResolver(Node* nodeResolver)
48 { 48 {
49 return NativeXPathNSResolver::create(nodeResolver); 49 return NativeXPathNSResolver::create(nodeResolver);
50 } 50 }
51 51
52 PassRefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, Node* contextNode, 52 PassRefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, Node* contextNode,
53 XPathNSResolver* resolver, unsigned short type, XPathResult* result, Excepti onState& es) 53 XPathNSResolver* resolver, unsigned short type, XPathResult* result, Excepti onState& exceptionState)
54 { 54 {
55 if (!isValidContextNode(contextNode)) { 55 if (!isValidContextNode(contextNode)) {
56 es.throwUninformativeAndGenericDOMException(NotSupportedError); 56 exceptionState.throwUninformativeAndGenericDOMException(NotSupportedErro r);
57 return 0; 57 return 0;
58 } 58 }
59 59
60 RefPtr<XPathExpression> expr = createExpression(expression, resolver, es); 60 RefPtr<XPathExpression> expr = createExpression(expression, resolver, except ionState);
61 if (es.hadException()) 61 if (exceptionState.hadException())
62 return 0; 62 return 0;
63 63
64 return expr->evaluate(contextNode, type, result, es); 64 return expr->evaluate(contextNode, type, result, exceptionState);
65 } 65 }
66 66
67 } 67 }
OLDNEW
« no previous file with comments | « Source/core/xml/XMLSerializer.cpp ('k') | Source/core/xml/XPathExpression.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698