212880 2020-06-07 07:17:29 -0700 Simplify fallback content handling in FrameLoader 2020-06-08 02:05:23 -0700 1 1 1 Unclassified WebKit New Bugs Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez ews-watchlist japhet webkit-bug-importer youennf oldest_to_newest 1660065 0 rbuis 2020-06-07 07:17:29 -0700 Simplify fallback content handling in FrameLoader, this can be inlined and some HTMLObjectElement checks can be combined. 1660066 1 401293 rbuis 2020-06-07 07:18:40 -0700 Created attachment 401293 Patch 1660137 2 401293 youennf 2020-06-08 00:50:57 -0700 Comment on attachment 401293 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401293&action=review > Source/WebCore/loader/DocumentLoader.cpp:1011 > + HTMLFrameOwnerElement* owner = m_frame->ownerElement(); auto* 1660143 3 401316 rbuis 2020-06-08 01:21:57 -0700 Created attachment 401316 Patch 1660147 4 ews-feeder 2020-06-08 02:04:38 -0700 Committed r262704: <https://trac.webkit.org/changeset/262704> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401316. 1660149 5 webkit-bug-importer 2020-06-08 02:05:19 -0700 <rdar://problem/64111590> 1660150 6 webkit-bug-importer 2020-06-08 02:05:23 -0700 <rdar://problem/64111592> 401293 2020-06-07 07:18:40 -0700 2020-06-08 01:21:53 -0700 Patch bug-212880-20200607161837.patch text/plain 6628 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNjk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM1NDE4ZTViNzU1ZWU1 ZDM1ODM3ZTI2YzQ5YjFhNTUyNjZjNWZiYy4uYjJiY2U5M2Y1NTdiOGI0NDhhMDg2NTE0ZDY1MDBj OTIxMDYzZjRlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTA3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgZmFsbGJhY2sgY29u dGVudCBoYW5kbGluZyBpbiBGcmFtZUxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyODgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU2ltcGxpZnkgZmFsbGJhY2sgY29udGVudCBoYW5kbGluZyBp biBGcmFtZUxvYWRlciwgdGhpcyBjYW4gYmUgaW5saW5lZAorICAgICAgICBhbmQgc29tZSBIVE1M T2JqZWN0RWxlbWVudCBjaGVja3MgY2FuIGJlIGNvbWJpbmVkLgorCisgICAgICAgICogbG9hZGVy L0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpj b250aW51ZUFmdGVyQ29udGVudFBvbGljeSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZWNlaXZlZE1haW5SZXNvdXJj ZUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpoYW5kbGVGYWxsYmFja0Nv bnRlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmlzSG9zdGVk QnlPYmplY3RFbGVtZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVM b2FkZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6Okhpc3RvcnlDb250cm9sbGVyOjpjcmVhdGVJdGVtVHJl ZSk6CisKIDIwMjAtMDYtMDcgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgogCiAgICAgICAgIFJlbW92ZSBFTkFCTEVfVklERU9fVFJBQ0sgaWZkZWYgZ3VhcmRzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCBlNDEyNDFhZDExNWQ2YTFh ZTk5MzliMjQ4NzEwY2I5Y2Q3ZjJlZDRmLi4yNGM0ZjlhMmI4NTY1NDhiMDNiMWFmNzI3NDg0Y2Rj YjYwN2Q0MzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAg LTU0LDYgKzU0LDcgQEAKICNpbmNsdWRlICJGcmFtZVRyZWUuaCIKICNpbmNsdWRlICJIVE1MRm9y bUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKKyNpbmNsdWRl ICJIVE1MT2JqZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUVFBIZWFkZXJOYW1lcy5oIgogI2lu Y2x1ZGUgIkhpc3RvcnlJdGVtLmgiCiAjaW5jbHVkZSAiSGlzdG9yeUNvbnRyb2xsZXIuaCIKQEAg LTEwMDcsMTQgKzEwMDgsMTMgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlckNv bnRlbnRQb2xpY3koUG9saWN5QWN0aW9uIHBvbGljeSkKICAgICBpZiAobV9yZXNwb25zZS5pc0lu SFRUUEZhbWlseSgpKSB7CiAgICAgICAgIGludCBzdGF0dXMgPSBtX3Jlc3BvbnNlLmh0dHBTdGF0 dXNDb2RlKCk7IC8vIFN0YXR1cyBtYXkgYmUgemVybyB3aGVuIGxvYWRpbmcgc3Vic3RpdHV0ZSBk YXRhLCBpbiBwYXJ0aWN1bGFyIGZyb20gYSBXZWJBcmNoaXZlLgogICAgICAgICBpZiAoc3RhdHVz ICYmIChzdGF0dXMgPCAyMDAgfHwgc3RhdHVzID49IDMwMCkpIHsKLSAgICAgICAgICAgIGJvb2wg aG9zdGVkQnlPYmplY3QgPSBmcmFtZUxvYWRlcigpLT5pc0hvc3RlZEJ5T2JqZWN0RWxlbWVudCgp OwotCi0gICAgICAgICAgICBmcmFtZUxvYWRlcigpLT5oYW5kbGVGYWxsYmFja0NvbnRlbnQoKTsK LSAgICAgICAgICAgIC8vIG9iamVjdCBlbGVtZW50cyBhcmUgbm8gbG9uZ2VyIHJlbmRlcmVkIGFm dGVyIHdlIGZhbGxiYWNrLCBzbyBkb24ndAotICAgICAgICAgICAgLy8ga2VlcCB0cnlpbmcgdG8g cHJvY2VzcyBkYXRhIGZyb20gdGhlaXIgbG9hZAotCi0gICAgICAgICAgICBpZiAoaG9zdGVkQnlP YmplY3QpCisgICAgICAgICAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gbV9mcmFt ZS0+b3duZXJFbGVtZW50KCk7CisgICAgICAgICAgICBpZiAoaXM8SFRNTE9iamVjdEVsZW1lbnQ+ KG93bmVyKSkgeworICAgICAgICAgICAgICAgIGRvd25jYXN0PEhUTUxPYmplY3RFbGVtZW50Pigq b3duZXIpLnJlbmRlckZhbGxiYWNrQ29udGVudCgpOworICAgICAgICAgICAgICAgIC8vIG9iamVj dCBlbGVtZW50cyBhcmUgbm8gbG9uZ2VyIHJlbmRlcmVkIGFmdGVyIHdlIGZhbGxiYWNrLCBzbyBk b24ndAorICAgICAgICAgICAgICAgIC8vIGtlZXAgdHJ5aW5nIHRvIHByb2Nlc3MgZGF0YSBmcm9t IHRoZWlyIGxvYWQKICAgICAgICAgICAgICAgICBjYW5jZWxNYWluUmVzb3VyY2VMb2FkKGZyYW1l TG9hZGVyKCktPmNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCkpOworICAgICAgICAgICAgfQogICAg ICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAy NTNlMzdmMmVlNTEzYTQwOGE0MGRhYzBmYmM1NDNmYzcyMjk1OTdlLi43MjkwMGQ4ZjhjMGE0NTFk MTM1ODYzMDg4YmExOGRmZjc4ZmRhNjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKQEAgLTEwNzgsMTUgKzEwNzgsNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzZXRPcGVuZXIo RnJhbWUqIG9wZW5lcikKICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5pbml0U2VjdXJpdHlD b250ZXh0KCk7CiB9CiAKLS8vIEZJWE1FOiBUaGlzIGRvZXMgbm90IGJlbG9uZyBpbiBGcmFtZUxv YWRlciEKLXZvaWQgRnJhbWVMb2FkZXI6OmhhbmRsZUZhbGxiYWNrQ29udGVudCgpCi17Ci0gICAg SFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUub3duZXJFbGVtZW50KCk7Ci0g ICAgaWYgKCFpczxIVE1MT2JqZWN0RWxlbWVudD4ob3duZXIpKQotICAgICAgICByZXR1cm47Ci0g ICAgZG93bmNhc3Q8SFRNTE9iamVjdEVsZW1lbnQ+KCpvd25lcikucmVuZGVyRmFsbGJhY2tDb250 ZW50KCk7Ci19Ci0KIHZvaWQgRnJhbWVMb2FkZXI6OnByb3Zpc2lvbmFsTG9hZFN0YXJ0ZWQoKQog ewogICAgIGlmIChtX3N0YXRlTWFjaGluZS5maXJzdExheW91dERvbmUoKSkKQEAgLTIzNjIsMTIg KzIzNTMsNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpvcGVuKENhY2hlZEZyYW1lQmFzZSYgY2FjaGVk RnJhbWUpCiAgICAgICAgIGNoZWNrQ29tcGxldGVkKCk7CiB9CiAKLWJvb2wgRnJhbWVMb2FkZXI6 OmlzSG9zdGVkQnlPYmplY3RFbGVtZW50KCkgY29uc3QKLXsKLSAgICBIVE1MRnJhbWVPd25lckVs ZW1lbnQqIG93bmVyID0gbV9mcmFtZS5vd25lckVsZW1lbnQoKTsKLSAgICByZXR1cm4gb3duZXIg JiYgb3duZXItPmhhc1RhZ05hbWUob2JqZWN0VGFnKTsKLX0KLQogYm9vbCBGcmFtZUxvYWRlcjo6 aXNSZXBsYWNpbmcoKSBjb25zdAogewogICAgIHJldHVybiBtX2xvYWRUeXBlID09IEZyYW1lTG9h ZFR5cGU6OlJlcGxhY2U7CkBAIC0zMTM1LDggKzMxMjAsMTEgQEAgdm9pZCBGcmFtZUxvYWRlcjo6 cmVjZWl2ZWRNYWluUmVzb3VyY2VFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAg ICAvLyBGSVhNRTogRG9uJ3Qgd2FudCB0byBkbyB0aGlzIGlmIGFuIGVudGlyZWx5IG5ldyBsb2Fk IGlzIGdvaW5nLCBzbyBzaG91bGQgY2hlY2sKICAgICAvLyB0aGF0IGJvdGggZGF0YSBzb3VyY2Vz IG9uIHRoZSBmcmFtZSBhcmUgZWl0aGVyIHRoaXMgb3IgbmlsLgogICAgIHN0b3AoKTsKLSAgICBp ZiAobV9jbGllbnQtPnNob3VsZEZhbGxCYWNrKGVycm9yKSkKLSAgICAgICAgaGFuZGxlRmFsbGJh Y2tDb250ZW50KCk7CisgICAgaWYgKG1fY2xpZW50LT5zaG91bGRGYWxsQmFjayhlcnJvcikpIHsK KyAgICAgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUub3duZXJFbGVt ZW50KCk7CisgICAgICAgIGlmIChpczxIVE1MT2JqZWN0RWxlbWVudD4ob3duZXIpKQorICAgICAg ICAgICAgZG93bmNhc3Q8SFRNTE9iamVjdEVsZW1lbnQ+KCpvd25lcikucmVuZGVyRmFsbGJhY2tD b250ZW50KCk7CisgICAgfQogCiAgICAgaWYgKG1fc3RhdGUgPT0gRnJhbWVTdGF0ZVByb3Zpc2lv bmFsICYmIG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikgewogICAgICAgICBpZiAobV9zdWJt aXR0ZWRGb3JtVVJMID09IG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+b3JpZ2luYWxSZXF1 ZXN0Q29weSgpLnVybCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCAwNTE1 NzllNTU2MzdmZDdmNzM2ZDY4ZWQwZDQ3NDg5NzY1OWFkZDA4Li4yNTE0MzM3ZTc1NTBiMTAzYzNm MThmNWVhNDVmNWYzNzU5MTk1NTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApA QCAtMTgzLDggKzE4Myw2IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgd2lsbExvYWRNZWRpYUVsZW1l bnRVUkwoVVJMJiwgTm9kZSYpOwogCi0gICAgdm9pZCBoYW5kbGVGYWxsYmFja0NvbnRlbnQoKTsK LQogICAgIFdFQkNPUkVfRVhQT1JUIFJlc291cmNlRXJyb3IgY2FuY2VsbGVkRXJyb3IoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JikgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgUmVzb3VyY2VFcnJv ciBibG9ja2VkQnlDb250ZW50QmxvY2tlckVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYpIGNv bnN0OwogICAgIFJlc291cmNlRXJyb3IgYmxvY2tlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVz dCYpIGNvbnN0OwpAQCAtMTkyLDggKzE5MCw2IEBAIHB1YmxpYzoKICAgICBSZXNvdXJjZUVycm9y IGJsb2NrZWRCeUNvbnRlbnRGaWx0ZXJFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3QmKSBjb25z dDsKICNlbmRpZgogCi0gICAgYm9vbCBpc0hvc3RlZEJ5T2JqZWN0RWxlbWVudCgpIGNvbnN0Owot CiAgICAgYm9vbCBpc1JlcGxhY2luZygpIGNvbnN0OwogICAgIHZvaWQgc2V0UmVwbGFjaW5nKCk7 CiAgICAgYm9vbCBzdWJmcmFtZUlzTG9hZGluZygpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKaW5kZXggMTYyN2UzNzQ1YjY5OTg0Y2IyMmQ3NWQy YjM2ODFhZjY1YWM3Njg5OC4uMDNiMjRlODg4M2QwOGVmYzdkOGExZGY4YWQ1ZTE1MWJhZWE0NTc3 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCkBAIC00 Miw2ICs0Miw3IEBACiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJTdGF0ZU1hY2hpbmUuaCIKICNpbmNs dWRlICJGcmFtZVRyZWUuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJIVE1M T2JqZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIkhpc3RvcnlJdGVtLmgiCiAjaW5jbHVkZSAiTG9n Z2luZy5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKQEAgLTcxMyw3ICs3MTQsNyBAQCBSZWY8SGlzdG9y eUl0ZW0+IEZyYW1lTG9hZGVyOjpIaXN0b3J5Q29udHJvbGxlcjo6Y3JlYXRlSXRlbVRyZWUoRnJh bWUmIHRhcmdldEZyYQogICAgICAgICAgICAgLy8gd2UgZG9uJ3Qgd2FudCB0byBjcmVhdGUgYSBo aXN0b3J5IGl0ZW0sIGJlY2F1c2UgdGhhdCBjYXVzZXMgZmFsbGJhY2sgY29udGVudAogICAgICAg ICAgICAgLy8gdG8gYmUgaWdub3JlZCBvbiByZWxvYWQuCiAgICAgICAgICAgICAKLSAgICAgICAg ICAgIGlmICghKCFoYXNDaGlsZExvYWRlZCAmJiBjaGlsZExvYWRlci5pc0hvc3RlZEJ5T2JqZWN0 RWxlbWVudCgpKSkKKyAgICAgICAgICAgIGlmICghKCFoYXNDaGlsZExvYWRlZCAmJiBjaGlsZC0+ b3duZXJFbGVtZW50KCkgJiYgaXM8SFRNTE9iamVjdEVsZW1lbnQ+KGNoaWxkLT5vd25lckVsZW1l bnQoKSkpKQogICAgICAgICAgICAgICAgIGJmSXRlbS0+YWRkQ2hpbGRJdGVtKGNoaWxkTG9hZGVy Lmhpc3RvcnkoKS5jcmVhdGVJdGVtVHJlZSh0YXJnZXRGcmFtZSwgY2xpcEF0VGFyZ2V0KSk7CiAg ICAgICAgIH0KICAgICB9Cg== 401316 2020-06-08 01:21:57 -0700 2020-06-08 02:04:38 -0700 Patch bug-212880-20200608102156.patch text/plain 6644 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQyMWEyZjdhMjNiZDdm MzQ0ZTdjMDMzYWFlOTliZjIyMGYxZjhhYy4uYzk4ZjU0NTc3NDIyZDQyZWZmYmQ1YzM1YjljNDJi MjZiOWY2ZTg0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgZmFsbGJhY2sgY29u dGVudCBoYW5kbGluZyBpbiBGcmFtZUxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyODgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5u IEZhYmxldC4KKworICAgICAgICBTaW1wbGlmeSBmYWxsYmFjayBjb250ZW50IGhhbmRsaW5nIGlu IEZyYW1lTG9hZGVyLCB0aGlzIGNhbiBiZSBpbmxpbmVkCisgICAgICAgIGFuZCBzb21lIEhUTUxP YmplY3RFbGVtZW50IGNoZWNrcyBjYW4gYmUgY29tYmluZWQuCisKKyAgICAgICAgKiBsb2FkZXIv RG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmNv bnRpbnVlQWZ0ZXJDb250ZW50UG9saWN5KToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnJlY2VpdmVkTWFpblJlc291cmNl RXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmhhbmRsZUZhbGxiYWNrQ29u dGVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6aXNIb3N0ZWRC eU9iamVjdEVsZW1lbnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv YWRlci5oOgorICAgICAgICAqIGxvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6OmNyZWF0ZUl0ZW1UcmVl KToKKwogMjAyMC0wNi0wNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdW0hlaWdodCBwZXJjZW50YWdlXSBTa2lwIGFub255bW91cyB3cmFwcGVycyB3aGVu IHNlYXJjaGluZyBmb3IgZml4ZWQgaGVpZ2h0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 TG9hZGVyLmNwcAppbmRleCBlNDEyNDFhZDExNWQ2YTFhZTk5MzliMjQ4NzEwY2I5Y2Q3ZjJlZDRm Li44Y2ZhZmFiMGM3ZWZkNjViZTAwZGZjYzEyNDhmOTc4N2NkOGNjOGE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTU0LDYgKzU0LDcgQEAKICNpbmNsdWRl ICJGcmFtZVRyZWUuaCIKICNpbmNsdWRlICJIVE1MRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJI VE1MRnJhbWVPd25lckVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MT2JqZWN0RWxlbWVudC5oIgog I2luY2x1ZGUgIkhUVFBIZWFkZXJOYW1lcy5oIgogI2luY2x1ZGUgIkhpc3RvcnlJdGVtLmgiCiAj aW5jbHVkZSAiSGlzdG9yeUNvbnRyb2xsZXIuaCIKQEAgLTEwMDcsMTQgKzEwMDgsMTMgQEAgdm9p ZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5QWN0aW9u IHBvbGljeSkKICAgICBpZiAobV9yZXNwb25zZS5pc0luSFRUUEZhbWlseSgpKSB7CiAgICAgICAg IGludCBzdGF0dXMgPSBtX3Jlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCk7IC8vIFN0YXR1cyBtYXkg YmUgemVybyB3aGVuIGxvYWRpbmcgc3Vic3RpdHV0ZSBkYXRhLCBpbiBwYXJ0aWN1bGFyIGZyb20g YSBXZWJBcmNoaXZlLgogICAgICAgICBpZiAoc3RhdHVzICYmIChzdGF0dXMgPCAyMDAgfHwgc3Rh dHVzID49IDMwMCkpIHsKLSAgICAgICAgICAgIGJvb2wgaG9zdGVkQnlPYmplY3QgPSBmcmFtZUxv YWRlcigpLT5pc0hvc3RlZEJ5T2JqZWN0RWxlbWVudCgpOwotCi0gICAgICAgICAgICBmcmFtZUxv YWRlcigpLT5oYW5kbGVGYWxsYmFja0NvbnRlbnQoKTsKLSAgICAgICAgICAgIC8vIG9iamVjdCBl bGVtZW50cyBhcmUgbm8gbG9uZ2VyIHJlbmRlcmVkIGFmdGVyIHdlIGZhbGxiYWNrLCBzbyBkb24n dAotICAgICAgICAgICAgLy8ga2VlcCB0cnlpbmcgdG8gcHJvY2VzcyBkYXRhIGZyb20gdGhlaXIg bG9hZAotCi0gICAgICAgICAgICBpZiAoaG9zdGVkQnlPYmplY3QpCisgICAgICAgICAgICBhdXRv KiBvd25lciA9IG1fZnJhbWUtPm93bmVyRWxlbWVudCgpOworICAgICAgICAgICAgaWYgKGlzPEhU TUxPYmplY3RFbGVtZW50Pihvd25lcikpIHsKKyAgICAgICAgICAgICAgICBkb3duY2FzdDxIVE1M T2JqZWN0RWxlbWVudD4oKm93bmVyKS5yZW5kZXJGYWxsYmFja0NvbnRlbnQoKTsKKyAgICAgICAg ICAgICAgICAvLyBvYmplY3QgZWxlbWVudHMgYXJlIG5vIGxvbmdlciByZW5kZXJlZCBhZnRlciB3 ZSBmYWxsYmFjaywgc28gZG9uJ3QKKyAgICAgICAgICAgICAgICAvLyBrZWVwIHRyeWluZyB0byBw cm9jZXNzIGRhdGEgZnJvbSB0aGVpciBsb2FkCiAgICAgICAgICAgICAgICAgY2FuY2VsTWFpblJl c291cmNlTG9hZChmcmFtZUxvYWRlcigpLT5jYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpKTsKKyAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKaW5kZXggMjUzZTM3ZjJlZTUxM2E0MDhhNDBkYWMwZmJjNTQzZmM3MjI5NTk3ZS4u NzI5MDBkOGY4YzBhNDUxZDEzNTg2MzA4OGJhMThkZmY3OGZkYTY3MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xMDc4LDE1ICsxMDc4LDYgQEAgdm9pZCBGcmFtZUxv YWRlcjo6c2V0T3BlbmVyKEZyYW1lKiBvcGVuZXIpCiAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQo KS0+aW5pdFNlY3VyaXR5Q29udGV4dCgpOwogfQogCi0vLyBGSVhNRTogVGhpcyBkb2VzIG5vdCBi ZWxvbmcgaW4gRnJhbWVMb2FkZXIhCi12b2lkIEZyYW1lTG9hZGVyOjpoYW5kbGVGYWxsYmFja0Nv bnRlbnQoKQotewotICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBtX2ZyYW1lLm93 bmVyRWxlbWVudCgpOwotICAgIGlmICghaXM8SFRNTE9iamVjdEVsZW1lbnQ+KG93bmVyKSkKLSAg ICAgICAgcmV0dXJuOwotICAgIGRvd25jYXN0PEhUTUxPYmplY3RFbGVtZW50Pigqb3duZXIpLnJl bmRlckZhbGxiYWNrQ29udGVudCgpOwotfQotCiB2b2lkIEZyYW1lTG9hZGVyOjpwcm92aXNpb25h bExvYWRTdGFydGVkKCkKIHsKICAgICBpZiAobV9zdGF0ZU1hY2hpbmUuZmlyc3RMYXlvdXREb25l KCkpCkBAIC0yMzYyLDEyICsyMzUzLDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6b3BlbihDYWNoZWRG cmFtZUJhc2UmIGNhY2hlZEZyYW1lKQogICAgICAgICBjaGVja0NvbXBsZXRlZCgpOwogfQogCi1i b29sIEZyYW1lTG9hZGVyOjppc0hvc3RlZEJ5T2JqZWN0RWxlbWVudCgpIGNvbnN0Ci17Ci0gICAg SFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUub3duZXJFbGVtZW50KCk7Ci0g ICAgcmV0dXJuIG93bmVyICYmIG93bmVyLT5oYXNUYWdOYW1lKG9iamVjdFRhZyk7Ci19Ci0KIGJv b2wgRnJhbWVMb2FkZXI6OmlzUmVwbGFjaW5nKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9sb2Fk VHlwZSA9PSBGcmFtZUxvYWRUeXBlOjpSZXBsYWNlOwpAQCAtMzEzNSw4ICszMTIwLDExIEBAIHZv aWQgRnJhbWVMb2FkZXI6OnJlY2VpdmVkTWFpblJlc291cmNlRXJyb3IoY29uc3QgUmVzb3VyY2VF cnJvciYgZXJyb3IpCiAgICAgLy8gRklYTUU6IERvbid0IHdhbnQgdG8gZG8gdGhpcyBpZiBhbiBl bnRpcmVseSBuZXcgbG9hZCBpcyBnb2luZywgc28gc2hvdWxkIGNoZWNrCiAgICAgLy8gdGhhdCBi b3RoIGRhdGEgc291cmNlcyBvbiB0aGUgZnJhbWUgYXJlIGVpdGhlciB0aGlzIG9yIG5pbC4KICAg ICBzdG9wKCk7Ci0gICAgaWYgKG1fY2xpZW50LT5zaG91bGRGYWxsQmFjayhlcnJvcikpCi0gICAg ICAgIGhhbmRsZUZhbGxiYWNrQ29udGVudCgpOworICAgIGlmIChtX2NsaWVudC0+c2hvdWxkRmFs bEJhY2soZXJyb3IpKSB7CisgICAgICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBt X2ZyYW1lLm93bmVyRWxlbWVudCgpOworICAgICAgICBpZiAoaXM8SFRNTE9iamVjdEVsZW1lbnQ+ KG93bmVyKSkKKyAgICAgICAgICAgIGRvd25jYXN0PEhUTUxPYmplY3RFbGVtZW50Pigqb3duZXIp LnJlbmRlckZhbGxiYWNrQ29udGVudCgpOworICAgIH0KIAogICAgIGlmIChtX3N0YXRlID09IEZy YW1lU3RhdGVQcm92aXNpb25hbCAmJiBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIpIHsKICAg ICAgICAgaWYgKG1fc3VibWl0dGVkRm9ybVVSTCA9PSBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2Fk ZXItPm9yaWdpbmFsUmVxdWVzdENvcHkoKS51cmwoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmgKaW5kZXggMDUxNTc5ZTU1NjM3ZmQ3ZjczNmQ2OGVkMGQ0NzQ4OTc2NTlhZGQwOC4uMjUx NDMzN2U3NTUwYjEwM2MzZjE4ZjVlYTQ1ZjVmMzc1OTE5NTU3YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKQEAgLTE4Myw4ICsxODMsNiBAQCBwdWJsaWM6CiAKICAgICBib29sIHdp bGxMb2FkTWVkaWFFbGVtZW50VVJMKFVSTCYsIE5vZGUmKTsKIAotICAgIHZvaWQgaGFuZGxlRmFs bGJhY2tDb250ZW50KCk7Ci0KICAgICBXRUJDT1JFX0VYUE9SVCBSZXNvdXJjZUVycm9yIGNhbmNl bGxlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQ T1JUIFJlc291cmNlRXJyb3IgYmxvY2tlZEJ5Q29udGVudEJsb2NrZXJFcnJvcihjb25zdCBSZXNv dXJjZVJlcXVlc3QmKSBjb25zdDsKICAgICBSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJvcihjb25z dCBSZXNvdXJjZVJlcXVlc3QmKSBjb25zdDsKQEAgLTE5Miw4ICsxOTAsNiBAQCBwdWJsaWM6CiAg ICAgUmVzb3VyY2VFcnJvciBibG9ja2VkQnlDb250ZW50RmlsdGVyRXJyb3IoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JikgY29uc3Q7CiAjZW5kaWYKIAotICAgIGJvb2wgaXNIb3N0ZWRCeU9iamVjdEVs ZW1lbnQoKSBjb25zdDsKLQogICAgIGJvb2wgaXNSZXBsYWNpbmcoKSBjb25zdDsKICAgICB2b2lk IHNldFJlcGxhY2luZygpOwogICAgIGJvb2wgc3ViZnJhbWVJc0xvYWRpbmcoKSBjb25zdDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCmluZGV4IDE2MjdlMzc0 NWI2OTk4NGNiMjJkNzVkMmIzNjgxYWY2NWFjNzY4OTguLjAzYjI0ZTg4ODNkMDhlZmM3ZDhhMWRm OGFkNWUxNTFiYWVhNDU3NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0 b3J5Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250 cm9sbGVyLmNwcApAQCAtNDIsNiArNDIsNyBAQAogI2luY2x1ZGUgIkZyYW1lTG9hZGVyU3RhdGVN YWNoaW5lLmgiCiAjaW5jbHVkZSAiRnJhbWVUcmVlLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3Lmgi CisjaW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXN0b3J5SXRlbS5o IgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQYWdlLmgiCkBAIC03MTMsNyArNzE0 LDcgQEAgUmVmPEhpc3RvcnlJdGVtPiBGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6OmNy ZWF0ZUl0ZW1UcmVlKEZyYW1lJiB0YXJnZXRGcmEKICAgICAgICAgICAgIC8vIHdlIGRvbid0IHdh bnQgdG8gY3JlYXRlIGEgaGlzdG9yeSBpdGVtLCBiZWNhdXNlIHRoYXQgY2F1c2VzIGZhbGxiYWNr IGNvbnRlbnQKICAgICAgICAgICAgIC8vIHRvIGJlIGlnbm9yZWQgb24gcmVsb2FkLgogICAgICAg ICAgICAgCi0gICAgICAgICAgICBpZiAoISghaGFzQ2hpbGRMb2FkZWQgJiYgY2hpbGRMb2FkZXIu aXNIb3N0ZWRCeU9iamVjdEVsZW1lbnQoKSkpCisgICAgICAgICAgICBpZiAoISghaGFzQ2hpbGRM b2FkZWQgJiYgY2hpbGQtPm93bmVyRWxlbWVudCgpICYmIGlzPEhUTUxPYmplY3RFbGVtZW50Pihj aGlsZC0+b3duZXJFbGVtZW50KCkpKSkKICAgICAgICAgICAgICAgICBiZkl0ZW0tPmFkZENoaWxk SXRlbShjaGlsZExvYWRlci5oaXN0b3J5KCkuY3JlYXRlSXRlbVRyZWUodGFyZ2V0RnJhbWUsIGNs aXBBdFRhcmdldCkpOwogICAgICAgICB9CiAgICAgfQo=