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

Unified Diff: Source/core/rendering/RenderNamedFlowThread.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/core/rendering/RenderMediaControlsChromium.cpp ('k') | Source/core/rendering/style/SVGRenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderNamedFlowThread.cpp
diff --git a/Source/core/rendering/RenderNamedFlowThread.cpp b/Source/core/rendering/RenderNamedFlowThread.cpp
index 76905a791ecf6949002cede65020afebbf34a973..97774fb63f1fe6afed91b3413df0b8252a5eb954 100644
--- a/Source/core/rendering/RenderNamedFlowThread.cpp
+++ b/Source/core/rendering/RenderNamedFlowThread.cpp
@@ -612,16 +612,16 @@ void RenderNamedFlowThread::getRanges(Vector<RefPtr<Range> >& rangeObjects, cons
if (!boxIntersectsRegion(logicalTopForRenderer, logicalBottomForRenderer, logicalTopForRegion, logicalBottomForRegion)) {
if (foundStartPosition) {
if (!startsAboveRegion) {
- if (range->intersectsNode(node, IGNORE_EXCEPTION_STATE))
- range->setEndBefore(node, IGNORE_EXCEPTION_STATE);
- rangeObjects.append(range->cloneRange(IGNORE_EXCEPTION_STATE));
+ if (range->intersectsNode(node, IGNORE_EXCEPTION))
+ range->setEndBefore(node, IGNORE_EXCEPTION);
+ rangeObjects.append(range->cloneRange(IGNORE_EXCEPTION));
range = Range::create(contentNode->document());
startsAboveRegion = true;
} else
skipOverOutsideNodes = true;
}
if (skipOverOutsideNodes)
- range->setStartAfter(node, IGNORE_EXCEPTION_STATE);
+ range->setStartAfter(node, IGNORE_EXCEPTION);
foundStartPosition = false;
continue;
}
@@ -648,7 +648,7 @@ void RenderNamedFlowThread::getRanges(Vector<RefPtr<Range> >& rangeObjects, cons
// the range is closed.
if (startsAboveRegion) {
startsAboveRegion = false;
- range->setStartBefore(node, IGNORE_EXCEPTION_STATE);
+ range->setStartBefore(node, IGNORE_EXCEPTION);
}
}
skipOverOutsideNodes = false;
@@ -682,7 +682,7 @@ void RenderNamedFlowThread::getRanges(Vector<RefPtr<Range> >& rangeObjects, cons
// for elements that ends inside the region, set the end position to be after them
// allow this end position to be changed only by other elements that are not descendants of the current end node
if (endsBelowRegion || (!endsBelowRegion && !node->isDescendantOf(lastEndNode))) {
- range->setEndAfter(node, IGNORE_EXCEPTION_STATE);
+ range->setEndAfter(node, IGNORE_EXCEPTION);
endsBelowRegion = false;
lastEndNode = node;
}
« no previous file with comments | « Source/core/rendering/RenderMediaControlsChromium.cpp ('k') | Source/core/rendering/style/SVGRenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698