Changeset 86807 in webkit

Timestamp:

May 18, 2011 5:16:40 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-05-18 Emil A Eklund <​eae@chromium.org>

Reviewed by Darin Adler.

Change RenderTextControl::hitInnerTextElement to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61003

Covered by existing tests.

• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::hitInnerTextElement):
• rendering/RenderTextControl.h:
• rendering/RenderTextControlMultiLine.cpp: (WebCore::RenderTextControlMultiLine::nodeAtPoint):
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (1 diff)
• rendering/RenderTextControl.h (modified) (1 diff)
• rendering/RenderTextControlMultiLine.cpp (modified) (1 diff)
• rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-18  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Change RenderTextControl::hitInnerTextElement to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61003
+
+        Covered by existing tests.
+
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::hitInnerTextElement):
+        * rendering/RenderTextControl.h:
+        * rendering/RenderTextControlMultiLine.cpp:
+        (WebCore::RenderTextControlMultiLine::nodeAtPoint):
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::nodeAtPoint):
+
 2011-05-18  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -466 +466 @@
 }
 
-void RenderTextControl::hitInnerTextElement(HitTestResult& result, int xPos, int yPos, int tx, int ty)
+void RenderTextControl::hitInnerTextElement(HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty)
 {
     result.setInnerNode(m_innerText.get());
     result.setInnerNonSharedNode(m_innerText.get());
-    result.setLocalPoint(IntPoint(xPos - tx - x() - m_innerText->renderBox()->x(),
-                                  yPos - ty - y() - m_innerText->renderBox()->y()));
+    result.setLocalPoint(pointInContainer -
+        IntSize(tx + x() + m_innerText->renderBox()->x(), ty + y() + m_innerText->renderBox()->y()));
 }
 

trunk/Source/WebCore/rendering/RenderTextControl.h

@@ -64 +64 @@
 
     void createSubtreeIfNeeded(TextControlInnerElement* innerBlock);
-    void hitInnerTextElement(HitTestResult&, int x, int y, int tx, int ty);
+    void hitInnerTextElement(HitTestResult&, const IntPoint& pointInContainer, int tx, int ty);
     void forwardEvent(Event*);
 

trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp

@@ -64 +64 @@
 
     if (result.innerNode() == node() || result.innerNode() == innerTextElement())
-        hitInnerTextElement(result, pointInContainer.x(), pointInContainer.y(), tx, ty);
+        hitInnerTextElement(result, pointInContainer, tx, ty);
 
     return true;

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -349 +349 @@
     // inner text element so that it gains focus.
     if (result.innerNode()->isDescendantOf(innerTextElement()) || result.innerNode() == node())
-        hitInnerTextElement(result, pointInContainer.x(), pointInContainer.y(), tx, ty);
+        hitInnerTextElement(result, pointInContainer, tx, ty);
 
     // If we found a spin button, we're done.