171587 2017-05-02 18:09:10 -0700 Web Inspector: 404 Image Load does not appear as a failure in Web Inspector 2017-05-03 13:36:33 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1303904 0 joepeck 2017-05-02 18:09:10 -0700 404 Image Load does not appear as a failure in Web Inspector Test: <img src="DOES-NOT-EXIST.png"> Steps to Reproduce: 1. Inspect tests page => Expected "DOES-NOT-EXIST.png" to be red in the Resources tab sidebar 2. Show Network Tab and Reload => Expected "DOES-NOT-EXIST.png to be red in the Network tab sidebar 3. Select the resource to show contents => Expected error message Notes: • WebCore attempts to decode data from a 404 response, in this case it is the HTML 404 Not Found response which produces a decode error. 1303905 1 joepeck 2017-05-02 18:09:18 -0700 <rdar://problem/13222846> 1303908 2 308874 joepeck 2017-05-02 18:14:45 -0700 Created attachment 308874 [PATCH] Proposed Fix 1304195 3 308874 mattbaker 2017-05-03 13:07:19 -0700 Comment on attachment 308874 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=308874&action=review r=me > Source/WebCore/ChangeLog:13 > + Inline the function to make this less confusing. This is much clearer now, nice change. 1304212 4 308874 commit-queue 2017-05-03 13:36:31 -0700 Comment on attachment 308874 [PATCH] Proposed Fix Clearing flags on attachment: 308874 Committed r216138: <http://trac.webkit.org/changeset/216138> 1304213 5 commit-queue 2017-05-03 13:36:33 -0700 All reviewed patches have been landed. Closing bug. 308874 2017-05-02 18:14:45 -0700 2017-05-03 13:36:31 -0700 [PATCH] Proposed Fix 404-1.patch text/plain 14489 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzOTA0NDg4ZjI5My4uNWNlNGY0MjIyOWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxNy0wNS0wMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IDQwNCBJbWFnZSBMb2FkIGRvZXMgbm90IGFw cGVhciBhcyBhIGZhaWx1cmUgaW4gV2ViIEluc3BlY3RvcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxNTg3CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xMzIyMjg0Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBh Z2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OnByZXBh cmVDYWNoZWRSZXNvdXJjZUJ1ZmZlcik6IERlbGV0ZWQuCisgICAgICAgIElubGluZSB0aGUgZnVu Y3Rpb24gdG8gbWFrZSB0aGlzIGxlc3MgY29uZnVzaW5nLgorCisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JQYWdlQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKToKKyAgICAgICAgVHJl YXQgYSBEZWNvZGVFcnJvciBhcyBhIGZhaWx1cmUuCisKIDIwMTctMDUtMDIgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIEZsYWt5IENyYXNoIHVuZGVy IEV2ZW50VGFyZ2V0OjpmaXJlRXZlbnRMaXN0ZW5lcnMgb24gaW1wb3J0ZWQvYmxpbmsvcGFpbnQv ZGVwcmVjYXRlZHBhaW50bGF5ZXIvbm9uLXNlbGYtcGFpbnRpbmctbGF5ZXItb3ZlcnJpZGVzLXZp c2liaWxpdHkuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFn ZUFnZW50LmNwcAppbmRleCA2YWE2YTA4NDRlZS4uNWJjYTMxZTI2YjAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBAIC05NywyMSArOTcs NiBAQCBzdGF0aWMgYm9vbCBkZWNvZGVCdWZmZXIoY29uc3QgY2hhciogYnVmZmVyLCB1bnNpZ25l ZCBzaXplLCBjb25zdCBTdHJpbmcmIHRleHRFbgogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3Rh dGljIGJvb2wgcHJlcGFyZUNhY2hlZFJlc291cmNlQnVmZmVyKENhY2hlZFJlc291cmNlKiBjYWNo ZWRSZXNvdXJjZSwgYm9vbCogaGFzWmVyb1NpemUpCi17Ci0gICAgKmhhc1plcm9TaXplID0gZmFs c2U7Ci0gICAgaWYgKCFjYWNoZWRSZXNvdXJjZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0g ICAgLy8gWmVyby1zaXplZCByZXNvdXJjZXMgZG9uJ3QgaGF2ZSBkYXRhIGF0IGFsbCAtLSBzbyBm YWtlIHRoZSBlbXB0eSBidWZmZXIsIGluc3RlYWQgb2YgaW5kaWNhdGluZyBlcnJvciBieSByZXR1 cm5pbmcgMC4KLSAgICBpZiAoIWNhY2hlZFJlc291cmNlLT5lbmNvZGVkU2l6ZSgpKSB7Ci0gICAg ICAgICpoYXNaZXJvU2l6ZSA9IHRydWU7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQot ICAgIHJldHVybiB0cnVlOwotfQotCiBzdGF0aWMgYm9vbCBoYXNUZXh0Q29udGVudChDYWNoZWRS ZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UpCiB7CiAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtp dC5vcmcvYi8xNjU0OTU+IFdlYiBJbnNwZWN0b3I6IFhIUiAvIEZldGNoIGZvciBub24tdGV4dCBj b250ZW50IHNob3VsZCBub3Qgc2hvdyBnYXJibGVkIHRleHQKQEAgLTEyNywxOCArMTEyLDE2IEBA IHN0YXRpYyBib29sIGhhc1RleHRDb250ZW50KENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJj ZSkKIAogYm9vbCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlQ29udGVudChDYWNo ZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UsIFN0cmluZyogcmVzdWx0LCBib29sKiBiYXNlNjRF bmNvZGVkKQogewotICAgIC8vIEZJWE1FOiByZXN1bHQgc2hvdWxkIGJlIGEgU3RyaW5nJiBhbmQg YmFzZTY0RW5jb2RlZCBzaG91bGQgYmUgYSBib29sJi4KLSAgICBib29sIGhhc1plcm9TaXplOwot ICAgIGJvb2wgcHJlcGFyZWQgPSBwcmVwYXJlQ2FjaGVkUmVzb3VyY2VCdWZmZXIoY2FjaGVkUmVz b3VyY2UsICZoYXNaZXJvU2l6ZSk7Ci0gICAgaWYgKCFwcmVwYXJlZCkKKyAgICBpZiAoIWNhY2hl ZFJlc291cmNlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWNhY2hlZFJlc291 cmNlLT5lbmNvZGVkU2l6ZSgpKSB7CisgICAgICAgICpyZXN1bHQgPSBTdHJpbmcoKTsKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgKmJhc2U2NEVuY29kZWQgPSAhaGFzVGV4dENv bnRlbnQoY2FjaGVkUmVzb3VyY2UpOwogICAgIGlmICgqYmFzZTY0RW5jb2RlZCkgewotICAgICAg ICBpZiAoaGFzWmVyb1NpemUpIHsKLSAgICAgICAgICAgICpyZXN1bHQgPSB7IH07Ci0gICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQogICAgICAgICBpZiAoYXV0byogYnVmZmVyID0g Y2FjaGVkUmVzb3VyY2UtPnJlc291cmNlQnVmZmVyKCkpIHsKICAgICAgICAgICAgICpyZXN1bHQg PSBiYXNlNjRFbmNvZGUoYnVmZmVyLT5kYXRhKCksIGJ1ZmZlci0+c2l6ZSgpKTsKICAgICAgICAg ICAgIHJldHVybiB0cnVlOwpAQCAtMTQ2LDExICsxMjksNiBAQCBib29sIEluc3BlY3RvclBhZ2VB Z2VudDo6Y2FjaGVkUmVzb3VyY2VDb250ZW50KENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJj ZSwgUwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgaWYgKGhhc1plcm9TaXpl KSB7Ci0gICAgICAgICpyZXN1bHQgPSBlbXB0eVN0cmluZygpOwotICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICB9Ci0KICAgICBpZiAoY2FjaGVkUmVzb3VyY2UpIHsKICAgICAgICAgc3dpdGNoIChj YWNoZWRSZXNvdXJjZS0+dHlwZSgpKSB7CiAgICAgICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkNT U1N0eWxlU2hlZXQ6CkBAIC05MDQsNyArODgyLDcgQEAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6 OlBhZ2U6OkZyYW1lUmVzb3VyY2VUcmVlPiBJbnNwZWN0b3JQYWdlQWdlbnQ6OmJ1aWxkT2JqZWMK ICAgICAgICAgICAgIC5yZWxlYXNlKCk7CiAgICAgICAgIGlmIChjYWNoZWRSZXNvdXJjZS0+d2Fz Q2FuY2VsZWQoKSkKICAgICAgICAgICAgIHJlc291cmNlT2JqZWN0LT5zZXRDYW5jZWxlZCh0cnVl KTsKLSAgICAgICAgZWxzZSBpZiAoY2FjaGVkUmVzb3VyY2UtPnN0YXR1cygpID09IENhY2hlZFJl c291cmNlOjpMb2FkRXJyb3IpCisgICAgICAgIGVsc2UgaWYgKGNhY2hlZFJlc291cmNlLT5zdGF0 dXMoKSA9PSBDYWNoZWRSZXNvdXJjZTo6TG9hZEVycm9yIHx8IGNhY2hlZFJlc291cmNlLT5zdGF0 dXMoKSA9PSBDYWNoZWRSZXNvdXJjZTo6RGVjb2RlRXJyb3IpCiAgICAgICAgICAgICByZXNvdXJj ZU9iamVjdC0+c2V0RmFpbGVkKHRydWUpOwogICAgICAgICBTdHJpbmcgc291cmNlTWFwcGluZ1VS TCA9IEluc3BlY3RvclBhZ2VBZ2VudDo6c291cmNlTWFwVVJMRm9yUmVzb3VyY2UoY2FjaGVkUmVz b3VyY2UpOwogICAgICAgICBpZiAoIXNvdXJjZU1hcHBpbmdVUkwuaXNFbXB0eSgpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCmluZGV4IDI4ODMxODE3 MTFhLi45MzllNzBjN2M5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuaApAQCAtNzQsNyArNzQsNyBAQCBwdWJsaWM6CiAgICAgICAgIFhIUlJlc291 cmNlLAogICAgICAgICBGZXRjaFJlc291cmNlLAogICAgICAgICBXZWJTb2NrZXRSZXNvdXJjZSwK LSAgICAgICAgT3RoZXJSZXNvdXJjZQorICAgICAgICBPdGhlclJlc291cmNlLAogICAgIH07CiAK ICAgICBzdGF0aWMgYm9vbCBjYWNoZWRSZXNvdXJjZUNvbnRlbnQoQ2FjaGVkUmVzb3VyY2UqLCBT dHJpbmcqIHJlc3VsdCwgYm9vbCogYmFzZTY0RW5jb2RlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZwppbmRleCAxMjNlZGY3OGIzMS4uM2U3MjExNDA1OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDQwIEBACisyMDE3LTA1LTAyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogNDA0IEltYWdlIExvYWQgZG9l cyBub3QgYXBwZWFyIGFzIGEgZmFpbHVyZSBpbiBXZWIgSW5zcGVjdG9yCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzE1ODcKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzEzMjIyODQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmNyZWF0ZU9iamVjdFVSTCk6CisgICAg ICAgIFRoaXMgbWF5IHJldHVybiBudWxsIGlmIHRoZSBkYXRhIGlzIG5vdCBhIEJsb2IuIFRoaXMg Y2FuIGhhcHBlbiBpZiB3ZQorICAgICAgICBsb2FkZWQgbm9uLWJhc2U2NEVuY29kZWQgdGV4dCBj b250ZW50IGZvciBhbiBJbWFnZS4gU3VjaCBhcyBhIDQwNCByZXNwb25zZS4KKworICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5oYWRMb2FkaW5nRXJyb3IpOgorICAgICAg ICBDb25zaXN0ZW50IHdheSB0byBjaGVjayBmb3IgYW55IGtpbmQgb2YgbG9hZGluZyBlcnJvci4K KworICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5nZXRJbWFnZVNpemUp OgorICAgICAgICBIYW5kbGUgZmFpbHVyZSB0byBjcmVhdGUgYW4gb2JqZWN0IFVSTC4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRm9udFJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmNv bnRlbnRBdmFpbGFibGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNv dXJjZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkltYWdlUmVzb3VyY2VD b250ZW50Vmlldy5wcm90b3R5cGUuY29udGVudEF2YWlsYWJsZSk6CisgICAgICAgIEhhbmRsZSBm YWlsdXJlIHRvIGNyZWF0ZSBhbiBvYmplY3QgVVJMLgorOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5S ZXNvdXJjZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRl bnRWaWV3LnByb3RvdHlwZS5zaG93R2VuZXJpY0Vycm9yTWVzc2FnZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUuX3Byb3RvY29sRXJyb3IpOiBE ZWxldGVkLgorICAgICAgICBQcm92aWRlIGEgd2F5IGZvciBzdWJjbGFzc2VzIHRvIHNob3cgYSBn ZW5lcmljIHJlc291cmNlIGxvYWRpbmcgZXJyb3IuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbENv bnRlbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVu dC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlw ZS5fdXBkYXRlU3RhdHVzKToKKyAgICAgICAgVXNlIHRoZSBjb25zaXN0ZW50IGhlbHBlciBmb3Ig ZGVub3RpbmcgbG9hZGluZyBlcnJvcnMuCisKIDIwMTctMDUtMDIgIEZ1amlpIEhpcm9ub3JpICA8 SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW0dUS10gV2ViIEluc3BlY3Rvcjog UmVtb3ZlIEdUSysgaWNvbiBGb250VmFyaWFudFNtYWxsQ2Fwcy5zdmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcwppbmRl eCAyMmFhODhiZmQ1ZC4uNDZlMzIyMjU5Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKQEAgLTM0NywxMyArMzQ3 LDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZSA9IGNsYXNzIFJlc291cmNlIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLlNvdXJjZUNvZGUKICAgICB7CiAgICAgICAgIC8vIElmIGNvbnRlbnQgaXMgbm90 IGF2YWlsYWJsZSwgZmFsbGJhY2sgdG8gdXNpbmcgb3JpZ2luYWwgVVJMLgogICAgICAgICAvLyBU aGUgY2xpZW50IG1heSB0cnkgdG8gcmV2b2tlIGl0LCBidXQgbm90aGluZyB3aWxsIGhhcHBlbi4K LSAgICAgICAgaWYgKCF0aGlzLmNvbnRlbnQpCisgICAgICAgIGxldCBjb250ZW50ID0gdGhpcy5j b250ZW50OworICAgICAgICBpZiAoIWNvbnRlbnQpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5f dXJsOwogCi0gICAgICAgIHZhciBjb250ZW50ID0gdGhpcy5jb250ZW50OwotICAgICAgICBjb25z b2xlLmFzc2VydChjb250ZW50IGluc3RhbmNlb2YgQmxvYiwgY29udGVudCk7CisgICAgICAgIGlm IChjb250ZW50IGluc3RhbmNlb2YgQmxvYikKKyAgICAgICAgICAgIHJldHVybiBVUkwuY3JlYXRl T2JqZWN0VVJMKGNvbnRlbnQpOwogCi0gICAgICAgIHJldHVybiBVUkwuY3JlYXRlT2JqZWN0VVJM KGNvbnRlbnQpOworICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAKICAgICBpc01haW5SZXNv dXJjZSgpCkBAIC04MzEsNiArODMyLDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZSA9IGNsYXNz IFJlc291cmNlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUKICAgICAgICAgdGhpcy5t YXJrQXNDYWNoZWQoKTsKICAgICB9CiAKKyAgICBoYWRMb2FkaW5nRXJyb3IoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX2ZhaWxlZCB8fCB0aGlzLl9jYW5jZWxlZCB8fCB0aGlzLl9zdGF0 dXNDb2RlID49IDQwMDsKKyAgICB9CisKICAgICBnZXRJbWFnZVNpemUoY2FsbGJhY2spCiAgICAg ewogICAgICAgICAvLyBUaHJvdyBhbiBlcnJvciBpbiB0aGUgY2FzZSB0aGlzIHJlc291cmNlIGlz IG5vdCBhbiBpbWFnZS4KQEAgLTg3MCw4ICs4NzYsMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl ID0gY2xhc3MgUmVzb3VyY2UgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZQogICAgICAg ICBpbWFnZS5hZGRFdmVudExpc3RlbmVyKCJsb2FkIiwgaW1hZ2VEaWRMb2FkLmJpbmQodGhpcyks IGZhbHNlKTsKIAogICAgICAgICAvLyBTZXQgdGhlIGltYWdlIHNvdXJjZSB1c2luZyBhbiBvYmpl Y3QgVVJMIG9uY2Ugd2UndmUgb2J0YWluZWQgaXRzIGRhdGEuCi0gICAgICAgIHRoaXMucmVxdWVz dENvbnRlbnQoKS50aGVuKGZ1bmN0aW9uKGNvbnRlbnQpIHsKKyAgICAgICAgdGhpcy5yZXF1ZXN0 Q29udGVudCgpLnRoZW4oKGNvbnRlbnQpID0+IHsKICAgICAgICAgICAgIG9iamVjdFVSTCA9IGlt YWdlLnNyYyA9IGNvbnRlbnQuc291cmNlQ29kZS5jcmVhdGVPYmplY3RVUkwoKTsKKyAgICAgICAg ICAgIGlmICghb2JqZWN0VVJMKQorICAgICAgICAgICAgICAgIHJlcXVlc3RDb250ZW50RmFpbHVy ZS5jYWxsKHRoaXMpOwogICAgICAgICB9LCByZXF1ZXN0Q29udGVudEZhaWx1cmUuYmluZCh0aGlz KSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Gb250UmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4 IDMxMGMyMmQ2Mzk2Li43NzQwNWY4MjI3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29u dGVudFZpZXcuanMKQEAgLTU1LDcgKzU1LDExIEBAIFdlYkluc3BlY3Rvci5Gb250UmVzb3VyY2VD b250ZW50VmlldyA9IGNsYXNzIEZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViCiAK ICAgICBjb250ZW50QXZhaWxhYmxlKGNvbnRlbnQsIGJhc2U2NEVuY29kZWQpCiAgICAgewotICAg ICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5fZm9udE9i amVjdFVSTCA9IHRoaXMucmVzb3VyY2UuY3JlYXRlT2JqZWN0VVJMKCk7CisgICAgICAgIGlmICgh dGhpcy5fZm9udE9iamVjdFVSTCkgeworICAgICAgICAgICAgdGhpcy5zaG93R2VuZXJpY0Vycm9y TWVzc2FnZSgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKICAgICAgICAgY29u c3QgdW5pcXVlRm9udE5hbWUgPSAiV2ViSW5zcGVjdG9yRm9udFByZXZpZXciICsgKCsrV2ViSW5z cGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3Ll91bmlxdWVGb250SWRlbnRpZmllcik7CiAK QEAgLTY4LDcgKzcyLDcgQEAgV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3ID0g Y2xhc3MgRm9udFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWIKICAgICAgICAgaWYgKHRo aXMuX3N0eWxlRWxlbWVudCAmJiB0aGlzLl9zdHlsZUVsZW1lbnQucGFyZW50Tm9kZSkKICAgICAg ICAgICAgIHRoaXMuX3N0eWxlRWxlbWVudC5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHRoaXMuX3N0 eWxlRWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5fZm9udE9iamVjdFVSTCA9IHRoaXMucmVzb3Vy Y2UuY3JlYXRlT2JqZWN0VVJMKCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZHJl bigpOwogCiAgICAgICAgIHRoaXMuX3N0eWxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoInN0eWxlIik7CiAgICAgICAgIHRoaXMuX3N0eWxlRWxlbWVudC50ZXh0Q29udGVudCA9ICJA Zm9udC1mYWNlIHsgZm9udC1mYW1pbHk6IFwiIiArIHVuaXF1ZUZvbnROYW1lICsgIlwiOyBzcmM6 IHVybCgiICsgdGhpcy5fZm9udE9iamVjdFVSTCArICIpIiArIGZvcm1hdCArICI7IH0iOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VS ZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IDU0ZmIxM2E4NTVlLi5k ODZmNmIxNGU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcwpA QCAtNDEsOSArNDEsMTQgQEAgV2ViSW5zcGVjdG9yLkltYWdlUmVzb3VyY2VDb250ZW50VmlldyA9 IGNsYXNzIEltYWdlUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFcKIAogICAgIGNvbnRlbnRB dmFpbGFibGUoY29udGVudCwgYmFzZTY0RW5jb2RlZCkKICAgICB7CisgICAgICAgIGxldCBvYmpl Y3RVUkwgPSB0aGlzLnJlc291cmNlLmNyZWF0ZU9iamVjdFVSTCgpOworICAgICAgICBpZiAoIW9i amVjdFVSTCkgeworICAgICAgICAgICAgdGhpcy5zaG93R2VuZXJpY0Vycm9yTWVzc2FnZSgpOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5lbGVtZW50LnJl bW92ZUNoaWxkcmVuKCk7CiAKLSAgICAgICAgdmFyIG9iamVjdFVSTCA9IHRoaXMucmVzb3VyY2Uu Y3JlYXRlT2JqZWN0VVJMKCk7CiAgICAgICAgIHRoaXMuX2ltYWdlRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImltZyIpOwogICAgICAgICB0aGlzLl9pbWFnZUVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigibG9hZCIsIGZ1bmN0aW9uKCkgeyBVUkwucmV2b2tlT2JqZWN0VVJMKG9iamVj dFVSTCk7IH0pOwogICAgICAgICB0aGlzLl9pbWFnZUVsZW1lbnQuc3JjID0gb2JqZWN0VVJMOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXggZjQxMzY3NTYyZGUuLjVkOTY1NzZh MGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTQ0LDcgKzQ0LDcgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUNvbnRlbnRW aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VXYXNDbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsK IAogICAgICAgICAvLyBSZXF1ZXN0IGNvbnRlbnQgbGFzdCBzbyB0aGUgc3Bpbm5lciB3aWxsIGFs d2F5cyBiZSByZW1vdmVkIGluIGNhc2UgdGhlIGNvbnRlbnQgaXMgaW1tZWRpYXRlbHkgYXZhaWxh YmxlLgotICAgICAgICByZXNvdXJjZS5yZXF1ZXN0Q29udGVudCgpLnRoZW4odGhpcy5fY29udGVu dEF2YWlsYWJsZS5iaW5kKHRoaXMpKS5jYXRjaCh0aGlzLl9wcm90b2NvbEVycm9yLmJpbmQodGhp cykpOworICAgICAgICByZXNvdXJjZS5yZXF1ZXN0Q29udGVudCgpLnRoZW4odGhpcy5fY29udGVu dEF2YWlsYWJsZS5iaW5kKHRoaXMpKS5jYXRjaCh0aGlzLnNob3dHZW5lcmljRXJyb3JNZXNzYWdl LmJpbmQodGhpcykpOwogCiAgICAgICAgIGlmICghdGhpcy5tYW5hZ2VzT3duSXNzdWVzKSB7CiAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuaXNzdWVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLklzc3VlTWFuYWdlci5FdmVudC5Jc3N1ZVdhc0FkZGVkLCB0aGlzLl9pc3N1ZVdh c0FkZGVkLCB0aGlzKTsKQEAgLTc3LDYgKzc3LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUNv bnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rv CiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCiAgICAgfQogCisgICAgc2hv d0dlbmVyaWNFcnJvck1lc3NhZ2UoKQorICAgIHsKKyAgICAgICAgdGhpcy5fY29udGVudEVycm9y KFdlYkluc3BlY3Rvci5VSVN0cmluZygiQW4gZXJyb3Igb2NjdXJyZWQgdHJ5aW5nIHRvIGxvYWQg dGhlIHJlc291cmNlLiIpKTsKKyAgICB9CisKICAgICBhZGRJc3N1ZShpc3N1ZSkKICAgICB7CiAg ICAgICAgIC8vIFRoaXMgZ2VuZXJpY2FsbHkgc2hvd3Mgb25seSB0aGUgbGFzdCBpc3N1ZSwgc3Vi Y2xhc3NlcyBjYW4gb3ZlcnJpZGUgZm9yIGJldHRlciBoYW5kbGluZy4KQEAgLTExOCwxMSArMTIz LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUNv bnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcuRXZlbnQuQ29udGVu dEVycm9yKTsKICAgICB9CiAKLSAgICBfcHJvdG9jb2xFcnJvcihlcnJvcikKLSAgICB7Ci0gICAg ICAgIHRoaXMuX2NvbnRlbnRFcnJvcihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFuIGVycm9yIG9j Y3VycmVkIHRyeWluZyB0byBsb2FkIHRoZSByZXNvdXJjZS4iKSk7Ci0gICAgfQotCiAgICAgX2hh c0NvbnRlbnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuICF0aGlzLmVsZW1lbnQucXVlcnlTZWxl Y3RvcigiLmluZGV0ZXJtaW5hdGUtcHJvZ3Jlc3Mtc3Bpbm5lciIpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1lbGluZURh dGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKaW5kZXggNmNlZmQ5MjRhMjAuLmUxZGIx OWZiYjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUu anMKQEAgLTk2LDcgKzk2LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVGltZWxpbmVEYXRhR3Jp ZE5vZGUgPSBjbGFzcyBSZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlIGUKICAgICB7CiAgICAg ICAgIGxldCByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlOwogCi0gICAgICAgIGlmIChyZXNvdXJj ZS5mYWlsZWQgfHwgcmVzb3VyY2UuY2FuY2VsZWQgfHwgcmVzb3VyY2Uuc3RhdHVzQ29kZSA+PSA0 MDApCisgICAgICAgIGlmIChyZXNvdXJjZS5oYWRMb2FkaW5nRXJyb3IoKSkKICAgICAgICAgICAg IGNlbGwuY2xhc3NMaXN0LmFkZCgiZXJyb3IiKTsKIAogICAgICAgICBsZXQgdmFsdWUgPSB0aGlz LmRhdGFbY29sdW1uSWRlbnRpZmllcl07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwpp bmRleCA1NGUxNzQyYjVjYi4uNGYzMzRkZTIyMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxl bWVudC5qcwpAQCAtMTcwLDcgKzE3MCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVt ZW50ID0gY2xhc3MgUmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3RvCiAKICAg ICBfdXBkYXRlU3RhdHVzKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZS5mYWls ZWQpCisgICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZS5oYWRMb2FkaW5nRXJyb3IoKSkKICAgICAg ICAgICAgIHRoaXMuYWRkQ2xhc3NOYW1lKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50 LkZhaWxlZFN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5y ZW1vdmVDbGFzc05hbWUoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQuRmFpbGVkU3R5 bGVDbGFzc05hbWUpOwpAQCAtMTc5LDcgKzE3OSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRy ZWVFbGVtZW50ID0gY2xhc3MgUmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rv CiAgICAgICAgICAgICAvLyBSZW1vdmUgdGhlIHNwaW5uZXIuCiAgICAgICAgICAgICB0aGlzLnN0 YXR1cyA9ICIiOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFyIHNwaW5uZXIgPSBu ZXcgV2ViSW5zcGVjdG9yLkluZGV0ZXJtaW5hdGVQcm9ncmVzc1NwaW5uZXI7CisgICAgICAgICAg ICBsZXQgc3Bpbm5lciA9IG5ldyBXZWJJbnNwZWN0b3IuSW5kZXRlcm1pbmF0ZVByb2dyZXNzU3Bp bm5lcjsKICAgICAgICAgICAgIHRoaXMuc3RhdHVzID0gc3Bpbm5lci5lbGVtZW50OwogICAgICAg ICB9CiAgICAgfQo=