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

Unified Diff: third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp

Issue 2327743002: Rename Node::shadowHost() to Node::ownerShadowHost() (Closed)
Patch Set: fix Created 4 years, 3 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
Index: third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp b/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp
index 17a553581dc1a1477d931870f7bb7c63a46e8286..dcbcf53f5f09fdddac4306adf21e689bc4e14a8a 100644
--- a/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp
@@ -82,7 +82,7 @@ PassRefPtr<ComputedStyle> EditingViewPortElement::customStyleForLayoutObject()
// FXIME: Move these styles to html.css.
RefPtr<ComputedStyle> style = ComputedStyle::create();
- style->inheritFrom(shadowHost()->computedStyleRef());
+ style->inheritFrom(ownerShadowHost()->computedStyleRef());
style->setFlexGrow(1);
style->setMinWidth(Length(0, Fixed));
@@ -121,7 +121,7 @@ void TextControlInnerEditorElement::defaultEventHandler(Event* event)
// Then we would add one to the text field's inner div, and we wouldn't need this subclass.
// Or possibly we could just use a normal event listener.
if (event->isBeforeTextInsertedEvent() || event->type() == EventTypeNames::webkitEditableContentChanged) {
- Element* shadowAncestor = shadowHost();
+ Element* shadowAncestor = ownerShadowHost();
// A TextControlInnerTextElement can have no host if its been detached,
// but kept alive by an EditCommand. In this case, an undo/redo can
// cause events to be sent to the TextControlInnerTextElement. To
@@ -141,7 +141,7 @@ LayoutObject* TextControlInnerEditorElement::createLayoutObject(const ComputedSt
PassRefPtr<ComputedStyle> TextControlInnerEditorElement::customStyleForLayoutObject()
{
- LayoutObject* parentLayoutObject = shadowHost()->layoutObject();
+ LayoutObject* parentLayoutObject = ownerShadowHost()->layoutObject();
if (!parentLayoutObject || !parentLayoutObject->isTextControl())
return originalStyleForLayoutObject();
LayoutTextControlItem textControlLayoutItem = LayoutTextControlItem(toLayoutTextControl(parentLayoutObject));
@@ -183,7 +183,7 @@ void SearchFieldCancelButtonElement::detachLayoutTree(const AttachContext& conte
void SearchFieldCancelButtonElement::defaultEventHandler(Event* event)
{
// If the element is visible, on mouseup, clear the value, and set selection
- HTMLInputElement* input(toHTMLInputElement(shadowHost()));
+ HTMLInputElement* input(toHTMLInputElement(ownerShadowHost()));
if (!input || input->isDisabledOrReadOnly()) {
if (!event->defaultHandled())
HTMLDivElement::defaultEventHandler(event);
@@ -204,7 +204,7 @@ void SearchFieldCancelButtonElement::defaultEventHandler(Event* event)
bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents()
{
- const HTMLInputElement* input = toHTMLInputElement(shadowHost());
+ const HTMLInputElement* input = toHTMLInputElement(ownerShadowHost());
if (input && !input->isDisabledOrReadOnly())
return true;

Powered by Google App Engine
This is Rietveld 408576698