third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp - Issue 1407183002: Rename ShadowRootType::OpenByDefault to ShadowRootType::V0.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

Issue 1407183002: Rename ShadowRootType::OpenByDefault to ShadowRootType::V0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v1-attach-shadow

Patch Set: Created 5 years, 2 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 | « third_party/WebKit/Source/core/editing/EditingTestBase.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

index e5786867d951b11da91c7987d16be5b9d494bc38..2e11e8669e8e96f4bdf927c48b5d7fc379168125 100644

--- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

+++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

@@ -285,7 +285,7 @@ void TextIteratorAlgorithm<Strategy>::advance()

if (m_iterationProgress < HandledOpenShadowRoots) {

if (entersOpenShadowRoots() && m_node->isElementNode() && toElement(m_node)->openShadowRoot()) {

ShadowRoot* youngestShadowRoot = toElement(m_node)->openShadowRoot();

- ASSERT(youngestShadowRoot->type() == ShadowRootType::OpenByDefault || youngestShadowRoot->type() == ShadowRootType::Open);

+ ASSERT(youngestShadowRoot->type() == ShadowRootType::V0 || youngestShadowRoot->type() == ShadowRootType::Open);

m_node = youngestShadowRoot;

m_iterationProgress = HandledNone;

++m_shadowDepth;

@@ -374,9 +374,9 @@ void TextIteratorAlgorithm<Strategy>::advance()

return;

}

ShadowRoot* shadowRoot = toShadowRoot(m_node);

- if (shadowRoot->type() == ShadowRootType::OpenByDefault || shadowRoot->type() == ShadowRootType::Open) {

+ if (shadowRoot->type() == ShadowRootType::V0 || shadowRoot->type() == ShadowRootType::Open) {

ShadowRoot* nextShadowRoot = shadowRoot->olderShadowRoot();

- if (nextShadowRoot && nextShadowRoot->type() == ShadowRootType::OpenByDefault) {

+ if (nextShadowRoot && nextShadowRoot->type() == ShadowRootType::V0) {

m_fullyClippedStack.pop();

m_node = nextShadowRoot;

m_iterationProgress = HandledNone;