Commit a8a0d6fc authored by Chris Mumford's avatar Chris Mumford Committed by Commit Bot

Revert "Roll src/third_party/skia 32c7d4dfcdca..d19fed1e291d (2 commits)"

This reverts commit 562c52f7.

Reason for revert: cc_unittests failing on Linux TSan:

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20TSan%20Tests/24797

[ RUN      ] LayerTreeHostTilesTestPartialInvalidation.PartialRaster_SingleThread_OneCopy
[22487:22487:0814/143420.957209:26522082454:ERROR:pixel_comparator.cc(47)] Number of pixel with an error: 30000
[22487:22487:0814/143420.957442:26522082676:ERROR:pixel_comparator.cc(48)] Error Bounding Box : 0,0 200x200
[22487:22487:0814/143421.140401:26522265659:ERROR:pixel_test_utils.cc(79)] Pixels do not match!
[22487:22487:0814/143421.140586:26522265816:ERROR:pixel_test_utils.cc(80)] Actual: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAACHUlEQVR4nO3VMRHAMBADwXf4ozUBh0DmWqfYRaDmRmvvOQN8em4PgD8TCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQFgz+9weAX/lQSAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAILygpAZjjfRdXgAAAABJRU5ErkJggg==
[22487:22487:0814/143421.140737:26522266017:ERROR:pixel_test_utils.cc(81)] Expected: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAIAAAAiOjnJAAACNklEQVR4nO3dsQ0DMQwEQb3hWP3XqQrcgEMvnm/MVMBgwfSutc6CX3vdfQD/SVgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRF4n33Ad+ds+8+4TH2nriR62OREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGREBYJYZEQFglhkRAWCWGRuM7Eec6hq6EzzVyj9bFICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBICIuEsEgIi4SwSAiLhLBIDF1Y5el8LBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBLCIiEsEsIiISwSwiIhLBIfCVIMShDYZKEAAAAASUVORK5CYII=
../../cc/test/layer_tree_pixel_test.cc:129: Failure
Value of: MatchesPNGFile(*result_bitmap_, ref_file_path, *pixel_comparator_)
  Actual: false
Expected: true
Stack trace:
#0 0x000001ceb5ff (/b/s/w/ir/out/Release/cc_unittests+0x1ceb5fe)
#1 0x0000017ae1e9 (/b/s/w/ir/out/Release/cc_unittests+0x17ae1e8)
#2 0x0000017bda1f (/b/s/w/ir/out/Release/cc_unittests+0x17bda1e)
#3 0x0000017bd178 (/b/s/w/ir/out/Release/cc_unittests+0x17bd177)
#4 0x000001a362be (/b/s/w/ir/out/Release/cc_unittests+0x1a362bd)
#5 0x000001a3b5ba (/b/s/w/ir/out/Release/cc_unittests+0x1a3b5b9)

[  FAILED  ] LayerTreeHostTilesTestPartialInvalidation.PartialRaster_SingleThread_OneCopy (4296 ms)

Original change's description:
> Roll src/third_party/skia 32c7d4dfcdca..d19fed1e291d (2 commits)
> 
> https://skia.googlesource.com/skia.git/+log/32c7d4dfcdca..d19fed1e291d
> 
> 
> git log 32c7d4dfcdca..d19fed1e291d --date=short --no-merges --format='%ad %ae %s'
> 2018-08-14 fmalita@chromium.org [skottie] Eliminate some temp SkString allocations
> 2018-08-14 mtklein@google.com pass sprite opacity to color xform when blitting.
> 
> 
> Created with:
>   gclient setdep -r src/third_party/skia@d19fed1e291d
> 
> The AutoRoll server is located here: https://autoroll.skia.org
> 
> Documentation for the AutoRoller is here:
> https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
> 
> If the roll is causing failures, please contact the current sheriff, who should
> be CC'd on the roll, and stop the roller if necessary.
> 
> CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> TBR=kjlubick@chromium.org
> 
> Change-Id: Ib608389718b76c94782e3415bcc82dc607902e82
> Reviewed-on: https://chromium-review.googlesource.com/1174793
> Reviewed-by: skia-chromium-autoroll <skia-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
> Commit-Queue: skia-chromium-autoroll <skia-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/master@{#583019}

TBR=kjlubick@chromium.org,skia-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com

Change-Id: I0e6bc9c3c8c052a0ae17eb292cad8bb5e579faf2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/1174639Reviewed-by: default avatarChris Mumford <cmumford@chromium.org>
Commit-Queue: Chris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583063}
parent 9362448d
...@@ -105,7 +105,7 @@ vars = { ...@@ -105,7 +105,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 Skia # the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other. # and whatever else without interference from each other.
'skia_revision': 'd19fed1e291d8fbded9ec7425e9f1fa3861a72f8', 'skia_revision': '32c7d4dfcdca44040873d72e71068ec0874a76b1',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8 # the commit queue can handle CLs rolling V8
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
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