Changeset 127553 in webkit

Timestamp:

Sep 4, 2012 9:53:35 PM (12 years ago)

Author:

keishi@webkit.org

Message:

REGRESSION(r126132): MediaSlider and MediaVolumeSlider thumbs don't match mouse when dragged
​https://bugs.webkit.org/show_bug.cgi?id=95701

Reviewed by Kent Tamura.

Source/WebCore:

MediaSlider and MediaVolumeSlider thumbs didn't match mouse when dragged because of the negative margin applied to the thumb.

Test: platform/chromium/media/media-volume-slider-hit-test.html

• html/shadow/SliderThumbElement.cpp:

(WebCore::SliderThumbElement::setPositionFromPoint): Account for margins when calculating the position.

LayoutTests:

• platform/chromium/media/media-volume-slider-hit-test-expected.txt: Added.
• platform/chromium/media/media-volume-slider-hit-test.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/media/media-volume-slider-hit-test-expected.txt (added)
• LayoutTests/platform/chromium/media/media-volume-slider-hit-test.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/SliderThumbElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-04  Keishi Hattori  <keishi@webkit.org>
+
+        REGRESSION(r126132): MediaSlider and MediaVolumeSlider thumbs don't match mouse when dragged
+        https://bugs.webkit.org/show_bug.cgi?id=95701
+
+        Reviewed by Kent Tamura.
+
+        * platform/chromium/media/media-volume-slider-hit-test-expected.txt: Added.
+        * platform/chromium/media/media-volume-slider-hit-test.html: Added.
+
 2012-09-04  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-04  Keishi Hattori  <keishi@webkit.org>
+
+        REGRESSION(r126132): MediaSlider and MediaVolumeSlider thumbs don't match mouse when dragged
+        https://bugs.webkit.org/show_bug.cgi?id=95701
+
+        Reviewed by Kent Tamura.
+
+        MediaSlider and MediaVolumeSlider thumbs didn't match mouse when dragged because of the negative margin applied to the thumb.
+
+        Test: platform/chromium/media/media-volume-slider-hit-test.html
+
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::SliderThumbElement::setPositionFromPoint): Account for margins when calculating the position.
+
 2012-09-04  Tony Chang  <tony@chromium.org>
 

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

@@ -273 +273 @@
     if (isVertical) {
         trackSize = trackElement->renderBox()->contentHeight();
-        position = offset.y() - renderBox()->height() / 2 - trackBoundingBox.y() + inputBoundingBox.y();
+        position = offset.y() - renderBox()->height() / 2 - trackBoundingBox.y() + inputBoundingBox.y() - renderBox()->marginBottom();
         currentPosition = absoluteThumbOrigin.y() - absoluteSliderContentOrigin.y();
     } else {
         trackSize = trackElement->renderBox()->contentWidth();
         position = offset.x() - renderBox()->width() / 2 - trackBoundingBox.x() + inputBoundingBox.x();
-        if (!isLeftToRightDirection)
-            position += renderBox()->width();
+        if (isLeftToRightDirection)
+            position -= renderBox()->marginLeft();
+        else
+            position += renderBox()->width() - renderBox()->marginRight();
         currentPosition = absoluteThumbOrigin.x() - absoluteSliderContentOrigin.x();
     }