190557 2018-10-13 22:54:06 -0700 [Payment Request] Use a PendingActivity token rather than calling (un)setPendingActivity 2018-10-15 12:35:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes achristensen andersca cdumez commit-queue sam thorton webkit-bug-importer youennf oldest_to_newest 1469031 0 aestes 2018-10-13 22:54:06 -0700 [Payment Request] Use a PendingActivity token rather than calling (un)setPendingActivity 1469032 1 352265 aestes 2018-10-13 22:57:55 -0700 Created attachment 352265 Patch 1469386 2 352265 commit-queue 2018-10-15 12:34:26 -0700 Comment on attachment 352265 Patch Clearing flags on attachment: 352265 Committed r237132: <https://trac.webkit.org/changeset/237132> 1469387 3 commit-queue 2018-10-15 12:34:27 -0700 All reviewed patches have been landed. Closing bug. 1469389 4 webkit-bug-importer 2018-10-15 12:35:35 -0700 <rdar://problem/45280653> 352265 2018-10-13 22:57:55 -0700 2018-10-15 12:34:26 -0700 Patch bug-190557-20181013225753.patch text/plain 7528 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZjY2M1ZDc5YmQ2N2Nl NGMzNmZmN2MzNGE2MWEzODM5YmNlMTM4Mi4uMTdhMjg0NTE4NGVmNGJmOTU3MjNmN2FmOWNlYTkw MDZhMjZkZjMwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTEwLTEzICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBV c2UgYSBQZW5kaW5nQWN0aXZpdHkgdG9rZW4gcmF0aGVyIHRoYW4gY2FsbGluZyAodW4pc2V0UGVu ZGluZ0FjdGl2aXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTA1NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQYXltZW50UmVxdWVzdCBoYXMgcGVuZGluZyBhY3Rpdml0eSB3aGVuZXZlciB0aGVyZSBp cyBhbiBhY3RpdmUgcGF5bWVudCBoYW5kbGVyLCBzaW5jZQorICAgICAgICB1c2VyLWluaXRpYXRl ZCBldmVudHMgY2FuIG9jY3VyIHdoZW5ldmVyIHRoZSBwYXltZW50IFVJIGlzIGRpc3BsYXllZC4K KworICAgICAgICBSYXRoZXIgdGhhbiBtYW51YWxseSB0cmFjayB0aGUgcGVuZGluZyBhY3Rpdml0 eSB3aXRoIHNldFBlbmRpbmdBY3Rpdml0eSgpIGFuZAorICAgICAgICB1bnNldFBlbmRpbmdBY3Rp dml0eSgpLCB1c2UgYSBQZW5kaW5nQWN0aXZpdHkgdG9rZW4gdGllZCB0byB0aGUgbGlmZXRpbWUg b2YgdGhlIGFjdGl2ZQorICAgICAgICBwYXltZW50IGhhbmRsZXIuIEFsc28sIHJld3JpdGUgY2Fu U3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbigpIGluIHRlcm1zIG9mCisgICAgICAgIGhhc1Bl bmRpbmdBY3Rpdml0eSgpLgorCisgICAgICAgICogTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXlt ZW50UmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50UmVxdWVzdDo6c2hvdyk6 CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50UmVxdWVzdDo6YWJvcnRXaXRoRXhjZXB0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRSZXF1ZXN0OjpjYW5TdXNwZW5kRm9yRG9jdW1lbnRT dXNwZW5zaW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRSZXF1ZXN0OjpwYXlt ZW50TWV0aG9kQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50UmVxdWVzdDo6Y29t cGxldGVNZXJjaGFudFZhbGlkYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UGF5bWVudFJlcXVl c3Q6OnNldHRsZURldGFpbHNQcm9taXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRSZXF1 ZXN0Ojpjb21wbGV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50UmVxdWVzdDo6Y2FuY2Vs KToKKyAgICAgICAgKiBNb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0Lmg6CisK IDIwMTgtMTAtMTIgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gQWxsb3cgU1BJIGNsaWVudHMgdG8gbGF5IG91dCBhdCBhcmJpdHJhcmlseSBz Y2FsZWQgc2l6ZXMgYW5kIHNjYWxlIHRvIGZpdCB0aGUgdmlldwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9wYXltZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcAppbmRl eCBkOGI1OTA4Njc1ZjhhZGJlMDVlN2E4M2MzMTkwOGEyMTk1OWNjNWRmLi5kOWFhYzBjNGU4MWE0 NzVmOTdjNmY5OTI4MTliNDU3OGE4ZGJlMzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3BheW1lbnRyZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmNwcApAQCAtNDM0LDgg KzQzNCw3IEBAIHZvaWQgUGF5bWVudFJlcXVlc3Q6OnNob3coRG9jdW1lbnQmIGRvY3VtZW50LCBS ZWZQdHI8RE9NUHJvbWlzZT4mJiBkZXRhaWxzUHJvbWlzCiAgICAgfQogCiAgICAgQVNTRVJUKCFt X2FjdGl2ZVBheW1lbnRIYW5kbGVyKTsKLSAgICBtX2FjdGl2ZVBheW1lbnRIYW5kbGVyID0gV1RG TW92ZShzZWxlY3RlZFBheW1lbnRIYW5kbGVyKTsKLSAgICBzZXRQZW5kaW5nQWN0aXZpdHkodGhp cyk7IC8vIHVuc2V0UGVuZGluZ0FjdGl2aXR5KCkgaXMgY2FsbGVkIGJlbG93IGluIHN0b3AoKQor ICAgIG1fYWN0aXZlUGF5bWVudEhhbmRsZXIgPSBQYXltZW50SGFuZGxlcldpdGhQZW5kaW5nQWN0 aXZpdHkgeyBzZWxlY3RlZFBheW1lbnRIYW5kbGVyLnJlbGVhc2VOb25OdWxsKCksIG1ha2VQZW5k aW5nQWN0aXZpdHkoKnRoaXMpIH07CiAKICAgICBpZiAoIWRldGFpbHNQcm9taXNlKQogICAgICAg ICByZXR1cm47CkBAIC00NDksMTAgKzQ0OCw5IEBAIHZvaWQgUGF5bWVudFJlcXVlc3Q6OmFib3J0 V2l0aEV4Y2VwdGlvbihFeGNlcHRpb24mJiBleGNlcHRpb24pCiAgICAgaWYgKG1fc3RhdGUgIT0g U3RhdGU6OkludGVyYWN0aXZlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoYXV0byBwYXlt ZW50SGFuZGxlciA9IHN0ZDo6ZXhjaGFuZ2UobV9hY3RpdmVQYXltZW50SGFuZGxlciwgbnVsbHB0 cikpIHsKLSAgICAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CisgICAgaWYgKGF1dG8g cGF5bWVudEhhbmRsZXIgPSBhY3RpdmVQYXltZW50SGFuZGxlcigpKQogICAgICAgICBwYXltZW50 SGFuZGxlci0+aGlkZSgpOwotICAgIH0KKyAgICBtX2FjdGl2ZVBheW1lbnRIYW5kbGVyID0gc3Rk OjpudWxsb3B0OwogCiAgICAgQVNTRVJUKG1fc3RhdGUgPT0gU3RhdGU6OkludGVyYWN0aXZlKTsK ICAgICBtX3N0YXRlID0gU3RhdGU6OkNsb3NlZDsKQEAgLTUyNiwxNCArNTI0LDcgQEAgc3RkOjpv cHRpb25hbDxQYXltZW50U2hpcHBpbmdUeXBlPiBQYXltZW50UmVxdWVzdDo6c2hpcHBpbmdUeXBl KCkgY29uc3QKIAogYm9vbCBQYXltZW50UmVxdWVzdDo6Y2FuU3VzcGVuZEZvckRvY3VtZW50U3Vz cGVuc2lvbigpIGNvbnN0CiB7Ci0gICAgc3dpdGNoIChtX3N0YXRlKSB7Ci0gICAgY2FzZSBTdGF0 ZTo6Q3JlYXRlZDoKLSAgICAgICAgQVNTRVJUKCFtX2FjdGl2ZVBheW1lbnRIYW5kbGVyKTsKLSAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgY2FzZSBTdGF0ZTo6SW50ZXJhY3RpdmU6Ci0gICAgY2Fz ZSBTdGF0ZTo6Q2xvc2VkOgotICAgICAgICByZXR1cm4gIW1fYWN0aXZlUGF5bWVudEhhbmRsZXI7 Ci0gICAgfQorICAgIHJldHVybiAhaGFzUGVuZGluZ0FjdGl2aXR5KCk7CiB9CiAKIHZvaWQgUGF5 bWVudFJlcXVlc3Q6OnNoaXBwaW5nQWRkcmVzc0NoYW5nZWQoUmVmPFBheW1lbnRBZGRyZXNzPiYm IHNoaXBwaW5nQWRkcmVzcykKQEAgLTU1OSw3ICs1NTAsNyBAQCB2b2lkIFBheW1lbnRSZXF1ZXN0 OjpwYXltZW50TWV0aG9kQ2hhbmdlZChjb25zdCBTdHJpbmcmIG1ldGhvZE5hbWUsIFBheW1lbnRN ZXRobwogICAgICAgICBpZiAoaGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lKSkKICAgICAgICAg ICAgIGRpc3BhdGNoRXZlbnQoUGF5bWVudE1ldGhvZENoYW5nZUV2ZW50OjpjcmVhdGUoZXZlbnRO YW1lLCBtZXRob2ROYW1lLCBXVEZNb3ZlKG1ldGhvZERldGFpbHNGdW5jdGlvbikpKTsKICAgICAg ICAgZWxzZQotICAgICAgICAgICAgbV9hY3RpdmVQYXltZW50SGFuZGxlci0+ZGV0YWlsc1VwZGF0 ZWQoVXBkYXRlUmVhc29uOjpQYXltZW50TWV0aG9kQ2hhbmdlZCwgeyB9LCB7IH0sIHsgfSwgeyB9 KTsKKyAgICAgICAgICAgIGFjdGl2ZVBheW1lbnRIYW5kbGVyKCktPmRldGFpbHNVcGRhdGVkKFVw ZGF0ZVJlYXNvbjo6UGF5bWVudE1ldGhvZENoYW5nZWQsIHsgfSwgeyB9LCB7IH0sIHsgfSk7CiAg ICAgfSk7CiB9CiAKQEAgLTYwMCw3ICs1OTEsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBQYXltZW50 UmVxdWVzdDo6Y29tcGxldGVNZXJjaGFudFZhbGlkYXRpb24oRXZlbnQmIGV2ZW50LCBSZWY8RAog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgYXV0byBleGNlcHRpb24g PSBtX2FjdGl2ZVBheW1lbnRIYW5kbGVyLT5tZXJjaGFudFZhbGlkYXRpb25Db21wbGV0ZWQobV9t ZXJjaGFudFNlc3Npb25Qcm9taXNlLT5yZXN1bHQoKSk7CisgICAgICAgIGF1dG8gZXhjZXB0aW9u ID0gYWN0aXZlUGF5bWVudEhhbmRsZXIoKS0+bWVyY2hhbnRWYWxpZGF0aW9uQ29tcGxldGVkKG1f bWVyY2hhbnRTZXNzaW9uUHJvbWlzZS0+cmVzdWx0KCkpOwogICAgICAgICBpZiAoZXhjZXB0aW9u Lmhhc0V4Y2VwdGlvbigpKSB7CiAgICAgICAgICAgICBhYm9ydFdpdGhFeGNlcHRpb24oZXhjZXB0 aW9uLnJlbGVhc2VFeGNlcHRpb24oKSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC02NTgsNyAr NjQ5LDcgQEAgdm9pZCBQYXltZW50UmVxdWVzdDo6c2V0dGxlRGV0YWlsc1Byb21pc2UoVXBkYXRl UmVhc29uIHJlYXNvbikKICAgICBtX2RldGFpbHMubW9kaWZpZXJzID0gV1RGTW92ZShkZXRhaWxz VXBkYXRlLm1vZGlmaWVycyk7CiAgICAgbV9zZXJpYWxpemVkTW9kaWZpZXJEYXRhID0gV1RGTW92 ZShzdGQ6OmdldDwxPihzaGlwcGluZ09wdGlvbkFuZE1vZGlmaWVyRGF0YSkpOwogCi0gICAgYXV0 byByZXN1bHQgPSBtX2FjdGl2ZVBheW1lbnRIYW5kbGVyLT5kZXRhaWxzVXBkYXRlZChyZWFzb24s IFdURk1vdmUoZGV0YWlsc1VwZGF0ZS5lcnJvciksIFdURk1vdmUoZGV0YWlsc1VwZGF0ZS5zaGlw cGluZ0FkZHJlc3NFcnJvcnMpLCBXVEZNb3ZlKGRldGFpbHNVcGRhdGUucGF5ZXJFcnJvcnMpLCBk ZXRhaWxzVXBkYXRlLnBheW1lbnRNZXRob2RFcnJvcnMuZ2V0KCkpOworICAgIGF1dG8gcmVzdWx0 ID0gYWN0aXZlUGF5bWVudEhhbmRsZXIoKS0+ZGV0YWlsc1VwZGF0ZWQocmVhc29uLCBXVEZNb3Zl KGRldGFpbHNVcGRhdGUuZXJyb3IpLCBXVEZNb3ZlKGRldGFpbHNVcGRhdGUuc2hpcHBpbmdBZGRy ZXNzRXJyb3JzKSwgV1RGTW92ZShkZXRhaWxzVXBkYXRlLnBheWVyRXJyb3JzKSwgZGV0YWlsc1Vw ZGF0ZS5wYXltZW50TWV0aG9kRXJyb3JzLmdldCgpKTsKICAgICBpZiAocmVzdWx0Lmhhc0V4Y2Vw dGlvbigpKSB7CiAgICAgICAgIGFib3J0V2l0aEV4Y2VwdGlvbihyZXN1bHQucmVsZWFzZUV4Y2Vw dGlvbigpKTsKICAgICAgICAgcmV0dXJuOwpAQCAtNzE1LDcgKzcwNiw4IEBAIHZvaWQgUGF5bWVu dFJlcXVlc3Q6OmFjY2VwdChjb25zdCBTdHJpbmcmIG1ldGhvZE5hbWUsIFBheW1lbnRSZXNwb25z ZTo6RGV0YWlsc0Z1CiB2b2lkIFBheW1lbnRSZXF1ZXN0Ojpjb21wbGV0ZShzdGQ6Om9wdGlvbmFs PFBheW1lbnRDb21wbGV0ZT4mJiByZXN1bHQpCiB7CiAgICAgQVNTRVJUKG1fc3RhdGUgPT0gU3Rh dGU6OkNsb3NlZCk7Ci0gICAgc3RkOjpleGNoYW5nZShtX2FjdGl2ZVBheW1lbnRIYW5kbGVyLCBu dWxscHRyKS0+Y29tcGxldGUoV1RGTW92ZShyZXN1bHQpKTsKKyAgICBhY3RpdmVQYXltZW50SGFu ZGxlcigpLT5jb21wbGV0ZShXVEZNb3ZlKHJlc3VsdCkpOworICAgIG1fYWN0aXZlUGF5bWVudEhh bmRsZXIgPSBzdGQ6Om51bGxvcHQ7CiB9CiAKIHZvaWQgUGF5bWVudFJlcXVlc3Q6OmNhbmNlbCgp CkBAIC03MjMsNyArNzE1LDcgQEAgdm9pZCBQYXltZW50UmVxdWVzdDo6Y2FuY2VsKCkKICAgICBp ZiAobV9zdGF0ZSAhPSBTdGF0ZTo6SW50ZXJhY3RpdmUpCiAgICAgICAgIHJldHVybjsKIAotICAg IG1fYWN0aXZlUGF5bWVudEhhbmRsZXIgPSBudWxscHRyOworICAgIG1fYWN0aXZlUGF5bWVudEhh bmRsZXIgPSBzdGQ6Om51bGxvcHQ7CiAKICAgICBpZiAobV9pc1VwZGF0aW5nKSB7CiAgICAgICAg IG1faXNDYW5jZWxQZW5kaW5nID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvcGF5bWVudHJlcXVlc3QvUGF5bWVudFJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvcGF5bWVudHJlcXVlc3QvUGF5bWVudFJlcXVlc3QuaAppbmRleCA0ZTAxNTVjZTRjZTYy YjYzYTgwYThiZGZiYzFmOWI3NTU3ZmYzZDYyLi5hY2JjYmY0YjY3NmUzMzk5NDJiMjk2OWRhN2E0 MDI5NjkyNWMxNWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3BheW1lbnRy ZXF1ZXN0L1BheW1lbnRSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wYXlt ZW50cmVxdWVzdC9QYXltZW50UmVxdWVzdC5oCkBAIC0xMDYsMTEgKzEwNiwxNyBAQCBwcml2YXRl OgogICAgICAgICBTdHJpbmcgc2VyaWFsaXplZERhdGE7CiAgICAgfTsKIAorICAgIHN0cnVjdCBQ YXltZW50SGFuZGxlcldpdGhQZW5kaW5nQWN0aXZpdHkgeworICAgICAgICBSZWY8UGF5bWVudEhh bmRsZXI+IHBheW1lbnRIYW5kbGVyOworICAgICAgICBSZWY8UGVuZGluZ0FjdGl2aXR5PFBheW1l bnRSZXF1ZXN0Pj4gcGVuZGluZ0FjdGl2aXR5OworICAgIH07CisKICAgICBQYXltZW50UmVxdWVz dChEb2N1bWVudCYsIFBheW1lbnRPcHRpb25zJiYsIFBheW1lbnREZXRhaWxzSW5pdCYmLCBWZWN0 b3I8U3RyaW5nPiYmIHNlcmlhbGl6ZWRNb2RpZmllckRhdGEsIFZlY3RvcjxNZXRob2Q+JiYgc2Vy aWFsaXplZE1ldGhvZERhdGEsIFN0cmluZyYmIHNlbGVjdGVkU2hpcHBpbmdPcHRpb24pOwogCiAg ICAgdm9pZCBzZXR0bGVEZXRhaWxzUHJvbWlzZShVcGRhdGVSZWFzb24pOwogICAgIHZvaWQgd2hl bkRldGFpbHNTZXR0bGVkKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiYmKTsKICAgICB2b2lkIGFib3J0 V2l0aEV4Y2VwdGlvbihFeGNlcHRpb24mJik7CisgICAgUGF5bWVudEhhbmRsZXIqIGFjdGl2ZVBh eW1lbnRIYW5kbGVyKCkgeyByZXR1cm4gbV9hY3RpdmVQYXltZW50SGFuZGxlciA/IG1fYWN0aXZl UGF5bWVudEhhbmRsZXItPnBheW1lbnRIYW5kbGVyLnB0cigpIDogbnVsbHB0cjsgfQogCiAgICAg Ly8gQWN0aXZlRE9NT2JqZWN0CiAgICAgY29uc3QgY2hhciogYWN0aXZlRE9NT2JqZWN0TmFtZSgp IGNvbnN0IGZpbmFsIHsgcmV0dXJuICJQYXltZW50UmVxdWVzdCI7IH0KQEAgLTEzMiw3ICsxMzgs NyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxQYXltZW50QWRkcmVzcz4gbV9zaGlwcGluZ0FkZHJl c3M7CiAgICAgU3RhdGUgbV9zdGF0ZSB7IFN0YXRlOjpDcmVhdGVkIH07CiAgICAgc3RkOjpvcHRp b25hbDxTaG93UHJvbWlzZT4gbV9zaG93UHJvbWlzZTsKLSAgICBSZWZQdHI8UGF5bWVudEhhbmRs ZXI+IG1fYWN0aXZlUGF5bWVudEhhbmRsZXI7CisgICAgc3RkOjpvcHRpb25hbDxQYXltZW50SGFu ZGxlcldpdGhQZW5kaW5nQWN0aXZpdHk+IG1fYWN0aXZlUGF5bWVudEhhbmRsZXI7CiAgICAgUmVm UHRyPERPTVByb21pc2U+IG1fZGV0YWlsc1Byb21pc2U7CiAgICAgUmVmUHRyPERPTVByb21pc2U+ IG1fbWVyY2hhbnRTZXNzaW9uUHJvbWlzZTsKICAgICBib29sIG1faXNVcGRhdGluZyB7IGZhbHNl IH07Cg==