Changeset 126132 in webkit

Timestamp:

Aug 20, 2012 9:27:27 PM (12 years ago)

Author:

keishi@webkit.org

Message:

Clicking input type=range with padding or border sets wrong value
​https://bugs.webkit.org/show_bug.cgi?id=94473

Reviewed by Kent Tamura.

Source/WebCore:

We should take the padding and border width into account when calculating the value from the mouse location.

Test: fast/forms/range/range-hit-test-with-padding.html

• html/shadow/SliderThumbElement.cpp:

(WebCore::sliderTrackElementOf):
(WebCore):
(WebCore::SliderThumbElement::setPositionFromPoint):

• html/shadow/SliderThumbElement.h:

(WebCore):

LayoutTests:

• fast/forms/range/range-hit-test-with-padding-expected.txt: Added.
• fast/forms/range/range-hit-test-with-padding.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/range/range-hit-test-with-padding-expected.txt (added)
• LayoutTests/fast/forms/range/range-hit-test-with-padding.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/SliderThumbElement.cpp (modified) (3 diffs)
• Source/WebCore/html/shadow/SliderThumbElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-20  Keishi Hattori  <keishi@webkit.org>
+
+        Clicking input type=range with padding or border sets wrong value
+        https://bugs.webkit.org/show_bug.cgi?id=94473
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/range/range-hit-test-with-padding-expected.txt: Added.
+        * fast/forms/range/range-hit-test-with-padding.html: Added.
+
 2012-08-20  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-20  Keishi Hattori  <keishi@webkit.org>
+
+        Clicking input type=range with padding or border sets wrong value
+        https://bugs.webkit.org/show_bug.cgi?id=94473
+
+        Reviewed by Kent Tamura.
+
+        We should take the padding and border width into account when calculating the value from the mouse location.
+
+        Test: fast/forms/range/range-hit-test-with-padding.html
+
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::sliderTrackElementOf):
+        (WebCore):
+        (WebCore::SliderThumbElement::setPositionFromPoint):
+        * html/shadow/SliderThumbElement.h:
+        (WebCore):
+
 2012-08-20  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

@@ -82 +82 @@
     ASSERT(thumb);
     return toSliderThumbElement(thumb);
+}
+
+HTMLElement* sliderTrackElementOf(Node* node)
+{
+    ASSERT(node);
+    ShadowRoot* shadow = node->toInputElement()->userAgentShadowRoot();
+    ASSERT(shadow);
+    Node* track = shadow->firstChild()->firstChild();
+    ASSERT(track);
+    return toHTMLElement(track);
 }
 
@@ -241 +251 @@
 {
     HTMLInputElement* input = hostInput();
-
-    if (!input->renderer() || !renderer())
+    HTMLElement* trackElement = sliderTrackElementOf(input);
+
+    if (!input->renderer() || !renderer() || !trackElement->renderer())
         return;
 
@@ -257 +268 @@
     LayoutPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRectIgnoringTransforms().location();
     LayoutPoint absoluteSliderContentOrigin = roundedLayoutPoint(input->renderer()->localToAbsolute());
+    IntRect trackBoundingBox = trackElement->renderer()->absoluteBoundingBoxRectIgnoringTransforms();
+    IntRect inputBoundingBox = input->renderer()->absoluteBoundingBoxRectIgnoringTransforms();
     if (isVertical) {
-        trackSize = input->renderBox()->contentHeight() - renderBox()->height();
-        position = offset.y() - renderBox()->height() / 2;
+        trackSize = trackElement->renderBox()->contentHeight();
+        position = offset.y() - renderBox()->height() / 2 - trackBoundingBox.y() + inputBoundingBox.y();
         currentPosition = absoluteThumbOrigin.y() - absoluteSliderContentOrigin.y();
     } else {
-        trackSize = input->renderBox()->contentWidth() - renderBox()->width();
-        position = offset.x() - renderBox()->width() / 2;
+        trackSize = trackElement->renderBox()->contentWidth();
+        position = offset.x() - renderBox()->width() / 2 - trackBoundingBox.x() + inputBoundingBox.x();
         currentPosition = absoluteThumbOrigin.x() - absoluteSliderContentOrigin.x();
     }

trunk/Source/WebCore/html/shadow/SliderThumbElement.h

@@ -101 +101 @@
 // An assertion fails if the specified node is not a range input.
 SliderThumbElement* sliderThumbElementOf(Node*);
+HTMLElement* sliderTrackElementOf(Node*);
 
 // --------------------------------