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

Side by Side Diff: Source/core/xml/XPathParser.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/XPathExpression.cpp ('k') | Source/core/xml/XPathResult.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 Maksim Orlovich <maksim@kde.org> 2 * Copyright 2005 Maksim Orlovich <maksim@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 namespaceURI = m_resolver->lookupNamespaceURI(qName.left(colon)); 457 namespaceURI = m_resolver->lookupNamespaceURI(qName.left(colon));
458 if (namespaceURI.isNull()) 458 if (namespaceURI.isNull())
459 return false; 459 return false;
460 localName = qName.substring(colon + 1); 460 localName = qName.substring(colon + 1);
461 } else 461 } else
462 localName = qName; 462 localName = qName;
463 463
464 return true; 464 return true;
465 } 465 }
466 466
467 Expression* Parser::parseStatement(const String& statement, PassRefPtr<XPathNSRe solver> resolver, ExceptionState& es) 467 Expression* Parser::parseStatement(const String& statement, PassRefPtr<XPathNSRe solver> resolver, ExceptionState& exceptionState)
468 { 468 {
469 reset(statement); 469 reset(statement);
470 470
471 m_resolver = resolver; 471 m_resolver = resolver;
472 472
473 Parser* oldParser = currentParser; 473 Parser* oldParser = currentParser;
474 currentParser = this; 474 currentParser = this;
475 int parseError = xpathyyparse(this); 475 int parseError = xpathyyparse(this);
476 currentParser = oldParser; 476 currentParser = oldParser;
477 477
(...skipping 13 matching lines...) Expand all
491 491
492 deleteAllValues(m_strings); 492 deleteAllValues(m_strings);
493 m_strings.clear(); 493 m_strings.clear();
494 494
495 deleteAllValues(m_nodeTests); 495 deleteAllValues(m_nodeTests);
496 m_nodeTests.clear(); 496 m_nodeTests.clear();
497 497
498 m_topExpr = 0; 498 m_topExpr = 0;
499 499
500 if (m_gotNamespaceError) 500 if (m_gotNamespaceError)
501 es.throwUninformativeAndGenericDOMException(NamespaceError); 501 exceptionState.throwUninformativeAndGenericDOMException(NamespaceErr or);
502 else 502 else
503 es.throwUninformativeAndGenericDOMException(SyntaxError); 503 exceptionState.throwUninformativeAndGenericDOMException(SyntaxError) ;
504 return 0; 504 return 0;
505 } 505 }
506 506
507 ASSERT(m_parseNodes.size() == 1); 507 ASSERT(m_parseNodes.size() == 1);
508 ASSERT(*m_parseNodes.begin() == m_topExpr); 508 ASSERT(*m_parseNodes.begin() == m_topExpr);
509 ASSERT(m_expressionVectors.size() == 0); 509 ASSERT(m_expressionVectors.size() == 0);
510 ASSERT(m_predicateVectors.size() == 0); 510 ASSERT(m_predicateVectors.size() == 0);
511 ASSERT(m_strings.size() == 0); 511 ASSERT(m_strings.size() == 0);
512 ASSERT(m_nodeTests.size() == 0); 512 ASSERT(m_nodeTests.size() == 0);
513 513
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 { 616 {
617 if (t == 0) 617 if (t == 0)
618 return; 618 return;
619 619
620 ASSERT(m_nodeTests.contains(t)); 620 ASSERT(m_nodeTests.contains(t));
621 621
622 m_nodeTests.remove(t); 622 m_nodeTests.remove(t);
623 delete t; 623 delete t;
624 } 624 }
625 625
OLDNEW
« no previous file with comments | « Source/core/xml/XPathExpression.cpp ('k') | Source/core/xml/XPathResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698