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

Unified Diff: Source/core/dom/Element.cpp

Issue 935283002: Rename {Author,UserAgent}ShadowRoot to {Open,Closed}ShadowRoot. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix inspector tests Created 5 years, 10 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/dom/Element.h ('k') | Source/core/dom/Node.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 7ed385f12649b8ee4e6a28001d6003723a18e56c..6e2188ede01228f29578c63d2a06cde25f400d48 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -1767,8 +1767,8 @@ CustomElementDefinition* Element::customElementDefinition() const
PassRefPtrWillBeRawPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exceptionState)
{
- if (alwaysCreateUserAgentShadowRoot())
- ensureUserAgentShadowRoot();
+ if (alwaysCreateClosedShadowRoot())
+ ensureClosedShadowRoot();
// Some elements make assumptions about what kind of renderers they allow
// as children so we can't allow author shadows on them for now. An override
@@ -1778,7 +1778,7 @@ PassRefPtrWillBeRawPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exc
return nullptr;
}
- return PassRefPtrWillBeRawPtr<ShadowRoot>(ensureShadow().addShadowRoot(*this, ShadowRoot::AuthorShadowRoot));
+ return PassRefPtrWillBeRawPtr<ShadowRoot>(ensureShadow().addShadowRoot(*this, ShadowRoot::OpenShadowRoot));
}
ShadowRoot* Element::shadowRoot() const
@@ -1787,16 +1787,16 @@ ShadowRoot* Element::shadowRoot() const
if (!elementShadow)
return nullptr;
ShadowRoot* shadowRoot = elementShadow->youngestShadowRoot();
- if (shadowRoot->type() == ShadowRoot::AuthorShadowRoot)
+ if (shadowRoot->type() == ShadowRoot::OpenShadowRoot)
return shadowRoot;
return nullptr;
}
-ShadowRoot* Element::userAgentShadowRoot() const
+ShadowRoot* Element::closedShadowRoot() const
{
if (ElementShadow* elementShadow = shadow()) {
if (ShadowRoot* shadowRoot = elementShadow->oldestShadowRoot()) {
- ASSERT(shadowRoot->type() == ShadowRoot::UserAgentShadowRoot);
+ ASSERT(shadowRoot->type() == ShadowRoot::ClosedShadowRoot);
return shadowRoot;
}
}
@@ -1804,12 +1804,12 @@ ShadowRoot* Element::userAgentShadowRoot() const
return nullptr;
}
-ShadowRoot& Element::ensureUserAgentShadowRoot()
+ShadowRoot& Element::ensureClosedShadowRoot()
{
- if (ShadowRoot* shadowRoot = userAgentShadowRoot())
+ if (ShadowRoot* shadowRoot = closedShadowRoot())
return *shadowRoot;
- ShadowRoot& shadowRoot = ensureShadow().addShadowRoot(*this, ShadowRoot::UserAgentShadowRoot);
- didAddUserAgentShadowRoot(shadowRoot);
+ ShadowRoot& shadowRoot = ensureShadow().addShadowRoot(*this, ShadowRoot::ClosedShadowRoot);
+ didAddClosedShadowRoot(shadowRoot);
return shadowRoot;
}
@@ -2469,7 +2469,7 @@ String Element::textFromChildren()
const AtomicString& Element::shadowPseudoId() const
{
if (ShadowRoot* root = containingShadowRoot()) {
- if (root->type() == ShadowRoot::UserAgentShadowRoot)
+ if (root->type() == ShadowRoot::ClosedShadowRoot)
return fastGetAttribute(pseudoAttr);
}
return nullAtom;
« no previous file with comments | « Source/core/dom/Element.h ('k') | Source/core/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698