167487 2017-01-26 21:12:51 -0800 Revert r210474 it is no longer needed 2017-01-28 22:53:10 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 167421 1 cdumez cdumez bfulgham commit-queue darin dbates oldest_to_newest 1270532 0 cdumez 2017-01-26 21:12:51 -0800 Revert code changes from <http://trac.webkit.org/changeset/210474> as those are no longer needed after Bug 167421. 1270553 1 299911 cdumez 2017-01-26 21:44:42 -0800 Created attachment 299911 Patch 1270577 2 299911 commit-queue 2017-01-26 23:16:07 -0800 Comment on attachment 299911 Patch Clearing flags on attachment: 299911 Committed r211256: <http://trac.webkit.org/changeset/211256> 1270578 3 commit-queue 2017-01-26 23:16:11 -0800 All reviewed patches have been landed. Closing bug. 1271094 4 darin 2017-01-28 22:53:10 -0800 Maybe we should have kept the assertions? 299911 2017-01-26 21:44:42 -0800 2017-01-26 23:16:07 -0800 Patch bug-167487-20170126214238.patch text/plain 6511 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDM3YzM5YjlkNzVmZTIx MTk0Yzc4NmQxYzI0MTZlY2FkNzJjMzA1Ni4uYTE0Mjc5MGU5NDdiNTZkMWJjNjRkOGZjMzNkOGY1 NGIxY2RhNDM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTAxLTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2ZXJ0IHIyMTA0NzQgaXQg aXMgbm8gbG9uZ2VyIG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY3NDg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmV2ZXJ0IHIyMTA0NzQgaXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCBhZnRlciBy MjExMjU0LgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpjYW5OYXZpZ2F0ZSk6CisgICAgICAgICogaHRtbC9IVE1MQW5jaG9yRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQW5jaG9yRWxlbWVudDo6aGFuZGxlQ2xpY2sp OgorICAgICAgICAqIGh0bWwvSFRNTExpbmtFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxMaW5rRWxlbWVudDo6aGFuZGxlQ2xpY2spOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnN1Ym1pdEZvcm0pOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXI6OmxvYWRGcmFtZVJlcXVlc3QpOgorICAgICAgICAqIG1hdGhtbC9N YXRoTUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1hdGhNTEVsZW1lbnQ6OmRlZmF1 bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAqIHN2Zy9TVkdBRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTVkdBRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisKIDIwMTctMDEt MjYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5mQGdtYWlsLmNvbT4KIAogICAgICAgICBbV2ViUlRD XSBBZGQgYSBMaWJXZWJSVEMgbW9jayBmb3IgdGVzdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK aW5kZXggNzcyNWJkYTI2MzRiMjA5NTk0N2UyZjg4ZjQ0N2FmNmRlNzEyMjllOC4uZTc0ZTA2ZDJj OWFkYmMzN2E0ZTA5MmM0Yzk5NWZmMDRlYzIwOTU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CkBAIC0yOTc5LDkgKzI5NzksNiBAQCBib29sIERvY3VtZW50OjpjYW5OYXZpZ2F0ZShGcmFtZSog dGFyZ2V0RnJhbWUpCiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBpZiAocGFnZUNhY2hlU3RhdGUoKSAhPSBEb2N1bWVudDo6Tm90SW5QYWdlQ2FjaGUpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIC8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgY2FsbCB0 aGlzIGZ1bmN0aW9uIHdpdGhvdXQgYSB0YXJnZXQgZnJhbWUsIGJ1dAogICAgIC8vIGZhc3QvZm9y bXMvc3VibWl0LXRvLWJsYW5rLW11bHRpcGxlLXRpbWVzLmh0bWwgZGVwZW5kcyBvbiB0aGlzIGZ1 bmN0aW9uCiAgICAgLy8gcmV0dXJuaW5nIHRydWUgd2hlbiBzdXBwbGllZCB3aXRoIGEgMCB0YXJn ZXRGcmFtZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFuY2hvckVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5jaG9yRWxlbWVudC5jcHAKaW5kZXgg YmFlYjU3NmIxNTYzZWIzMTU3YmI3MmVjZDg3Yjc4MjcwMDllZjMwNC4uZjM2ZGQ0MGU3YzhlNmYz ZGNmNmRkYWNkZjFiNGRlMWZjZDBjZjA2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MQW5jaG9yRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5j aG9yRWxlbWVudC5jcHAKQEAgLTM2OSw5ICszNjksNiBAQCB2b2lkIEhUTUxBbmNob3JFbGVtZW50 OjpoYW5kbGVDbGljayhFdmVudCYgZXZlbnQpCiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgaWYgKGRvY3VtZW50KCkucGFnZUNhY2hlU3RhdGUoKSAhPSBEb2N1bWVudDo6 Tm90SW5QYWdlQ2FjaGUpCi0gICAgICAgIHJldHVybjsKLQogICAgIFN0cmluZ0J1aWxkZXIgdXJs OwogICAgIHVybC5hcHBlbmQoc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3BhY2VzKGF0dHJp YnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oaHJlZkF0dHIpKSk7CiAgICAgYXBwZW5kU2VydmVy TWFwTW91c2VQb3NpdGlvbih1cmwsIGV2ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExpbmtF bGVtZW50LmNwcAppbmRleCBiMTc4MWU0OWI4MjIyY2ZiNDRhMWY1MWEwYTJkZWEyMTM0ZDQwMWIw Li41MmFmMWZmMjljZGVkNzM2ZWZhZjU1NTU4MmExMDMzMGQwZWRiNjcwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCkBAIC00ODksOCArNDg5LDYgQEAgdm9pZCBIVE1M TGlua0VsZW1lbnQ6OmhhbmRsZUNsaWNrKEV2ZW50JiBldmVudCkKICAgICBGcmFtZSogZnJhbWUg PSBkb2N1bWVudCgpLmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwot ICAgIGlmIChkb2N1bWVudCgpLnBhZ2VDYWNoZVN0YXRlKCkgIT0gRG9jdW1lbnQ6Ok5vdEluUGFn ZUNhY2hlKQotICAgICAgICByZXR1cm47CiAgICAgZnJhbWUtPmxvYWRlcigpLnVybFNlbGVjdGVk KHVybCwgdGFyZ2V0KCksICZldmVudCwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRM aXN0OjpObywgTWF5YmVTZW5kUmVmZXJyZXIsIGRvY3VtZW50KCkuc2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeVRvUHJvcGFnYXRlKCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAppbmRleCA3OGRmZjBjNDNjNWZiMDExYzc4MGE0NDdhOWI2OTJjNDRhZmQ0M2MxLi5k OTQ5MWE2MGNlMzBhNzhmNjRiMGYwZmI5YmMwNmI0YzhiYjI1OWY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTM0NSw5ICszNDUsNiBAQCB2b2lkIEZyYW1lTG9hZGVy Ojp1cmxTZWxlY3RlZChjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBwYXNzZWRUYXJnZXQs IEV2ZW50KgogCiB2b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChjb25zdCBGcmFtZUxvYWRS ZXF1ZXN0JiBwYXNzZWRSZXF1ZXN0LCBFdmVudCogdHJpZ2dlcmluZ0V2ZW50KQogewotICAgIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCF0cmlnZ2VyaW5nRXZlbnQgfHwgIXRyaWdn ZXJpbmdFdmVudC0+dGFyZ2V0KCkgfHwgIXRyaWdnZXJpbmdFdmVudC0+dGFyZ2V0KCktPnRvTm9k ZSgpCi0gICAgICAgIHx8IHRyaWdnZXJpbmdFdmVudC0+dGFyZ2V0KCktPnRvTm9kZSgpLT5kb2N1 bWVudCgpLnBhZ2VDYWNoZVN0YXRlKCkgPT0gRG9jdW1lbnQ6Ok5vdEluUGFnZUNhY2hlKTsKLQog ICAgIFJlZjxGcmFtZT4gcHJvdGVjdChtX2ZyYW1lKTsKICAgICBGcmFtZUxvYWRSZXF1ZXN0IGZy YW1lUmVxdWVzdChwYXNzZWRSZXF1ZXN0KTsKIApAQCAtMzczLDkgKzM3MCw2IEBAIHZvaWQgRnJh bWVMb2FkZXI6OnN1Ym1pdEZvcm0oUmVmPEZvcm1TdWJtaXNzaW9uPiYmIHN1Ym1pc3Npb24pCiAg ICAgaWYgKCFtX2ZyYW1lLnBhZ2UoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHN1Ym1p c3Npb24tPnN0YXRlKCkuc291cmNlRG9jdW1lbnQoKS5wYWdlQ2FjaGVTdGF0ZSgpICE9IERvY3Vt ZW50OjpOb3RJblBhZ2VDYWNoZSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKHN1Ym1pc3Np b24tPmFjdGlvbigpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTMzLDkgKzEx MjcsNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzZXR1cEZvclJlcGxhY2UoKQogCiB2b2lkIEZyYW1l TG9hZGVyOjpsb2FkRnJhbWVSZXF1ZXN0KGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVlc3Qs IEV2ZW50KiBldmVudCwgRm9ybVN0YXRlKiBmb3JtU3RhdGUpCiB7Ci0gICAgQVNTRVJUX1dJVEhf U0VDVVJJVFlfSU1QTElDQVRJT04oIWV2ZW50IHx8ICFldmVudC0+dGFyZ2V0KCkgfHwgIWV2ZW50 LT50YXJnZXQoKS0+dG9Ob2RlKCkKLSAgICAgICAgfHwgZXZlbnQtPnRhcmdldCgpLT50b05vZGUo KS0+ZG9jdW1lbnQoKS5wYWdlQ2FjaGVTdGF0ZSgpID09IERvY3VtZW50OjpOb3RJblBhZ2VDYWNo ZSk7Ci0KICAgICAvLyBQcm90ZWN0IGZyYW1lIGZyb20gZ2V0dGluZyBibG93biBhd2F5IGluc2lk ZSBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudCBpbiBsb2FkV2l0aERvY3VtZW50TG9hZGVyLgogICAg IGF1dG8gcHJvdGVjdEZyYW1lID0gbWFrZVJlZihtX2ZyYW1lKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbWF0aG1sL01hdGhNTEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvbWF0 aG1sL01hdGhNTEVsZW1lbnQuY3BwCmluZGV4IGU5NzEzOTYxY2UzYjc0ODg0YTFiM2JlM2U1MGE3 MzkwNjIzZjg5ZTQuLjEyOGI0MTUwOGM0YzU1Y2RmYTAzMTg5NGE4NzEwYjUwNzgxYTc1YzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL21hdGhtbC9NYXRoTUxFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9tYXRobWwvTWF0aE1MRWxlbWVudC5jcHAKQEAgLTE0OSw4ICsxNDksNiBA QCB2b2lkIE1hdGhNTEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQmIGV2ZW50KQog ICAgICAgICAgICAgYXV0byYgaHJlZiA9IGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24o aHJlZkF0dHIpOwogICAgICAgICAgICAgY29uc3QgYXV0byYgdXJsID0gc3RyaXBMZWFkaW5nQW5k VHJhaWxpbmdIVE1MU3BhY2VzKGhyZWYpOwogICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhh bmRsZWQoKTsKLSAgICAgICAgICAgIGlmIChkb2N1bWVudCgpLnBhZ2VDYWNoZVN0YXRlKCkgIT0g RG9jdW1lbnQ6Ok5vdEluUGFnZUNhY2hlKQotICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgIGlmIChhdXRvKiBmcmFtZSA9IGRvY3VtZW50KCkuZnJhbWUoKSkKICAgICAgICAgICAg ICAgICBmcmFtZS0+bG9hZGVyKCkudXJsU2VsZWN0ZWQoZG9jdW1lbnQoKS5jb21wbGV0ZVVSTCh1 cmwpLCAiX3NlbGYiLCAmZXZlbnQsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlz dDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBkb2N1bWVudCgpLnNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3lUb1Byb3BhZ2F0ZSgpKTsKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdBRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcv U1ZHQUVsZW1lbnQuY3BwCmluZGV4IDQyMDIzZmE3Njg2NTRlMTNhZjZkMzI2MjgyYWUzODE2N2Fj YTlkYmQuLjcxMGRlY2U4MThmYjQ5NjgyNTI2OTBhZWIwOGMyODgyZmUwZmI3MjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdBRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvc3ZnL1NWR0FFbGVtZW50LmNwcApAQCAtMTQ0LDggKzE0NCw2IEBAIHZvaWQgU1ZHQUVsZW1l bnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQmIGV2ZW50KQogICAgICAgICAgICAgRnJhbWUq IGZyYW1lID0gZG9jdW1lbnQoKS5mcmFtZSgpOwogICAgICAgICAgICAgaWYgKCFmcmFtZSkKICAg ICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBpZiAoZG9jdW1lbnQoKS5wYWdlQ2Fj aGVTdGF0ZSgpICE9IERvY3VtZW50OjpOb3RJblBhZ2VDYWNoZSkKLSAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCkudXJsU2VsZWN0ZWQoZG9jdW1lbnQo KS5jb21wbGV0ZVVSTCh1cmwpLCB0YXJnZXQsICZldmVudCwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2Nr QmFja0ZvcndhcmRMaXN0OjpObywgTWF5YmVTZW5kUmVmZXJyZXIsIGRvY3VtZW50KCkuc2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCkpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9Cg==