Skip to content

Commit 94d371c

Browse files
beccahughesbeccahughes
committed
Media Controls: Fix slider touch issue
This fixes a regression where touch/click events are not correctly being picked up by the slider. This adds padding around the timeline and volume slider which will pick up gestures in these areas. There is no visual effect of this change. BUG=773475 Change-Id: Idff48c259438bb776f6794d921625f5340744d1b Reviewed-on: https://chromium-review.googlesource.com/721319 Reviewed-by: Mounir Lamouri <mlamouri@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#509350}(cherry picked from commit 6c57517) Reviewed-on: https://chromium-review.googlesource.com/725290 Reviewed-by: Becca Hughes <beccahughes@chromium.org> Cr-Commit-Position: refs/branch-heads/3239@{#50} Cr-Branched-From: adb61db-refs/heads/master@{#508578}
1 parent 7f54cb9 commit 94d371c

File tree

34 files changed

+172
-172
lines changed

34 files changed

+172
-172
lines changed

‎third_party/WebKit/LayoutTests/platform/linux/media/controls/video-controls-with-cast-rendering-expected.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ layer at (8,260) size 320x32 scrollHeight 40
2727
LayoutBlockFlow (anonymous) at (0,0) size 24x32
2828
LayoutText {#text} at (0,8) size 24x15
2929
text run at (0,8) width 24: "0:00"
30-
LayoutSlider {INPUT} at (74,15) size 71x2
31-
LayoutFlexibleBox {DIV} at (0,0) size 71x2
30+
LayoutSlider {INPUT} at (74,1) size 71x30
31+
LayoutFlexibleBox {DIV} at (0,14) size 71x2
3232
LayoutButton {INPUT} at (163,0) size 32x32
33-
LayoutSlider {INPUT} at (213,15) size 25x2
34-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
33+
LayoutSlider {INPUT} at (213,1) size 25x30
34+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
3535
LayoutButton {INPUT} at (288,0) size 32x32
3636
layer at (264,260) size 32x32
3737
LayoutButton {INPUT} at (256,0) size 32x32
@@ -67,11 +67,11 @@ layer at (8,505) size 320x32 scrollHeight 40
6767
LayoutBlockFlow (anonymous) at (0,0) size 24x32
6868
LayoutText {#text} at (0,8) size 24x15
6969
text run at (0,8) width 24: "0:00"
70-
LayoutSlider {INPUT} at (74,15) size 71x2
71-
LayoutFlexibleBox {DIV} at (0,0) size 71x2
70+
LayoutSlider {INPUT} at (74,1) size 71x30
71+
LayoutFlexibleBox {DIV} at (0,14) size 71x2
7272
LayoutButton {INPUT} at (163,0) size 32x32
73-
LayoutSlider {INPUT} at (213,15) size 25x2
74-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
73+
LayoutSlider {INPUT} at (213,1) size 25x30
74+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
7575
LayoutButton {INPUT} at (288,0) size 32x32
7676
layer at (264,505) size 32x32
7777
LayoutButton {INPUT} at (256,0) size 32x32
@@ -109,11 +109,11 @@ layer at (8,750) size 320x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size
109109
LayoutBlockFlow (anonymous) at (0,0) size 24x32
110110
LayoutText {#text} at (0,8) size 24x15
111111
text run at (0,8) width 24: "0:00"
112-
LayoutSlider {INPUT} at (74,15) size 71x2
113-
LayoutFlexibleBox {DIV} at (0,0) size 71x2
112+
LayoutSlider {INPUT} at (74,1) size 71x30
113+
LayoutFlexibleBox {DIV} at (0,14) size 71x2
114114
LayoutButton {INPUT} at (163,0) size 32x32
115-
LayoutSlider {INPUT} at (213,15) size 25x2
116-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
115+
LayoutSlider {INPUT} at (213,1) size 25x30
116+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
117117
LayoutButton {INPUT} at (288,0) size 32x32
118118
layer at (264,750) size 32x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
119119
LayoutButton {INPUT} at (256,0) size 32x32

‎third_party/WebKit/LayoutTests/platform/linux/media/media-document-audio-repaint-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ layer at (8,44) size 384x334
3434
LayoutBlockFlow (anonymous) at (4,0) size 30x32
3535
LayoutText {#text} at (0,8) size 30x15
3636
text run at (0,8) width 30: "/ 0:01"
37-
LayoutSlider {INPUT} at (108,15) size 81x2
38-
LayoutFlexibleBox {DIV} at (0,0) size 81x2
37+
LayoutSlider {INPUT} at (108,2) size 81x28
38+
LayoutFlexibleBox {DIV} at (0,14) size 81x0
3939
LayoutButton {INPUT} at (207,0) size 32x32
40-
LayoutSlider {INPUT} at (257,15) size 25x2
41-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
40+
LayoutSlider {INPUT} at (257,2) size 25x28
41+
LayoutFlexibleBox {DIV} at (0,14) size 25x0
4242
layer at (130,150) size 117x0
43-
LayoutBlockFlow (relative positioned) {DIV} at (-18,1) size 117x0
43+
LayoutBlockFlow (relative positioned) {DIV} at (-18,0) size 117x0
4444
layer at (148,149) size 81x2
4545
LayoutBlockFlow (positioned) {DIV} at (18,-1) size 81x2 [bgcolor=#DADADA]
4646
layer at (279,150) size 61x0
47-
LayoutBlockFlow (relative positioned) {DIV} at (-18,1) size 61x0
47+
LayoutBlockFlow (relative positioned) {DIV} at (-18,0) size 61x0
4848
layer at (297,149) size 25x2
4949
LayoutBlockFlow (positioned) {DIV} at (18,-1) size 25x2 [bgcolor=#DADADA]
5050
layer at (188,149) size 40x2

‎third_party/WebKit/LayoutTests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ layer at (8,260) size 320x32 scrollHeight 40
2727
LayoutBlockFlow (anonymous) at (0,0) size 24x32
2828
LayoutText {#text} at (0,8) size 24x15
2929
text run at (0,8) width 24: "0:00"
30-
LayoutSlider {INPUT} at (74,15) size 71x2
31-
LayoutFlexibleBox {DIV} at (0,0) size 71x2
30+
LayoutSlider {INPUT} at (74,1) size 71x30
31+
LayoutFlexibleBox {DIV} at (0,14) size 71x2
3232
LayoutButton {INPUT} at (163,0) size 32x32
33-
LayoutSlider {INPUT} at (213,15) size 25x2
34-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
33+
LayoutSlider {INPUT} at (213,1) size 25x30
34+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
3535
LayoutButton {INPUT} at (288,0) size 32x32
3636
layer at (264,260) size 32x32
3737
LayoutButton {INPUT} at (256,0) size 32x32
@@ -67,11 +67,11 @@ layer at (8,505) size 320x32 scrollHeight 40
6767
LayoutBlockFlow (anonymous) at (0,0) size 24x32
6868
LayoutText {#text} at (0,8) size 24x15
6969
text run at (0,8) width 24: "0:00"
70-
LayoutSlider {INPUT} at (74,15) size 71x2
71-
LayoutFlexibleBox {DIV} at (0,0) size 71x2
70+
LayoutSlider {INPUT} at (74,1) size 71x30
71+
LayoutFlexibleBox {DIV} at (0,14) size 71x2
7272
LayoutButton {INPUT} at (163,0) size 32x32
73-
LayoutSlider {INPUT} at (213,15) size 25x2
74-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
73+
LayoutSlider {INPUT} at (213,1) size 25x30
74+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
7575
LayoutButton {INPUT} at (288,0) size 32x32
7676
layer at (264,505) size 32x32
7777
LayoutButton {INPUT} at (256,0) size 32x32
@@ -109,11 +109,11 @@ layer at (8,750) size 320x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size
109109
LayoutBlockFlow (anonymous) at (0,0) size 24x32
110110
LayoutText {#text} at (0,8) size 24x15
111111
text run at (0,8) width 24: "0:00"
112-
LayoutSlider {INPUT} at (74,15) size 71x2
113-
LayoutFlexibleBox {DIV} at (0,0) size 71x2
112+
LayoutSlider {INPUT} at (74,1) size 71x30
113+
LayoutFlexibleBox {DIV} at (0,14) size 71x2
114114
LayoutButton {INPUT} at (163,0) size 32x32
115-
LayoutSlider {INPUT} at (213,15) size 25x2
116-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
115+
LayoutSlider {INPUT} at (213,1) size 25x30
116+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
117117
LayoutButton {INPUT} at (288,0) size 32x32
118118
layer at (264,750) size 32x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
119119
LayoutButton {INPUT} at (256,0) size 32x32

‎third_party/WebKit/LayoutTests/platform/mac/http/tests/media/video-buffered-range-contains-currentTime-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ layer at (8,126) size 300x32 scrollHeight 40
2222
LayoutBlockFlow (anonymous) at (4,0) size 30.69x32
2323
LayoutText {#text} at (0,9) size 31x14
2424
text run at (0,9) width 31: "/ 0:07"
25-
LayoutSlider {INPUT} at (108.05,15) size 48.95x2
26-
LayoutFlexibleBox {DIV} at (0,0) size 48.95x2
25+
LayoutSlider {INPUT} at (108.05,1) size 48.95x30
26+
LayoutFlexibleBox {DIV} at (0,14) size 48.95x2
2727
LayoutButton {INPUT} at (175,0) size 32x32
28-
LayoutSlider {INPUT} at (225,15) size 25x2
29-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
28+
LayoutSlider {INPUT} at (225,1) size 25x30
29+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
3030
LayoutButton {INPUT} at (268,0) size 32x32
3131
layer at (98,142) size 85x0
3232
LayoutBlockFlow (relative positioned) {DIV} at (-18,1) size 84.95x0

‎third_party/WebKit/LayoutTests/platform/mac/media/controls/controls-page-zoom-in-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ layer at (12,397) size 576x46 transparent scrollHeight 58
2222
LayoutBlockFlow (anonymous) at (5.75,0) size 44.19x46.08
2323
LayoutText {#text} at (0,13) size 45x20
2424
text run at (0,13) width 45: "/ 0:06"
25-
LayoutSlider {INPUT} at (155.56,21.59) size 168.03x2.88
26-
LayoutFlexibleBox {DIV} at (0,0) size 168.03x2.88
25+
LayoutSlider {INPUT} at (155.56,1.44) size 168.03x43.19
26+
LayoutFlexibleBox {DIV} at (0,20.16) size 168.03x2.88
2727
LayoutButton {INPUT} at (349.50,0) size 46.08x46.08
28-
LayoutSlider {INPUT} at (421.48,21.59) size 82.53x2.88
29-
LayoutFlexibleBox {DIV} at (0,0) size 82.53x2.88
28+
LayoutSlider {INPUT} at (421.48,1.44) size 82.53x43.19
29+
LayoutFlexibleBox {DIV} at (0,20.16) size 82.53x2.88
3030
layer at (541,397) size 46x46
3131
LayoutButton {INPUT} at (529.92,0) size 46.08x46.08
3232
layer at (141,420) size 220x0

‎third_party/WebKit/LayoutTests/platform/mac/media/controls/controls-page-zoom-out-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ layer at (6,192) size 278x22 backgroundClip at (6,192) size 277x22 clip at (6,19
2222
LayoutBlockFlow (anonymous) at (2.77,0) size 23.02x22.22
2323
LayoutText {#text} at (0,5) size 24x11
2424
text run at (0,5) width 24: "/ 0:06"
25-
LayoutSlider {INPUT} at (78.02,10.42) size 79.55x1.38
26-
LayoutFlexibleBox {DIV} at (0,0) size 79.55x1.38
25+
LayoutSlider {INPUT} at (78.02,0.70) size 79.55x20.81
26+
LayoutFlexibleBox {DIV} at (0,9.72) size 79.55x1.38
2727
LayoutButton {INPUT} at (170.06,0) size 22.22x22.22
28-
LayoutSlider {INPUT} at (204.78,10.42) size 38.27x1.38
29-
LayoutFlexibleBox {DIV} at (0,0) size 38.27x1.38
28+
LayoutSlider {INPUT} at (204.78,0.70) size 38.27x20.81
29+
LayoutFlexibleBox {DIV} at (0,9.72) size 38.27x1.38
3030
layer at (261,192) size 22x22
3131
LayoutButton {INPUT} at (255.55,0) size 22.22x22.22
3232
layer at (71,203) size 104x0

‎third_party/WebKit/LayoutTests/platform/mac/media/controls/lazy-loaded-style-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ layer at (8,276) size 400x32 scrollHeight 40
2222
LayoutBlockFlow (anonymous) at (4,0) size 30.69x32
2323
LayoutText {#text} at (0,9) size 31x14
2424
text run at (0,9) width 31: "/ 0:06"
25-
LayoutSlider {INPUT} at (108.05,15) size 116.67x2
26-
LayoutFlexibleBox {DIV} at (0,0) size 116.67x2
25+
LayoutSlider {INPUT} at (108.05,1) size 116.67x30
26+
LayoutFlexibleBox {DIV} at (0,14) size 116.67x2
2727
LayoutButton {INPUT} at (242.72,0) size 32x32
28-
LayoutSlider {INPUT} at (292.72,15) size 57.28x2
29-
LayoutFlexibleBox {DIV} at (0,0) size 57.28x2
28+
LayoutSlider {INPUT} at (292.72,1) size 57.28x30
29+
LayoutFlexibleBox {DIV} at (0,14) size 57.28x2
3030
layer at (376,276) size 32x32
3131
LayoutButton {INPUT} at (368,0) size 32x32
3232
layer at (98,292) size 153x0

‎third_party/WebKit/LayoutTests/platform/mac/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ layer at (8,303) size 400x32 scrollHeight 40
2222
LayoutBlockFlow (anonymous) at (4,0) size 30.69x32
2323
LayoutText {#text} at (0,9) size 31x14
2424
text run at (0,9) width 31: "/ 0:09"
25-
LayoutSlider {INPUT} at (108.05,15) size 241.95x2
26-
LayoutFlexibleBox {DIV} at (0,0) size 241.95x2
25+
LayoutSlider {INPUT} at (108.05,1) size 241.95x30
26+
LayoutFlexibleBox {DIV} at (0,14) size 241.95x2
2727
layer at (376,303) size 32x32
2828
LayoutButton {INPUT} at (368,0) size 32x32
2929
layer at (98,319) size 278x0

‎third_party/WebKit/LayoutTests/platform/mac/media/controls/paint-controls-webkit-appearance-none-expected.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ layer at (8,303) size 400x32 scrollHeight 40
2222
LayoutBlockFlow (anonymous) at (4,0) size 30.69x32
2323
LayoutText {#text} at (0,9) size 31x14
2424
text run at (0,9) width 31: "/ 0:09"
25-
LayoutSlider {INPUT} at (108.05,15) size 241.95x2
26-
LayoutFlexibleBox {DIV} at (0,0) size 241.95x2
25+
LayoutSlider {INPUT} at (108.05,1) size 241.95x30
26+
LayoutFlexibleBox {DIV} at (0,14) size 241.95x2
2727
layer at (376,303) size 32x32
2828
LayoutButton {INPUT} at (368,0) size 32x32
2929
layer at (98,319) size 278x0

‎third_party/WebKit/LayoutTests/platform/mac/media/controls/video-controls-with-cast-rendering-expected.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ layer at (8,258) size 320x32 scrollHeight 40
2727
LayoutBlockFlow (anonymous) at (0,0) size 23.36x32
2828
LayoutText {#text} at (0,9) size 24x14
2929
text run at (0,9) width 24: "0:00"
30-
LayoutSlider {INPUT} at (73.36,15) size 71.64x2
31-
LayoutFlexibleBox {DIV} at (0,0) size 71.64x2
30+
LayoutSlider {INPUT} at (73.36,1) size 71.64x30
31+
LayoutFlexibleBox {DIV} at (0,14) size 71.64x2
3232
LayoutButton {INPUT} at (163,0) size 32x32
33-
LayoutSlider {INPUT} at (213,15) size 25x2
34-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
33+
LayoutSlider {INPUT} at (213,1) size 25x30
34+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
3535
LayoutButton {INPUT} at (288,0) size 32x32
3636
layer at (264,258) size 32x32
3737
LayoutButton {INPUT} at (256,0) size 32x32
@@ -67,11 +67,11 @@ layer at (8,502) size 320x32 scrollHeight 40
6767
LayoutBlockFlow (anonymous) at (0,0) size 23.36x32
6868
LayoutText {#text} at (0,9) size 24x14
6969
text run at (0,9) width 24: "0:00"
70-
LayoutSlider {INPUT} at (73.36,15) size 71.64x2
71-
LayoutFlexibleBox {DIV} at (0,0) size 71.64x2
70+
LayoutSlider {INPUT} at (73.36,1) size 71.64x30
71+
LayoutFlexibleBox {DIV} at (0,14) size 71.64x2
7272
LayoutButton {INPUT} at (163,0) size 32x32
73-
LayoutSlider {INPUT} at (213,15) size 25x2
74-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
73+
LayoutSlider {INPUT} at (213,1) size 25x30
74+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
7575
LayoutButton {INPUT} at (288,0) size 32x32
7676
layer at (264,502) size 32x32
7777
LayoutButton {INPUT} at (256,0) size 32x32
@@ -109,11 +109,11 @@ layer at (8,746) size 320x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size
109109
LayoutBlockFlow (anonymous) at (0,0) size 23.36x32
110110
LayoutText {#text} at (0,9) size 24x14
111111
text run at (0,9) width 24: "0:00"
112-
LayoutSlider {INPUT} at (73.36,15) size 71.64x2
113-
LayoutFlexibleBox {DIV} at (0,0) size 71.64x2
112+
LayoutSlider {INPUT} at (73.36,1) size 71.64x30
113+
LayoutFlexibleBox {DIV} at (0,14) size 71.64x2
114114
LayoutButton {INPUT} at (163,0) size 32x32
115-
LayoutSlider {INPUT} at (213,15) size 25x2
116-
LayoutFlexibleBox {DIV} at (0,0) size 25x2
115+
LayoutSlider {INPUT} at (213,1) size 25x30
116+
LayoutFlexibleBox {DIV} at (0,14) size 25x2
117117
LayoutButton {INPUT} at (288,0) size 32x32
118118
layer at (264,746) size 32x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
119119
LayoutButton {INPUT} at (256,0) size 32x32

0 commit comments

Comments
 (0)