| Index: Source/core/rendering/RenderTextControlMultiLine.cpp
|
| diff --git a/Source/core/rendering/RenderTextControlMultiLine.cpp b/Source/core/rendering/RenderTextControlMultiLine.cpp
|
| index ffef0c78c06a70a86ae9a2fad70b352b5b15a46a..eef715fa7488e18e9f1c5961b26398d0fc32a7dd 100644
|
| --- a/Source/core/rendering/RenderTextControlMultiLine.cpp
|
| +++ b/Source/core/rendering/RenderTextControlMultiLine.cpp
|
| @@ -42,8 +42,8 @@ bool RenderTextControlMultiLine::nodeAtPoint(const HitTestRequest& request, HitT
|
| if (!RenderTextControl::nodeAtPoint(request, result, locationInContainer, accumulatedOffset, hitTestAction))
|
| return false;
|
|
|
| - if (result.innerNode() == node() || result.innerNode() == innerTextElement())
|
| - hitInnerTextElement(result, locationInContainer.point(), accumulatedOffset);
|
| + if (result.innerNode() == node() || result.innerNode() == innerEditorElement())
|
| + hitInnerEditorElement(result, locationInContainer.point(), accumulatedOffset);
|
|
|
| return true;
|
| }
|
| @@ -75,11 +75,11 @@ int RenderTextControlMultiLine::baselinePosition(FontBaseline baselineType, bool
|
| return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
|
| }
|
|
|
| -PassRefPtr<RenderStyle> RenderTextControlMultiLine::createInnerTextStyle(const RenderStyle* startStyle) const
|
| +PassRefPtr<RenderStyle> RenderTextControlMultiLine::createInnerEditorStyle(const RenderStyle* startStyle) const
|
| {
|
| RefPtr<RenderStyle> textBlockStyle = RenderStyle::create();
|
| textBlockStyle->inheritFrom(startStyle);
|
| - adjustInnerTextStyle(textBlockStyle.get());
|
| + adjustInnerEditorStyle(textBlockStyle.get());
|
| textBlockStyle->setDisplay(BLOCK);
|
| textBlockStyle->setUnique();
|
|
|
|
|