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

Unified Diff: Source/web/WebFrameImpl.cpp

Issue 22417002: Rename ASSERT_NO_EXCEPTION_STATE and IGNORE_EXCEPTION_STATE (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/ContextMenuClientImpl.cpp ('k') | Source/web/WebRange.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebFrameImpl.cpp
diff --git a/Source/web/WebFrameImpl.cpp b/Source/web/WebFrameImpl.cpp
index 9cde30346f708aa69c592f63f3f1279b46cf274c..b6f17c9f4872723dbb07f074fdc68dc7ce61c842 100644
--- a/Source/web/WebFrameImpl.cpp
+++ b/Source/web/WebFrameImpl.cpp
@@ -709,11 +709,11 @@ WebFrame* WebFrameImpl::findChildByExpression(const WebString& xpath) const
Document* document = frame()->document();
- RefPtr<XPathResult> xpathResult = DocumentXPathEvaluator::evaluate(document, xpath, document, 0, XPathResult::ORDERED_NODE_ITERATOR_TYPE, 0, IGNORE_EXCEPTION_STATE);
+ RefPtr<XPathResult> xpathResult = DocumentXPathEvaluator::evaluate(document, xpath, document, 0, XPathResult::ORDERED_NODE_ITERATOR_TYPE, 0, IGNORE_EXCEPTION);
if (!xpathResult)
return 0;
- Node* node = xpathResult->iterateNext(IGNORE_EXCEPTION_STATE);
+ Node* node = xpathResult->iterateNext(IGNORE_EXCEPTION);
if (!node || !node->isFrameOwnerElement())
return 0;
HTMLFrameOwnerElement* frameElement = toFrameOwnerElement(node);
@@ -2362,7 +2362,7 @@ void WebFrameImpl::addMarker(Range* range, bool activeMatch)
void WebFrameImpl::setMarkerActive(Range* range, bool active)
{
- if (!range || range->collapsed(IGNORE_EXCEPTION_STATE))
+ if (!range || range->collapsed(IGNORE_EXCEPTION))
return;
frame()->document()->markers()->setMarkersActive(range, active);
}
« no previous file with comments | « Source/web/ContextMenuClientImpl.cpp ('k') | Source/web/WebRange.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698