180614 2017-12-08 16:03:12 -0800 [WinCairo] Fix runtime error after r225229 2017-12-11 00:03:31 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke commit-queue don.olmstead ews-watchlist glenn jbedard lforschler pvollan webkit-bug-importer zan oldest_to_newest 1379860 0 basuke 2017-12-08 16:03:12 -0800 Version number listed on the map isn't match the list which WinCairo port provides. It is good idea to use same source. 1379861 1 328881 basuke 2017-12-08 16:11:00 -0800 Created attachment 328881 patch 1379944 2 328881 commit-queue 2017-12-08 21:40:05 -0800 Comment on attachment 328881 patch Clearing flags on attachment: 328881 Committed r225721: <https://trac.webkit.org/changeset/225721> 1379945 3 commit-queue 2017-12-08 21:40:06 -0800 All reviewed patches have been landed. Closing bug. 1379946 4 webkit-bug-importer 2017-12-08 21:41:29 -0800 <rdar://problem/35949708> 1380134 5 zan 2017-12-11 00:03:31 -0800 This had a fun effect on Linux platforms, due to WinCairoPort.VERSION_FALLBACK_ORDER being computed there, but no 'linux' entry in the PUBLIC_TABLE map in VersionNameMap. Fixed in r225738. https://trac.webkit.org/changeset/225738/webkit 328881 2017-12-08 16:11:00 -0800 2017-12-08 21:40:05 -0800 patch bug-180614.diff text/plain 5235 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwYzM4 YWI4N2IzYi4uMTBhMDAxZmE0OWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNy0xMi0wOCAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbkNhaXJvXSBGaXggcnVu dGltZSBlcnJvciBhZnRlciByMjI1MjI5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODA2MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGUgbGlzdCBvZiBmYWxsYmFjayB2ZXJzaW9ucyBkb2Vzbid0IG1h dGNoIHdpdGggdmVyc2lvbiBuYW1lIG1hcHBpbmcgaW50cm9kdWNlZCByZWNlbnRseS4KKyAgICAg ICAgSXQgc2hvdWxkIGJlIHNhZmUgYnkgY3JlYXRpbmcgdGhlIGxpc3QgYXV0b21hdGljYWxseSBm cm9tIHRoZSBuYW1lIG1hcCBmb3IgY29uc2lzdGVuY3kuCisgCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vdmVyc2lvbl9uYW1lX21hcC5weToKKyAgICAgICAgKFZlcnNpb25OYW1l TWFwLl9faW5pdF9fKToKKyAgICAgICAgKFZlcnNpb25OYW1lTWFwLnRvX25hbWUpOgorICAgICAg ICAoVmVyc2lvbk5hbWVNYXAuZnJvbV9uYW1lKToKKyAgICAgICAgKFZlcnNpb25OYW1lTWFwKToK KyAgICAgICAgKFZlcnNpb25OYW1lTWFwLm5hbWVzKToKKyAgICAgICAgKFZlcnNpb25OYW1lTWFw Lm1hcHBpbmdfZm9yX3BsYXRmb3JtKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQv d2luLnB5OgorICAgICAgICAoV2luQ2Fpcm9Qb3J0KToKKyAgICAgICAgKFdpbkNhaXJvUG9ydC5k ZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKToKKwogMjAxNy0xMi0wNSAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CiAKICAgICAgICAgU3dpdGNoIHdpbmRvd3MgYnVp bGQgdG8gVmlzdWFsIFN0dWRpbyAyMDE3CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi92ZXJzaW9uX25hbWVfbWFwLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vdmVyc2lvbl9uYW1lX21hcC5weQppbmRleCBlZjkzZDVhNzVjZC4uY2U3NTRjMTZiNTkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ZlcnNpb25fbmFtZV9t YXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vdmVyc2lvbl9uYW1lX21h cC5weQpAQCAtMjYsNiArMjYsOSBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBpbXBv cnQgbWVtb2l6ZWQKIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb24gaW1wb3J0IFZlcnNpb24K IAogCitQVUJMSUNfVEFCTEUgPSAncHVibGljJworCisKIGNsYXNzIFZlcnNpb25OYW1lTWFwKG9i amVjdCk6CiAKICAgICAjIEFsbG93cyBhcHBsZV9hZGRpdGlvbnMgdG8gZGVmaW5lIGEgY3VzdG9t IG1hcHBpbmcKQEAgLTQxLDcgKzQ0LDcgQEAgY2xhc3MgVmVyc2lvbk5hbWVNYXAob2JqZWN0KToK ICAgICAgICAgc2VsZi5tYXBwaW5nID0ge30KIAogICAgICAgICBzZWxmLmRlZmF1bHRfc3lzdGVt X3BsYXRmb3JtID0gcGxhdGZvcm0ub3NfbmFtZQotICAgICAgICBzZWxmLm1hcHBpbmdbJ3B1Ymxp YyddID0geworICAgICAgICBzZWxmLm1hcHBpbmdbUFVCTElDX1RBQkxFXSA9IHsKICAgICAgICAg ICAgICdtYWMnOiB7CiAgICAgICAgICAgICAgICAgJ0xlb3BhcmQnOiBWZXJzaW9uKDEwLCA1KSwK ICAgICAgICAgICAgICAgICAnU25vdyBMZW9wYXJkJzogVmVyc2lvbigxMCwgNiksCkBAIC03Mywx MiArNzYsOSBAQCBjbGFzcyBWZXJzaW9uTmFtZU1hcChvYmplY3QpOgogICAgICAgICAgICAgcmVz dWx0Wyd7fSB7fScuZm9ybWF0KHByZWZpeCwgc3RyKFZlcnNpb24obWluaW11bS5tYWpvciArIGkp KSldID0gVmVyc2lvbihtaW5pbXVtLm1ham9yICsgaSkKICAgICAgICAgcmV0dXJuIHJlc3VsdAog Ci0gICAgZGVmIHRvX25hbWUoc2VsZiwgdmVyc2lvbiwgcGxhdGZvcm09Tm9uZSwgdGFibGU9J3B1 YmxpYycpOgotICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuZGVmYXVsdF9zeXN0ZW1fcGxhdGZvcm0g aWYgcGxhdGZvcm0gaXMgTm9uZSBlbHNlIHBsYXRmb3JtCi0gICAgICAgIGFzc2VydCB0YWJsZSBp biBzZWxmLm1hcHBpbmcKLSAgICAgICAgYXNzZXJ0IHBsYXRmb3JtIGluIHNlbGYubWFwcGluZ1t0 YWJsZV0KKyAgICBkZWYgdG9fbmFtZShzZWxmLCB2ZXJzaW9uLCBwbGF0Zm9ybT1Ob25lLCB0YWJs ZT1QVUJMSUNfVEFCTEUpOgogICAgICAgICBjbG9zZXN0X21hdGNoID0gKE5vbmUsIE5vbmUpCi0g ICAgICAgIGZvciBvc19uYW1lLCBvc192ZXJzaW9uIGluIHNlbGYubWFwcGluZ1t0YWJsZV1bcGxh dGZvcm1dLml0ZXJpdGVtcygpOgorICAgICAgICBmb3Igb3NfbmFtZSwgb3NfdmVyc2lvbiBpbiBz ZWxmLm1hcHBpbmdfZm9yX3BsYXRmb3JtKHBsYXRmb3JtLCB0YWJsZSkuaXRlcml0ZW1zKCk6CiAg ICAgICAgICAgICBpZiB2ZXJzaW9uID09IG9zX3ZlcnNpb246CiAgICAgICAgICAgICAgICAgcmV0 dXJuIG9zX25hbWUKICAgICAgICAgICAgIGVsaWYgdmVyc2lvbi5jb250YWluZWRfaW4ob3NfdmVy c2lvbik6CkBAIC0xMjEsMyArMTIxLDE2IEBAIGNsYXNzIFZlcnNpb25OYW1lTWFwKG9iamVjdCk6 CiAgICAgICAgICAgICAgICAgICAgIGlmIHNlbGYuc3RyaXBfbmFtZV9mb3JtYXR0aW5nKHZlcnNp b25fbmFtZSkgPT0gdW5mb3JtYXR0ZWQ6CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4g KG9zX25hbWUsIHZlcnNpb24pCiAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSkKKworICAgIGRl ZiBuYW1lcyhzZWxmLCBwbGF0Zm9ybT1Ob25lLCB0YWJsZT1QVUJMSUNfVEFCTEUpOgorICAgICAg ICAiIiJyZXR1cm4gbGlzdCBvZiBvc19uYW1lIGZvciBwbGF0Zm9ybSIiIgorICAgICAgICBtYXBw aW5nID0gc2VsZi5tYXBwaW5nX2Zvcl9wbGF0Zm9ybShwbGF0Zm9ybSwgdGFibGUpCisgICAgICAg IG5hbWVzID0gW29zX25hbWUgZm9yIG9zX25hbWUgaW4gbWFwcGluZ10KKyAgICAgICAgcmV0dXJu IHNvcnRlZChuYW1lcywga2V5PWxhbWJkYSBvc19uYW1lOiBtYXBwaW5nW29zX25hbWVdKQorCisg ICAgZGVmIG1hcHBpbmdfZm9yX3BsYXRmb3JtKHNlbGYsIHBsYXRmb3JtPU5vbmUsIHRhYmxlPVBV QkxJQ19UQUJMRSk6CisgICAgICAgICIiInJldHVybiBwcm9wZXIgb3NfbmFtZTogb3NfdmVyc2lv biBtYXBwaW5nIGZvciBwbGF0Zm9ybSIiIgorICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuZGVmYXVs dF9zeXN0ZW1fcGxhdGZvcm0gaWYgcGxhdGZvcm0gaXMgTm9uZSBlbHNlIHBsYXRmb3JtCisgICAg ICAgIGFzc2VydCB0YWJsZSBpbiBzZWxmLm1hcHBpbmcKKyAgICAgICAgYXNzZXJ0IHBsYXRmb3Jt IGluIHNlbGYubWFwcGluZ1t0YWJsZV0KKyAgICAgICAgcmV0dXJuIHNlbGYubWFwcGluZ1t0YWJs ZV1bcGxhdGZvcm1dCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2lu LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQppbmRleCA2ZGFjZDNmNmQ3 MC4uYWU5NzgxYzRjYzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93 aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQpAQCAtMzksNiAr MzksNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uY3Jhc2hsb2dzIGltcG9ydCBDcmFz aExvZ3MKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5zeXN0ZW1ob3N0IGltcG9ydCBTeXN0 ZW1Ib3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3Jp cHRFcnJvciwgRXhlY3V0aXZlCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ucGF0aCBpbXBv cnQgYWJzcGF0aF90b191cmksIGN5Z3BhdGgKK2Zyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb25f bmFtZV9tYXAgaW1wb3J0IFZlcnNpb25OYW1lTWFwCiBmcm9tIHdlYmtpdHB5LnBvcnQuYXBwbGUg aW1wb3J0IEFwcGxlUG9ydAogZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZpZyBpbXBvcnQgYXBwbGVf YWRkaXRpb25zCiAKQEAgLTQzNSwxNiArNDM2LDE2IEBAIGNsYXNzIFdpblBvcnQoQXBwbGVQb3J0 KToKIGNsYXNzIFdpbkNhaXJvUG9ydChXaW5Qb3J0KToKICAgICBwb3J0X25hbWUgPSAid2luY2Fp cm8iCiAKLSAgICBWRVJTSU9OX0ZBTExCQUNLX09SREVSID0gWyJ3aW5jYWlyby14cCIsICJ3aW5j YWlyby12aXN0YSIsICJ3aW5jYWlyby03c3AwIiwgIndpbmNhaXJvLXdpbjEwIiwgIndpbmNhaXJv Il0KKyAgICBWRVJTSU9OX0ZBTExCQUNLX09SREVSID0gWyJ3aW5jYWlyby0iICsgb3NfbmFtZS5s b3dlcigpIGZvciBvc19uYW1lIGluIFZlcnNpb25OYW1lTWFwLm1hcCgpLm5hbWVzKCldCiAKICAg ICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgbmFtZSA9 IHNlbGYuX25hbWUucmVwbGFjZSgnLXdrMicsICcnKQogICAgICAgICBpZiBuYW1lLmVuZHN3aXRo KHNlbGYuRlVUVVJFX1ZFUlNJT04pOgotICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBbc2Vs Zi5wb3J0X25hbWVdCisgICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9IFtdCiAgICAgICAgIGVs c2U6Ci0gICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19P UkRFUltzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVIuaW5kZXgobmFtZSk6LTFdICsgW3NlbGYu cG9ydF9uYW1lXQotICAgICAgICBmYWxsYmFja19uYW1lcy5hcHBlbmQoJ3dpbicpCi0gICAgICAg IGZhbGxiYWNrX25hbWVzLmFwcGVuZCgnbWFjJykKKyAgICAgICAgICAgIGFzc2VydCBuYW1lIGlu IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUgorICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMg PSBzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVJbc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVS LmluZGV4KG5hbWUpOl0KKyAgICAgICAgZmFsbGJhY2tfbmFtZXMuYXBwZW5kKHNlbGYucG9ydF9u YW1lKQogICAgICAgICByZXR1cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBmYWxs YmFja19uYW1lcykKIAogICAgIGRlZiBfZnV0dXJlX3BvcnRfbmFtZShzZWxmKToK