summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/TextControlInnerElements.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/rendering/TextControlInnerElements.cpp')
-rw-r--r--WebCore/rendering/TextControlInnerElements.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/WebCore/rendering/TextControlInnerElements.cpp b/WebCore/rendering/TextControlInnerElements.cpp
index 6495d04..fba523e 100644
--- a/WebCore/rendering/TextControlInnerElements.cpp
+++ b/WebCore/rendering/TextControlInnerElements.cpp
@@ -51,23 +51,11 @@ public:
RenderTextControlInnerBlock(Node* node, bool isMultiLine) : RenderBlock(node), m_multiLine(isMultiLine) { }
private:
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
virtual VisiblePosition positionForPoint(const IntPoint&);
bool m_multiLine;
};
-bool RenderTextControlInnerBlock::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int x, int y, int tx, int ty, HitTestAction hitTestAction)
-{
- RenderObject* renderer = node()->shadowAncestorNode()->renderer();
-
- bool placeholderIsVisible = false;
- if (renderer->isTextField())
- placeholderIsVisible = toRenderTextControlSingleLine(renderer)->placeholderIsVisible();
-
- return RenderBlock::nodeAtPoint(request, result, x, y, tx, ty, placeholderIsVisible ? HitTestBlockBackground : hitTestAction);
-}
-
VisiblePosition RenderTextControlInnerBlock::positionForPoint(const IntPoint& point)
{
IntPoint contentsPoint(point);
@@ -154,7 +142,7 @@ void TextControlInnerTextElement::defaultEventHandler(Event* event)
if (shadowAncestor && shadowAncestor != this)
shadowAncestor->defaultEventHandler(event);
}
- if (event->defaultHandled())
+ if (!event->defaultHandled())
HTMLDivElement::defaultEventHandler(event);
}