Skip to content

GitLab

T
tangled
Commit 0f85a3bb authored by Robert Liao's avatar Robert Liao Committed by Commit Bot
Browse files
Options

Revert "Roll SwiftShader 88482c3..a5ac650" 

This reverts commit 7b4dab1e.

Reason for revert: Due to http://crbug.com/853209 we had a brief loss of coverage for webkit layout tests.

Now that they're back, 
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac10.13%20Tests%20%28dbg%29/3344
implicates this CL for these failures in webkit_layout_tests:
* fast/forms/calendar-picker/calendar-picker-appearance-required-ar.html
* fast/forms/calendar-picker/month-picker-appearance.html

Original change's description:
> Roll SwiftShader 88482c3..a5ac650
> 
> https://swiftshader.googlesource.com/SwiftShader.git/+log/88482c3..a5ac650
> 
> BUG=
> 
> TBR=kbr@chromium.org
> 
> TEST=bots
> 
> CQ_INCLUDE_TRYBOTS=luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng;luci.chromium.try:android_optional_gpu_tests_rel
> 
> Change-Id: Ic6c36ddf3c2f3d1e58bc3f592aa93515f3f295f9
> Reviewed-on: https://chromium-review.googlesource.com/1101401
> Commit-Queue: Alexis Hétu <sugoi@chromium.org>
> Reviewed-by: Alexis Hétu <sugoi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#567534}

TBR=sugoi@chromium.org,kbr@chromium.org

