207622 2020-02-12 03:42:05 -0800 MediaSource.isTypeSupported() says "video/mp4;codecs=\"avc3.42C015\"" is not supported, but it is 2020-02-18 14:52:45 -0800 1 1 1 Unclassified WebKit Media Safari Technology Preview Mac macOS 10.15 RESOLVED FIXED InRadar P2 Normal --- 1 robert.bryer peng.liu6 commit-queue darin eric.carlson ews-watchlist glenn jacob_uphoff jer.noble jonlee massimiliano.mura peng.liu6 philipj robert.bryer sergio webkit-bug-importer oldest_to_newest 1617925 0 robert.bryer 2020-02-12 03:42:05 -0800 The current Safari Technology Preview (Release 100 (Safari 13.2, WebKit 14610.1.2.1)) rejects the AVC3 codec string "video/mp4;codecs=\"avc3.42C015\"" with MediaSource.isTypeSupported(). In my current production version of Safari (13.0.3) it's accepted. It looks like this only affects AVC3 because changing it to AVC1 returns true, like "video/mp4;codecs=\"avc1.42C015\"". And it does still play AVC3; if I ignore the codec error, it plays these videos fine without issue. 1618571 1 webkit-bug-importer 2020-02-13 10:16:24 -0800 <rdar://problem/59427591> 1618594 2 ap 2020-02-13 10:56:30 -0800 I can reproduce this on macOS Mojave with STP 99. I cannot reproduce with shipping Safari/WebKit, so this looks like a regression. I cannot reproduce on macOS Catalina. MediaSource.isTypeSupported("video/mp4;codecs=\"avc3.42C015\"") 1619503 3 390889 peng.liu6 2020-02-16 11:39:46 -0800 Created attachment 390889 Patch 1619507 4 390889 darin 2020-02-16 12:29:16 -0800 Comment on attachment 390889 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390889&action=review > Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:35 > #import "ContentType.h" > +#import <pal/spi/mac/AVFoundationSPI.h> > + > #import <pal/cf/CoreMediaSoftLink.h> > #import <pal/cocoa/AVFoundationSoftLink.h> These should be sorted in a single block. > Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:71 > + outputCodecs = [PAL::getAVStreamDataParserClass() outputMIMECodecParameterForInputMIMECodecParameter:outputCodecs]; This needs to be indented. 1619633 5 390889 eric.carlson 2020-02-17 06:02:37 -0800 Comment on attachment 390889 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390889&action=review >> Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:71 >> + if ([PAL::getAVStreamDataParserClass() respondsToSelector:@selector(outputMIMECodecParameterForInputMIMECodecParameter:)]) >> + outputCodecs = [PAL::getAVStreamDataParserClass() outputMIMECodecParameterForInputMIMECodecParameter:outputCodecs]; > > This needs to be indented. We don't want to change the behavior of video.canPlayType, so I would put this into MediaPlayerPrivateMediaSourceAVFObjC::supportsType. 1619776 6 390889 peng.liu6 2020-02-17 12:06:28 -0800 Comment on attachment 390889 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390889&action=review >> Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:35 >> #import <pal/cocoa/AVFoundationSoftLink.h> > > These should be sorted in a single block. Soft-link headers need to be included after other headers. The style checking errors will go away after we land the patch for http://webkit.org/b/207834. >>> Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:71 >>> + outputCodecs = [PAL::getAVStreamDataParserClass() outputMIMECodecParameterForInputMIMECodecParameter:outputCodecs]; >> >> This needs to be indented. > > We don't want to change the behavior of video.canPlayType, so I would put this into MediaPlayerPrivateMediaSourceAVFObjC::supportsType. I see. Do we need to remove the similar code section in AVStreamDataParserMIMETypeCache::canDecodeExtendedType() after we add it into MediaPlayerPrivateMediaSourceAVFObjC::supportsType()? I suppose yes. 1619894 7 390982 peng.liu6 2020-02-17 14:40:56 -0800 Created attachment 390982 Patch 1620032 8 390982 commit-queue 2020-02-17 18:31:45 -0800 Comment on attachment 390982 Patch Clearing flags on attachment: 390982 Committed r256804: <https://trac.webkit.org/changeset/256804> 1620033 9 commit-queue 2020-02-17 18:31:47 -0800 All reviewed patches have been landed. Closing bug. 1620135 10 jacob_uphoff 2020-02-18 07:52:34 -0800 Looks like the changes in https://trac.webkit.org/changeset/256804/webkit caused 50+ crashes on macOS debug. Results: https://build.webkit.org/results/Apple-Catalina-Debug-WK2-Tests/r256824%20(2379)/results.html Build: https://build.webkit.org/builders/Apple-Catalina-Debug-WK1-Tests/builds/2532 ASSERTION FAILED: !outputCodecs.isEmpty() This is found in the changes that were made in the revision. 1620136 11 jacob_uphoff 2020-02-18 07:55:44 -0800 Reverted r256804 for reason: This broke 50+ media tests on mac debug Committed r256828: <https://trac.webkit.org/changeset/256828> 1620240 12 391071 peng.liu6 2020-02-18 11:15:34 -0800 Created attachment 391071 Fix layout test failures on the Mac debug build 1620343 13 commit-queue 2020-02-18 14:52:07 -0800 The commit-queue encountered the following flaky tests while processing attachment 391071: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1620344 14 391071 commit-queue 2020-02-18 14:52:43 -0800 Comment on attachment 391071 Fix layout test failures on the Mac debug build Clearing flags on attachment: 391071 Committed r256856: <https://trac.webkit.org/changeset/256856> 1620345 15 commit-queue 2020-02-18 14:52:45 -0800 All reviewed patches have been landed. Closing bug. 390889 2020-02-16 11:39:46 -0800 2020-02-17 14:40:54 -0800 Patch bug-207622-20200216113945.patch text/plain 2400 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA3ZDVjMDg3NTUyMmNm ZGU0MjQwZTU1YTcwZTQ3ZGVmNjE0YTNhNy4uMDM4OGUyOWIxMjQ5ZGM0NmVhZDRkZTViYThlMzA0 ODUyYTM2OWQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTAyLTE2ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWFTb3VyY2UuaXNUeXBl U3VwcG9ydGVkKCkgc2F5cyAidmlkZW8vbXA0O2NvZGVjcz1cImF2YzMuNDJDMDE1XCIiIGlzIG5v dCBzdXBwb3J0ZWQsIGJ1dCBpdCBpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA3NjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXBkYXRlIEFWQXNzZXRNSU1FVHlwZUNhY2hlOjpjYW5EZWNvZGVFeHRl bmRlZFR5cGUoKSB0byBhbGlnbiB3aXRoIHRoZSBiZWhhdmlvciBvZiBBVlN0cmVhbURhdGFQYXJz ZXJNSU1FVHlwZUNhY2hlOjpjYW5EZWNvZGVFeHRlbmRlZFR5cGUoKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0FWQXNzZXRNSU1FVHlwZUNhY2hlLm1t OgorICAgICAgICAoV2ViQ29yZTo6QVZBc3NldE1JTUVUeXBlQ2FjaGU6OmNhbkRlY29kZUV4dGVu ZGVkVHlwZSk6CisKIDIwMjAtMDItMTUgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpA aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBCdWlsZCBmYWlsdXJlIHdpdGggQ2xh bmcvbGliYysrIGR1ZSB0byBtaXNzaW5nIFdhbGxUaW1l4oaSZmxvYXQgZm9yIHN0ZDo6aXNuYW4o KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvQVZBc3NldE1JTUVUeXBlQ2FjaGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9BVkFzc2V0TUlNRVR5cGVDYWNoZS5tbQppbmRl eCA3YzM4YjBiODQzNGNmNTVjOTU5NDkwOTU5NWQ2YzY1ZGIyZjdmZDA5Li42ZTUyMWIyNGVhMWEz M2NiNGJjOTY3NjJjMmU5Nzc3MzBmOThjMDE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9BVkFzc2V0TUlNRVR5cGVDYWNoZS5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9BVkFzc2V0TUlNRVR5cGVDYWNoZS5tbQpAQCAtMjksNiArMjksOCBAQAogI2lmIFBMQVRGT1JN KENPQ09BKQogCiAjaW1wb3J0ICJDb250ZW50VHlwZS5oIgorI2ltcG9ydCA8cGFsL3NwaS9tYWMv QVZGb3VuZGF0aW9uU1BJLmg+CisKICNpbXBvcnQgPHBhbC9jZi9Db3JlTWVkaWFTb2Z0TGluay5o PgogI2ltcG9ydCA8cGFsL2NvY29hL0FWRm91bmRhdGlvblNvZnRMaW5rLmg+CiAKQEAgLTYzLDcg KzY1LDEzIEBAIGJvb2wgQVZBc3NldE1JTUVUeXBlQ2FjaGU6OmNhbkRlY29kZUV4dGVuZGVkVHlw ZShjb25zdCBDb250ZW50VHlwZSYgdHlwZSkKIHsKICNpZiBFTkFCTEUoVklERU8pICYmIFVTRShB VkZPVU5EQVRJT04pCiAgICAgQVNTRVJUKGlzQXZhaWxhYmxlKCkpOwotICAgIHJldHVybiBbUEFM OjpnZXRBVlVSTEFzc2V0Q2xhc3MoKSBpc1BsYXlhYmxlRXh0ZW5kZWRNSU1FVHlwZTp0eXBlLnJh dygpXTsKKyAgICBTdHJpbmcgb3V0cHV0Q29kZWNzID0gdHlwZS5wYXJhbWV0ZXIoQ29udGVudFR5 cGU6OmNvZGVjc1BhcmFtZXRlcigpKTsKKyAgICBBU1NFUlQoIW91dHB1dENvZGVjcy5pc0VtcHR5 KCkpOworICAgIGlmIChbUEFMOjpnZXRBVlN0cmVhbURhdGFQYXJzZXJDbGFzcygpIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3Iob3V0cHV0TUlNRUNvZGVjUGFyYW1ldGVyRm9ySW5wdXRNSU1F Q29kZWNQYXJhbWV0ZXI6KV0pCisgICAgb3V0cHV0Q29kZWNzID0gW1BBTDo6Z2V0QVZTdHJlYW1E YXRhUGFyc2VyQ2xhc3MoKSBvdXRwdXRNSU1FQ29kZWNQYXJhbWV0ZXJGb3JJbnB1dE1JTUVDb2Rl Y1BhcmFtZXRlcjpvdXRwdXRDb2RlY3NdOworCisgICAgU3RyaW5nIGV4dGVuZGVkVHlwZSA9IG1h a2VTdHJpbmcodHlwZS5jb250YWluZXJUeXBlKCksICI7IGNvZGVjcz1cIiIsIG91dHB1dENvZGVj cywgIlwiIik7CisgICAgcmV0dXJuIFtQQUw6OmdldEFWVVJMQXNzZXRDbGFzcygpIGlzUGxheWFi bGVFeHRlbmRlZE1JTUVUeXBlOmV4dGVuZGVkVHlwZV07CiAjZW5kaWYKIAogICAgIHJldHVybiBm YWxzZTsK 390982 2020-02-17 14:40:56 -0800 2020-02-18 11:15:34 -0800 Patch bug-207622-20200217144055.patch text/plain 4381 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA3ZDVjMDg3NTUyMmNm ZGU0MjQwZTU1YTcwZTQ3ZGVmNjE0YTNhNy4uY2QzYjdhMWUyNGQ3MmZjNWUzNDUxMDkxMmU4MjE4 N2ZlNGE0Njg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTAyLTE2ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWFTb3VyY2UuaXNUeXBl U3VwcG9ydGVkKCkgc2F5cyAidmlkZW8vbXA0O2NvZGVjcz1cImF2YzMuNDJDMDE1XCIiIGlzIG5v dCBzdXBwb3J0ZWQsIGJ1dCBpdCBpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA3NjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmV2ZXJ0IHRoZSBiZWhhdmlvciBjaGFuZ2Ugb2YgTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzdXBwb3J0c1R5cGUoKSBpbiByMjUzOTUyLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZBc3NldE1JTUVU eXBlQ2FjaGUubW06CisgICAgICAgIChXZWJDb3JlOjpBVkFzc2V0TUlNRVR5cGVDYWNoZTo6Y2Fu RGVjb2RlRXh0ZW5kZWRUeXBlKToKKwogMjAyMC0wMi0xNSAgQWRyaWFuIFBlcmV6IGRlIENhc3Ry byAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIEJ1aWxkIGZhaWx1 cmUgd2l0aCBDbGFuZy9saWJjKysgZHVlIHRvIG1pc3NpbmcgV2FsbFRpbWXihpJmbG9hdCBmb3Ig c3RkOjppc25hbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9BVlN0cmVhbURhdGFQYXJzZXJNSU1FVHlwZUNhY2hlLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZTdHJl YW1EYXRhUGFyc2VyTUlNRVR5cGVDYWNoZS5tbQppbmRleCA0OTM0ZDc2ODQwYTVlN2I5NzVlOTJi NmQ1MjE2ZTNiNjExZTQ1MDhkLi4zMmI2MDk1NDcxZDQ1ZjI0NWNhYjE0MjUzYWU4MThmMDNjMTRl MWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9BVlN0cmVhbURhdGFQYXJzZXJNSU1FVHlwZUNhY2hlLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0FWU3RyZWFtRGF0 YVBhcnNlck1JTUVUeXBlQ2FjaGUubW0KQEAgLTU5LDE0ICs1OSw4IEBAIGJvb2wgQVZTdHJlYW1E YXRhUGFyc2VyTUlNRVR5cGVDYWNoZTo6Y2FuRGVjb2RlRXh0ZW5kZWRUeXBlKGNvbnN0IENvbnRl bnRUeXBlJiB0CiAjaWYgRU5BQkxFKFZJREVPKSAmJiBVU0UoQVZGT1VOREFUSU9OKQogICAgIEFT U0VSVChpc0F2YWlsYWJsZSgpKTsKIAotICAgIFN0cmluZyBvdXRwdXRDb2RlY3MgPSB0eXBlLnBh cmFtZXRlcihDb250ZW50VHlwZTo6Y29kZWNzUGFyYW1ldGVyKCkpOwotICAgIEFTU0VSVCghb3V0 cHV0Q29kZWNzLmlzRW1wdHkoKSk7Ci0gICAgaWYgKFtQQUw6OmdldEFWU3RyZWFtRGF0YVBhcnNl ckNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihvdXRwdXRNSU1FQ29kZWNQYXJh bWV0ZXJGb3JJbnB1dE1JTUVDb2RlY1BhcmFtZXRlcjopXSkKLSAgICAgICAgb3V0cHV0Q29kZWNz ID0gW1BBTDo6Z2V0QVZTdHJlYW1EYXRhUGFyc2VyQ2xhc3MoKSBvdXRwdXRNSU1FQ29kZWNQYXJh bWV0ZXJGb3JJbnB1dE1JTUVDb2RlY1BhcmFtZXRlcjpvdXRwdXRDb2RlY3NdOwotCi0gICAgU3Ry aW5nIGV4dGVuZGVkVHlwZSA9IG1ha2VTdHJpbmcodHlwZS5jb250YWluZXJUeXBlKCksICI7IGNv ZGVjcz1cIiIsIG91dHB1dENvZGVjcywgIlwiIik7CiAgICAgaWYgKFtQQUw6OmdldEFWU3RyZWFt RGF0YVBhcnNlckNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihjYW5QYXJzZUV4 dGVuZGVkTUlNRVR5cGU6KV0pCi0gICAgICAgIHJldHVybiBbUEFMOjpnZXRBVlN0cmVhbURhdGFQ YXJzZXJDbGFzcygpIGNhblBhcnNlRXh0ZW5kZWRNSU1FVHlwZTpleHRlbmRlZFR5cGVdOworICAg ICAgICByZXR1cm4gW1BBTDo6Z2V0QVZTdHJlYW1EYXRhUGFyc2VyQ2xhc3MoKSBjYW5QYXJzZUV4 dGVuZGVkTUlNRVR5cGU6dHlwZS5yYXcoKV07CiAKICAgICAvLyBGSVhNRShyZGFyOi8vNTA1MDI3 NzEpIEFWU3RyZWFtRGF0YVBhcnNlciBkb2VzIG5vdCBoYXZlIGFuIC1jYW5QYXJzZUV4dGVuZGVk TUlNRVR5cGU6IG1ldGhvZCBvbiB0aGlzIHN5c3RlbSwKICAgICAvLyAgc28ganVzdCByZXBsYWNl IHRoZSBjb250YWluZXIgdHlwZSB3aXRoIGEgdmFsaWQgb25lIGZyb20gQVZBc3NldE1JTUVUeXBl Q2FjaGUgYW5kIGFzayB0aGF0IGNhY2hlIGlmIGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVN ZWRpYVNvdXJjZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0K aW5kZXggOTI3M2M5ZWIxYTRiMjgwZDkxYTRhODY5YjA2N2EwNGM5ZTBjZWRiNS4uZDg0OTliYjRk NGI2ZTQ3YmMzYWI3NDA2OGFhY2I0NTY0Mjg2Y2UzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTb3VyY2VBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2Jq Qy5tbQpAQCAtMjUzLDE0ICsyNTMsMjAgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRp YVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnN1cHBvcnRzVHlwZShjb24KICAgICBp ZiAoIXBhcmFtZXRlcnMuaXNNZWRpYVNvdXJjZSkKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVy OjpTdXBwb3J0c1R5cGU6OklzTm90U3VwcG9ydGVkOwogCisgICAgU3RyaW5nIG91dHB1dENvZGVj cyA9IHBhcmFtZXRlcnMudHlwZS5wYXJhbWV0ZXIoQ29udGVudFR5cGU6OmNvZGVjc1BhcmFtZXRl cigpKTsKKyAgICBBU1NFUlQoIW91dHB1dENvZGVjcy5pc0VtcHR5KCkpOworICAgIGlmIChbUEFM OjpnZXRBVlN0cmVhbURhdGFQYXJzZXJDbGFzcygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3Iob3V0cHV0TUlNRUNvZGVjUGFyYW1ldGVyRm9ySW5wdXRNSU1FQ29kZWNQYXJhbWV0ZXI6KV0p CisgICAgICAgIG91dHB1dENvZGVjcyA9IFtQQUw6OmdldEFWU3RyZWFtRGF0YVBhcnNlckNsYXNz KCkgb3V0cHV0TUlNRUNvZGVjUGFyYW1ldGVyRm9ySW5wdXRNSU1FQ29kZWNQYXJhbWV0ZXI6b3V0 cHV0Q29kZWNzXTsKKworICAgIFN0cmluZyBleHRlbmRlZFR5cGUgPSBtYWtlU3RyaW5nKHBhcmFt ZXRlcnMudHlwZS5jb250YWluZXJUeXBlKCksICI7IGNvZGVjcz1cIiIsIG91dHB1dENvZGVjcywg IlwiIik7CiAgICAgYXV0byBzdXBwb3J0ZWQgPSBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlOjpJ c05vdFN1cHBvcnRlZDsKICAgICBhdXRvJiBzdHJlYW1EYXRhUGFyc2VyQ2FjaGUgPSBBVlN0cmVh bURhdGFQYXJzZXJNSU1FVHlwZUNhY2hlOjpzaW5nbGV0b24oKTsKICAgICBpZiAoc3RyZWFtRGF0 YVBhcnNlckNhY2hlLmlzQXZhaWxhYmxlKCkpCi0gICAgICAgIHN1cHBvcnRlZCA9IHN0cmVhbURh dGFQYXJzZXJDYWNoZS5jYW5EZWNvZGVUeXBlKHBhcmFtZXRlcnMudHlwZS5yYXcoKSk7CisgICAg ICAgIHN1cHBvcnRlZCA9IHN0cmVhbURhdGFQYXJzZXJDYWNoZS5jYW5EZWNvZGVUeXBlKGV4dGVu ZGVkVHlwZSk7CiAgICAgZWxzZSB7CiAgICAgICAgIGF1dG8mIGFzc2V0Q2FjaGUgPSBBVkFzc2V0 TUlNRVR5cGVDYWNoZTo6c2luZ2xldG9uKCk7CiAgICAgICAgIGlmIChhc3NldENhY2hlLmlzQXZh aWxhYmxlKCkpCi0gICAgICAgICAgICBzdXBwb3J0ZWQgPSBhc3NldENhY2hlLmNhbkRlY29kZVR5 cGUocGFyYW1ldGVycy50eXBlLnJhdygpKTsKKyAgICAgICAgICAgIHN1cHBvcnRlZCA9IGFzc2V0 Q2FjaGUuY2FuRGVjb2RlVHlwZShleHRlbmRlZFR5cGUpOwogICAgIH0KIAogICAgIGlmIChzdXBw b3J0ZWQgIT0gTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZTo6SXNTdXBwb3J0ZWQpCg== 391071 2020-02-18 11:15:34 -0800 2020-02-18 14:52:43 -0800 Fix layout test failures on the Mac debug build 207622_revised.patch text/plain 4224 peng.liu6 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMDdkNWMwODc1NS4uY2QzYjdhMWUyNGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0wMi0xNiAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgor CisgICAgICAgIE1lZGlhU291cmNlLmlzVHlwZVN1cHBvcnRlZCgpIHNheXMgInZpZGVvL21wNDtj b2RlY3M9XCJhdmMzLjQyQzAxNVwiIiBpcyBub3Qgc3VwcG9ydGVkLCBidXQgaXQgaXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzYyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldmVydCB0aGUgYmVo YXZpb3IgY2hhbmdlIG9mIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6c3Vw cG9ydHNUeXBlKCkgaW4gcjI1Mzk1Mi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL0FWQXNzZXRNSU1FVHlwZUNhY2hlLm1tOgorICAgICAgICAoV2ViQ29y ZTo6QVZBc3NldE1JTUVUeXBlQ2FjaGU6OmNhbkRlY29kZUV4dGVuZGVkVHlwZSk6CisKIDIwMjAt MDItMTUgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1N0cmVhbWVyXSBCdWlsZCBmYWlsdXJlIHdpdGggQ2xhbmcvbGliYysrIGR1ZSB0byBt aXNzaW5nIFdhbGxUaW1l4oaSZmxvYXQgZm9yIHN0ZDo6aXNuYW4oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZTdHJlYW1E YXRhUGFyc2VyTUlNRVR5cGVDYWNoZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL0FWU3RyZWFtRGF0YVBhcnNlck1JTUVUeXBlQ2FjaGUubW0K aW5kZXggNDkzNGQ3Njg0MGEuLjMyYjYwOTU0NzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9BVlN0cmVhbURhdGFQYXJzZXJN SU1FVHlwZUNhY2hlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL0FWU3RyZWFtRGF0YVBhcnNlck1JTUVUeXBlQ2FjaGUubW0KQEAgLTU5 LDE0ICs1OSw4IEBAIGJvb2wgQVZTdHJlYW1EYXRhUGFyc2VyTUlNRVR5cGVDYWNoZTo6Y2FuRGVj b2RlRXh0ZW5kZWRUeXBlKGNvbnN0IENvbnRlbnRUeXBlJiB0CiAjaWYgRU5BQkxFKFZJREVPKSAm JiBVU0UoQVZGT1VOREFUSU9OKQogICAgIEFTU0VSVChpc0F2YWlsYWJsZSgpKTsKIAotICAgIFN0 cmluZyBvdXRwdXRDb2RlY3MgPSB0eXBlLnBhcmFtZXRlcihDb250ZW50VHlwZTo6Y29kZWNzUGFy YW1ldGVyKCkpOwotICAgIEFTU0VSVCghb3V0cHV0Q29kZWNzLmlzRW1wdHkoKSk7Ci0gICAgaWYg KFtQQUw6OmdldEFWU3RyZWFtRGF0YVBhcnNlckNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3RvcihvdXRwdXRNSU1FQ29kZWNQYXJhbWV0ZXJGb3JJbnB1dE1JTUVDb2RlY1BhcmFtZXRl cjopXSkKLSAgICAgICAgb3V0cHV0Q29kZWNzID0gW1BBTDo6Z2V0QVZTdHJlYW1EYXRhUGFyc2Vy Q2xhc3MoKSBvdXRwdXRNSU1FQ29kZWNQYXJhbWV0ZXJGb3JJbnB1dE1JTUVDb2RlY1BhcmFtZXRl cjpvdXRwdXRDb2RlY3NdOwotCi0gICAgU3RyaW5nIGV4dGVuZGVkVHlwZSA9IG1ha2VTdHJpbmco dHlwZS5jb250YWluZXJUeXBlKCksICI7IGNvZGVjcz1cIiIsIG91dHB1dENvZGVjcywgIlwiIik7 CiAgICAgaWYgKFtQQUw6OmdldEFWU3RyZWFtRGF0YVBhcnNlckNsYXNzKCkgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3RvcihjYW5QYXJzZUV4dGVuZGVkTUlNRVR5cGU6KV0pCi0gICAgICAgIHJl dHVybiBbUEFMOjpnZXRBVlN0cmVhbURhdGFQYXJzZXJDbGFzcygpIGNhblBhcnNlRXh0ZW5kZWRN SU1FVHlwZTpleHRlbmRlZFR5cGVdOworICAgICAgICByZXR1cm4gW1BBTDo6Z2V0QVZTdHJlYW1E YXRhUGFyc2VyQ2xhc3MoKSBjYW5QYXJzZUV4dGVuZGVkTUlNRVR5cGU6dHlwZS5yYXcoKV07CiAK ICAgICAvLyBGSVhNRShyZGFyOi8vNTA1MDI3NzEpIEFWU3RyZWFtRGF0YVBhcnNlciBkb2VzIG5v dCBoYXZlIGFuIC1jYW5QYXJzZUV4dGVuZGVkTUlNRVR5cGU6IG1ldGhvZCBvbiB0aGlzIHN5c3Rl bSwKICAgICAvLyAgc28ganVzdCByZXBsYWNlIHRoZSBjb250YWluZXIgdHlwZSB3aXRoIGEgdmFs aWQgb25lIGZyb20gQVZBc3NldE1JTUVUeXBlQ2FjaGUgYW5kIGFzayB0aGF0IGNhY2hlIGlmIGl0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggOTI3M2M5ZWIxYTQuLmIxYjkwOWZiZTZi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCkBAIC0yNTMsMTQgKzI1MywyMSBAQCBNZWRp YVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2Jq Qzo6c3VwcG9ydHNUeXBlKGNvbgogICAgIGlmICghcGFyYW1ldGVycy5pc01lZGlhU291cmNlKQog ICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZTo6SXNOb3RTdXBwb3J0ZWQ7 CiAKKyAgICBTdHJpbmcgZXh0ZW5kZWRUeXBlID0gcGFyYW1ldGVycy50eXBlLnJhdygpOworICAg IFN0cmluZyBvdXRwdXRDb2RlY3MgPSBwYXJhbWV0ZXJzLnR5cGUucGFyYW1ldGVyKENvbnRlbnRU eXBlOjpjb2RlY3NQYXJhbWV0ZXIoKSk7CisgICAgaWYgKCFvdXRwdXRDb2RlY3MuaXNFbXB0eSgp ICYmIFtQQUw6OmdldEFWU3RyZWFtRGF0YVBhcnNlckNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3RvcihvdXRwdXRNSU1FQ29kZWNQYXJhbWV0ZXJGb3JJbnB1dE1JTUVDb2RlY1BhcmFt ZXRlcjopXSkgeworICAgICAgICBvdXRwdXRDb2RlY3MgPSBbUEFMOjpnZXRBVlN0cmVhbURhdGFQ YXJzZXJDbGFzcygpIG91dHB1dE1JTUVDb2RlY1BhcmFtZXRlckZvcklucHV0TUlNRUNvZGVjUGFy YW1ldGVyOm91dHB1dENvZGVjc107CisgICAgICAgIGV4dGVuZGVkVHlwZSA9IG1ha2VTdHJpbmco cGFyYW1ldGVycy50eXBlLmNvbnRhaW5lclR5cGUoKSwgIjsgY29kZWNzPVwiIiwgb3V0cHV0Q29k ZWNzLCAiXCIiKTsKKyAgICB9CisKICAgICBhdXRvIHN1cHBvcnRlZCA9IE1lZGlhUGxheWVyOjpT dXBwb3J0c1R5cGU6OklzTm90U3VwcG9ydGVkOwogICAgIGF1dG8mIHN0cmVhbURhdGFQYXJzZXJD YWNoZSA9IEFWU3RyZWFtRGF0YVBhcnNlck1JTUVUeXBlQ2FjaGU6OnNpbmdsZXRvbigpOwogICAg IGlmIChzdHJlYW1EYXRhUGFyc2VyQ2FjaGUuaXNBdmFpbGFibGUoKSkKLSAgICAgICAgc3VwcG9y dGVkID0gc3RyZWFtRGF0YVBhcnNlckNhY2hlLmNhbkRlY29kZVR5cGUocGFyYW1ldGVycy50eXBl LnJhdygpKTsKKyAgICAgICAgc3VwcG9ydGVkID0gc3RyZWFtRGF0YVBhcnNlckNhY2hlLmNhbkRl Y29kZVR5cGUoZXh0ZW5kZWRUeXBlKTsKICAgICBlbHNlIHsKICAgICAgICAgYXV0byYgYXNzZXRD YWNoZSA9IEFWQXNzZXRNSU1FVHlwZUNhY2hlOjpzaW5nbGV0b24oKTsKICAgICAgICAgaWYgKGFz c2V0Q2FjaGUuaXNBdmFpbGFibGUoKSkKLSAgICAgICAgICAgIHN1cHBvcnRlZCA9IGFzc2V0Q2Fj aGUuY2FuRGVjb2RlVHlwZShwYXJhbWV0ZXJzLnR5cGUucmF3KCkpOworICAgICAgICAgICAgc3Vw cG9ydGVkID0gYXNzZXRDYWNoZS5jYW5EZWNvZGVUeXBlKGV4dGVuZGVkVHlwZSk7CiAgICAgfQog CiAgICAgaWYgKHN1cHBvcnRlZCAhPSBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlOjpJc1N1cHBv cnRlZCkK