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

Unified Diff: Source/core/html/HTMLTextFormControlElement.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/html/HTMLTextAreaElement.cpp ('k') | Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLTextFormControlElement.cpp
diff --git a/Source/core/html/HTMLTextFormControlElement.cpp b/Source/core/html/HTMLTextFormControlElement.cpp
index b1830a6a15572cd6496bcea274de7abe934a6c38..274fec19b5ce1c3adc6b0872f6d8d129bc393204 100644
--- a/Source/core/html/HTMLTextFormControlElement.cpp
+++ b/Source/core/html/HTMLTextFormControlElement.cpp
@@ -154,7 +154,7 @@ bool HTMLTextFormControlElement::placeholderShouldBeVisible() const
HTMLElement* HTMLTextFormControlElement::placeholderElement() const
{
- return toHTMLElement(userAgentShadowRoot()->getElementById(ShadowElementNames::placeholder()));
+ return toHTMLElement(closedShadowRoot()->getElementById(ShadowElementNames::placeholder()));
}
void HTMLTextFormControlElement::updatePlaceholderVisibility(bool placeholderValueChanged)
@@ -216,7 +216,7 @@ void HTMLTextFormControlElement::setRangeText(const String& replacement, unsigne
exceptionState.throwDOMException(IndexSizeError, "The provided start value (" + String::number(start) + ") is larger than the provided end value (" + String::number(end) + ").");
return;
}
- if (hasAuthorShadowRoot())
+ if (hasOpenShadowRoot())
return;
String text = innerEditorValue();
@@ -348,7 +348,7 @@ static int indexForPosition(HTMLElement* innerEditor, const Position& passedPosi
void HTMLTextFormControlElement::setSelectionRange(int start, int end, TextFieldSelectionDirection direction, NeedToDispatchSelectEvent eventBehaviour, SelectionOption selectionOption)
{
- if (hasAuthorShadowRoot() || !isTextFormControl())
+ if (hasOpenShadowRoot() || !isTextFormControl())
return;
const int editorValueLength = static_cast<int>(innerEditorValue().length());
@@ -592,8 +592,8 @@ bool HTMLTextFormControlElement::lastChangeWasUserEdit() const
void HTMLTextFormControlElement::setInnerEditorValue(const String& value)
{
- ASSERT(!hasAuthorShadowRoot());
- if (!isTextFormControl() || hasAuthorShadowRoot())
+ ASSERT(!hasOpenShadowRoot());
+ if (!isTextFormControl() || hasOpenShadowRoot())
return;
bool textIsChanged = value != innerEditorValue();
@@ -620,7 +620,7 @@ static String finishText(StringBuilder& result)
String HTMLTextFormControlElement::innerEditorValue() const
{
- ASSERT(!hasAuthorShadowRoot());
+ ASSERT(!hasOpenShadowRoot());
HTMLElement* innerEditor = innerEditorElement();
if (!innerEditor || !isTextFormControl())
return emptyString();
@@ -709,7 +709,7 @@ HTMLTextFormControlElement* enclosingTextFormControl(Node* container)
if (!container)
return nullptr;
Element* ancestor = container->shadowHost();
- return ancestor && isHTMLTextFormControlElement(*ancestor) && container->containingShadowRoot()->type() == ShadowRoot::UserAgentShadowRoot ? toHTMLTextFormControlElement(ancestor) : 0;
+ return ancestor && isHTMLTextFormControlElement(*ancestor) && container->containingShadowRoot()->type() == ShadowRoot::ClosedShadowRoot ? toHTMLTextFormControlElement(ancestor) : 0;
}
String HTMLTextFormControlElement::directionForFormData() const
@@ -734,7 +734,7 @@ String HTMLTextFormControlElement::directionForFormData() const
HTMLElement* HTMLTextFormControlElement::innerEditorElement() const
{
- return toHTMLElement(userAgentShadowRoot()->getElementById(ShadowElementNames::innerEditor()));
+ return toHTMLElement(closedShadowRoot()->getElementById(ShadowElementNames::innerEditor()));
}
static Position innerNodePosition(const Position& innerPosition)
« no previous file with comments | « Source/core/html/HTMLTextAreaElement.cpp ('k') | Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698