Change-Id: I55c0b02020ed1a6c2419c5978c34aa48f708e988
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng;luci.chromium.try:android_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/1102937Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567735}
parent c0268b6f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 101 deletions
DEPS
View file @ 0f85a3bb
...@@ -125,7 +125,7 @@ vars = { ...@@ -125,7 +125,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling SwiftShader # the commit queue can handle CLs rolling SwiftShader
# and whatever else without interference from each other. # and whatever else without interference from each other.
'swiftshader_revision': 'a5ac650d2031ef1ccdd4d35aa8fb57d1b55dbee9', 'swiftshader_revision': '88482c3ca96642733b3a4cc3566b7e2d1b5f8025',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFium # the commit queue can handle CLs rolling PDFium
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
third_party/WebKit/LayoutTests/platform/mac-mac10.12/fast/forms/text/input-table-expected.txt deleted 100644 → 0
View file @ c0268b6f
layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 677
LayoutView at (0,0) size 800x600
layer at (0,0) size 785x677 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600
LayoutBlockFlow {HTML} at (0,0) size 785x677
LayoutBlockFlow {BODY} at (8,8) size 769x661
LayoutBlockFlow (anonymous) at (0,0) size 769x18
LayoutText {#text} at (0,0) size 252x18
text run at (0,0) width 252: "This tests minMaxWidth for text fields."
LayoutBlockFlow {P} at (0,34) size 769x18
LayoutText {#text} at (0,0) size 70x18
text run at (0,0) width 70: "Test case 1"
LayoutTable {TABLE} at (0,68) size 118x37 [border: (3px solid #0000FF)]
LayoutTableSection {TBODY} at (3,3) size 112x31
LayoutTableRow {TR} at (0,2) size 112x27
LayoutTableCell {TD} at (2,2) size 108x27 [border: (3px solid #FF0000)] [r=0 c=0 rs=1 cs=1]
LayoutTextControl {INPUT} at (4,4) size 100x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutBlockFlow {P} at (0,121) size 769x18
LayoutText {#text} at (0,0) size 70x18
text run at (0,0) width 70: "Test case 2"
LayoutTable {TABLE} at (0,155) size 167x66 [border: (3px solid #0000FF)]
LayoutTableSection {TBODY} at (3,3) size 161x60
LayoutTableRow {TR} at (0,2) size 161x27
LayoutTableCell {TD} at (2,5) size 47x20 [r=0 c=0 rs=1 cs=1]
LayoutText {#text} at (1,1) size 25x18
text run at (1,1) width 25: "first"
LayoutTableCell {TD} at (51,2) size 108x27 [border: (3px solid #FF0000)] [r=0 c=1 rs=1 cs=1]
LayoutTextControl {INPUT} at (4,4) size 100x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutTableRow {TR} at (0,31) size 161x27
LayoutTableCell {TD} at (2,34) size 47x20 [r=1 c=0 rs=1 cs=1]
LayoutText {#text} at (1,1) size 45x18
text run at (1,1) width 45: "second"
LayoutTableCell {TD} at (51,31) size 108x27 [border: (3px solid #FF0000)] [r=1 c=1 rs=1 cs=1]
LayoutTextControl {INPUT} at (4,4) size 100x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutBlockFlow {P} at (0,237) size 769x18
LayoutText {#text} at (0,0) size 70x18
text run at (0,0) width 70: "Test case 3"
LayoutTable {TABLE} at (0,271) size 55x73 [border: (3px solid #0000FF)]
LayoutTableSection {TBODY} at (3,3) size 49x67
LayoutTableRow {TR} at (0,2) size 49x63
LayoutTableCell {TD} at (2,2) size 45x63 [border: (3px solid #FF0000)] [r=0 c=0 rs=1 cs=1]
LayoutText {#text} at (4,4) size 37x36
text run at (4,4) width 37: "width"
text run at (4,22) width 32: "30px"
LayoutTextControl {INPUT} at (4,40) size 30x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutBlockFlow {P} at (0,360) size 769x18
LayoutText {#text} at (0,0) size 70x18
text run at (0,0) width 70: "Test case 4"
LayoutTable {TABLE} at (0,394) size 218x65 [border: (3px solid #0000FF)]
LayoutTableSection {TBODY} at (3,3) size 212x59
LayoutTableRow {TR} at (0,2) size 212x27
LayoutTableCell {TD} at (2,2) size 208x27 [border: (3px solid #FF0000)] [r=0 c=0 rs=1 cs=1]
LayoutTextControl {INPUT} at (4,4) size 200x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutTableRow {TR} at (0,31) size 212x26
LayoutTableCell {TD} at (2,31) size 208x26 [border: (3px solid #FF0000)] [r=1 c=0 rs=1 cs=1]
LayoutBlockFlow {DIV} at (4,4) size 200x18
LayoutText {#text} at (0,0) size 40x18
text run at (0,0) width 40: "200px"
LayoutBlockFlow {P} at (0,475) size 769x18
LayoutText {#text} at (0,0) size 70x18
text run at (0,0) width 70: "Test case 5"
LayoutTable {TABLE} at (0,509) size 88x37 [border: (3px solid #0000FF)]
LayoutTableSection {TBODY} at (3,3) size 82x31
LayoutTableRow {TR} at (0,2) size 82x27
LayoutTableCell {TD} at (2,2) size 78x27 [border: (3px solid #FF0000)] [r=0 c=0 rs=1 cs=1]
LayoutTextControl {INPUT} at (4,4) size 70x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutBlockFlow {P} at (0,562) size 769x18
LayoutText {#text} at (0,0) size 70x18
text run at (0,0) width 70: "Test case 6"
LayoutTable {TABLE} at (0,596) size 149x65 [border: (3px solid #0000FF)]
LayoutTableSection {TBODY} at (3,3) size 143x59
LayoutTableRow {TR} at (0,2) size 143x27
LayoutTableCell {TD} at (2,2) size 139x27 [border: (3px solid #FF0000)] [r=0 c=0 rs=1 cs=1]
LayoutTextControl {INPUT} at (4,4) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
LayoutTableRow {TR} at (0,31) size 143x26
LayoutTableCell {TD} at (2,31) size 139x26 [border: (3px solid #FF0000)] [r=1 c=0 rs=1 cs=1]
LayoutBlockFlow {DIV} at (4,4) size 70x18
LayoutText {#text} at (0,0) size 32x18
text run at (0,0) width 32: "70px"
layer at (20,88) size 94x13
LayoutBlockFlow {DIV} at (3,3) size 94x13
layer at (69,175) size 94x13
LayoutBlockFlow {DIV} at (3,3) size 94x13
layer at (69,204) size 94x13
LayoutBlockFlow {DIV} at (3,3) size 94x13
layer at (20,327) size 24x13
LayoutBlockFlow {DIV} at (3,3) size 24x13
layer at (20,414) size 194x13
LayoutBlockFlow {DIV} at (3,3) size 194x13
LayoutText {#text} at (0,0) size 60x13
text run at (0,0) width 60: "width 100%"
layer at (20,529) size 64x13
LayoutBlockFlow {DIV} at (3,3) size 64x13
LayoutText {#text} at (0,0) size 51x13
text run at (0,0) width 51: "max 70px"
layer at (20,616) size 125x13 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
LayoutBlockFlow {DIV} at (3,3) size 125x13
LayoutText {#text} at (0,0) size 88x13
text run at (0,0) width 88: "min-width 100px"
third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-table-expected.txt
View file @ 0f85a3bb
...@@ -86,8 +86,8 @@ layer at (20,327) size 24x13 ...@@ -86,8 +86,8 @@ layer at (20,327) size 24x13
LayoutBlockFlow {DIV} at (3,3) size 24x13 LayoutBlockFlow {DIV} at (3,3) size 24x13
layer at (20,414) size 194x13 layer at (20,414) size 194x13
LayoutBlockFlow {DIV} at (3,3) size 194x13 LayoutBlockFlow {DIV} at (3,3) size 194x13
LayoutText {#text} at (0,0) size 61x13 LayoutText {#text} at (0,0) size 60x13
text run at (0,0) width 61: "width 100%" text run at (0,0) width 60: "width 100%"
layer at (20,529) size 64x13 layer at (20,529) size 64x13
LayoutBlockFlow {DIV} at (3,3) size 64x13 LayoutBlockFlow {DIV} at (3,3) size 64x13
LayoutText {#text} at (0,0) size 51x13 LayoutText {#text} at (0,0) size 51x13
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment