169393 2017-03-08 16:26:01 -0800 Clean up WebPaymentCoordinatorProxy 2017-03-08 16:43:36 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1285083 0 andersca 2017-03-08 16:26:01 -0800 Clean up WebPaymentCoordinatorProxy 1285085 1 303863 andersca 2017-03-08 16:26:47 -0800 Created attachment 303863 Patch 1285097 2 andersca 2017-03-08 16:43:36 -0800 Committed r213609: <http://trac.webkit.org/changeset/213609> 303863 2017-03-08 16:26:47 -0800 2017-03-08 16:34:20 -0800 Patch bug-169393-20170308162647.patch text/plain 6214 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjRkNjBmNjE0NGFhMjE3 NGQ3OWJkNGVmZDE1ZjE1M2I2Y2RmYzI5YS4uZWM1ODRlNTg5NDBmMGE0ODJmNGY5MGQxMDRmNGRm Yzk5OTYzNTIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE3LTAzLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgV2Vi UGF5bWVudENvb3JkaW5hdG9yUHJveHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2OTM5MworICAgICAgICBQYXJ0IG9mIHJkYXI6Ly9wcm9ibGVtLzI4 ODgwNzE0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FwcGxlUGF5L2NvY29hL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Q29j b2EubW06CisgICAgICAgICgtW1dLUGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlckRl bGVnYXRlIHBheW1lbnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xsZXJEaWRGaW5pc2g6XSk6Cisg ICAgICAgIE1vdmUgdGhpcyB0byB3aGVyZSBpdCBiZWxvbmdzLgorCisgICAgICAgIChXZWJLaXQ6 OnRvUEtQYXltZW50U3VtbWFyeUl0ZW1zKToKKyAgICAgICAgQWRkIGEgbmV3IGhlbHBlciBmdW5j dGlvbi4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eTo6cGxh dGZvcm1Db21wbGV0ZVNoaXBwaW5nTWV0aG9kU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnBsYXRmb3JtQ29tcGxldGVTaGlwcGluZ0NvbnRh Y3RTZWxlY3Rpb24pOgorICAgICAgICBVc2UgdGhlIG5ldyBoZWxwZXIgZnVuY3Rpb24uCisKKzIw MTctMDMtMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAg ICBTaW1wbGlmeSB0aGUgUGF5bWVudENvb3JkaW5hdG9yIGludGVyZmFjZQogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MzgyCiAgICAgICAgIFBhcnQg b2YgcmRhcjovL3Byb2JsZW0vMjg4ODA3MTQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQXBwbGVQYXkvY29jb2EvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsZVBheS9jb2NvYS9XZWJQYXltZW50Q29v cmRpbmF0b3JQcm94eUNvY29hLm1tCmluZGV4IGYxODhjN2FkYmQzZDJiOWUxNjk2NmFhMmQ4YmMz YjEzYjcxN2ZhNzAuLjY5MjVmMzczMGZmYTM0OWRkYmFlZTFiN2ExODczOWIyOTBhNTMzZGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsZVBheS9jb2NvYS9XZWJQYXlt ZW50Q29vcmRpbmF0b3JQcm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BcHBsZVBheS9jb2NvYS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eUNvY29hLm1tCkBAIC0x MjIsMTcgKzEyMiw2IEBAIFNPRlRfTElOS19GVU5DVElPTl9NQVlfRkFJTF9GT1JfU09VUkNFKFdl YktpdCwgUGFzc0tpdCwgUEtDYW5NYWtlUGF5bWVudHNXaXRoTWVyCiAgICAgX3dlYlBheW1lbnRD b29yZGluYXRvclByb3h5LT5kaWRBdXRob3JpemVQYXltZW50KFdlYkNvcmU6OlBheW1lbnQocGF5 bWVudCkpOwogfQogCi0tICh2b2lkKXBheW1lbnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xsZXJE aWRGaW5pc2g6KFBLUGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlciAqKWNvbnRyb2xs ZXIKLXsKLSAgICBpZiAoIV93ZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgaWYgKCFfZGlkUmVhY2hGaW5hbFN0YXRlKQotICAgICAgICBfd2ViUGF5bWVu dENvb3JkaW5hdG9yUHJveHktPmRpZENhbmNlbFBheW1lbnQoKTsKLQotICAgIF93ZWJQYXltZW50 Q29vcmRpbmF0b3JQcm94eS0+aGlkZVBheW1lbnRVSSgpOwotfQotCiBzdGF0aWMgV2ViQ29yZTo6 UGF5bWVudFJlcXVlc3Q6OlNoaXBwaW5nTWV0aG9kIHRvU2hpcHBpbmdNZXRob2QoUEtTaGlwcGlu Z01ldGhvZCAqc2hpcHBpbmdNZXRob2QpCiB7CiAgICAgQVNTRVJUKHNoaXBwaW5nTWV0aG9kKTsK QEAgLTE4Myw2ICsxNzIsMTcgQEAgc3RhdGljIFdlYkNvcmU6OlBheW1lbnRSZXF1ZXN0OjpTaGlw cGluZ01ldGhvZCB0b1NoaXBwaW5nTWV0aG9kKFBLU2hpcHBpbmdNZXRob2QKICAgICBfd2ViUGF5 bWVudENvb3JkaW5hdG9yUHJveHktPmRpZFNlbGVjdFBheW1lbnRNZXRob2QoV2ViQ29yZTo6UGF5 bWVudE1ldGhvZChwYXltZW50TWV0aG9kKSk7CiB9CiAKKy0gKHZvaWQpcGF5bWVudEF1dGhvcml6 YXRpb25WaWV3Q29udHJvbGxlckRpZEZpbmlzaDooUEtQYXltZW50QXV0aG9yaXphdGlvblZpZXdD b250cm9sbGVyICopY29udHJvbGxlcgoreworICAgIGlmICghX3dlYlBheW1lbnRDb29yZGluYXRv clByb3h5KQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIV9kaWRSZWFjaEZpbmFsU3RhdGUp CisgICAgICAgIF93ZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS0+ZGlkQ2FuY2VsUGF5bWVudCgp OworCisgICAgX3dlYlBheW1lbnRDb29yZGluYXRvclByb3h5LT5oaWRlUGF5bWVudFVJKCk7Cit9 CisKIEBlbmQKIAogLy8gRklYTUU6IE9uY2UgcmRhcjovL3Byb2JsZW0vMjQ0MjAwMjQgaGFzIGJl ZW4gZml4ZWQsIGltcG9ydCBQS1BheW1lbnRSZXF1ZXN0X1ByaXZhdGUuaCBpbnN0ZWFkLgpAQCAt Mjc0LDYgKzI3NCwyMCBAQCBzdGF0aWMgUmV0YWluUHRyPFBLUGF5bWVudFN1bW1hcnlJdGVtPiB0 b1BLUGF5bWVudFN1bW1hcnlJdGVtKGNvbnN0IFdlYkNvcmU6OlBheQogICAgIHJldHVybiBbZ2V0 UEtQYXltZW50U3VtbWFyeUl0ZW1DbGFzcygpIHN1bW1hcnlJdGVtV2l0aExhYmVsOmxpbmVJdGVt LmxhYmVsIGFtb3VudDp0b0RlY2ltYWxOdW1iZXIobGluZUl0ZW0uYW1vdW50LnZhbHVlX29yKDAp KS5nZXQoKSB0eXBlOnRvUEtQYXltZW50U3VtbWFyeUl0ZW1UeXBlKGxpbmVJdGVtLnR5cGUpXTsK IH0KIAorc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiB0b1BLUGF5bWVudFN1bW1hcnlJdGVtcyhj b25zdCBXZWJDb3JlOjpQYXltZW50UmVxdWVzdDo6VG90YWxBbmRMaW5lSXRlbXMmIHRvdGFsQW5k TGluZUl0ZW1zKQoreworICAgIGF1dG8gcGF5bWVudFN1bW1hcnlJdGVtcyA9IGFkb3B0TlMoW1tO U011dGFibGVBcnJheSBhbGxvY10gaW5pdF0pOworICAgIGZvciAoYXV0byYgbGluZUl0ZW0gOiB0 b3RhbEFuZExpbmVJdGVtcy5saW5lSXRlbXMpIHsKKyAgICAgICAgaWYgKGF1dG8gc3VtbWFyeUl0 ZW0gPSB0b1BLUGF5bWVudFN1bW1hcnlJdGVtKGxpbmVJdGVtKSkKKyAgICAgICAgICAgIFtwYXlt ZW50U3VtbWFyeUl0ZW1zIGFkZE9iamVjdDpzdW1tYXJ5SXRlbS5nZXQoKV07CisgICAgfQorCisg ICAgaWYgKGF1dG8gdG90YWxJdGVtID0gdG9QS1BheW1lbnRTdW1tYXJ5SXRlbSh0b3RhbEFuZExp bmVJdGVtcy50b3RhbCkpCisgICAgICAgIFtwYXltZW50U3VtbWFyeUl0ZW1zIGFkZE9iamVjdDp0 b3RhbEl0ZW0uZ2V0KCldOworCisgICAgcmV0dXJuIHBheW1lbnRTdW1tYXJ5SXRlbXM7Cit9CisK IHN0YXRpYyBQS01lcmNoYW50Q2FwYWJpbGl0eSB0b1BLTWVyY2hhbnRDYXBhYmlsaXRpZXMoY29u c3QgV2ViQ29yZTo6UGF5bWVudFJlcXVlc3Q6Ok1lcmNoYW50Q2FwYWJpbGl0aWVzJiBtZXJjaGFu dENhcGFiaWxpdGllcykKIHsKICAgICBQS01lcmNoYW50Q2FwYWJpbGl0eSByZXN1bHQgPSAwOwpA QCAtNDc5LDE4ICs0OTMsOCBAQCB2b2lkIFdlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0 Zm9ybUNvbXBsZXRlU2hpcHBpbmdNZXRob2RTZWxlY3Rpb24oY29uc3QgcwogCiAgICAgYXV0byBz dGF0dXMgPSB1cGRhdGUgPyB1cGRhdGUtPnN0YXR1cyA6IFdlYkNvcmU6OlBheW1lbnRBdXRob3Jp emF0aW9uU3RhdHVzOjpTdWNjZXNzOwogCi0gICAgaWYgKHVwZGF0ZSkgewotICAgICAgICBhdXRv IHBheW1lbnRTdW1tYXJ5SXRlbXMgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGlu aXRdKTsKLSAgICAgICAgZm9yIChhdXRvJiBsaW5lSXRlbSA6IHVwZGF0ZS0+bmV3VG90YWxBbmRM aW5lSXRlbXMubGluZUl0ZW1zKSB7Ci0gICAgICAgICAgICBpZiAoYXV0byBzdW1tYXJ5SXRlbSA9 IHRvUEtQYXltZW50U3VtbWFyeUl0ZW0obGluZUl0ZW0pKQotICAgICAgICAgICAgICAgIFtwYXlt ZW50U3VtbWFyeUl0ZW1zIGFkZE9iamVjdDpzdW1tYXJ5SXRlbS5nZXQoKV07Ci0gICAgICAgIH0K LQotICAgICAgICBpZiAoYXV0byB0b3RhbEl0ZW0gPSB0b1BLUGF5bWVudFN1bW1hcnlJdGVtKHVw ZGF0ZS0+bmV3VG90YWxBbmRMaW5lSXRlbXMudG90YWwpKQotICAgICAgICAgICAgW3BheW1lbnRT dW1tYXJ5SXRlbXMgYWRkT2JqZWN0OnRvdGFsSXRlbS5nZXQoKV07Ci0KLSAgICAgICAgbV9wYXlt ZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9wYXltZW50U3VtbWFyeUl0 ZW1zID0gV1RGTW92ZShwYXltZW50U3VtbWFyeUl0ZW1zKTsKLSAgICB9CisgICAgaWYgKHVwZGF0 ZSkKKyAgICAgICAgbV9wYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUt Pl9wYXltZW50U3VtbWFyeUl0ZW1zID0gdG9QS1BheW1lbnRTdW1tYXJ5SXRlbXModXBkYXRlLT5u ZXdUb3RhbEFuZExpbmVJdGVtcyk7CiAKICAgICBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0Nv bnRyb2xsZXJEZWxlZ2F0ZS0+X2RpZFNlbGVjdFNoaXBwaW5nTWV0aG9kQ29tcGxldGlvbih0b1BL UGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXMoc3RhdHVzKSwgbV9wYXltZW50QXV0aG9yaXphdGlv blZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9wYXltZW50U3VtbWFyeUl0ZW1zLmdldCgpKTsKICAg ICBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZS0+X2RpZFNlbGVj dFNoaXBwaW5nTWV0aG9kQ29tcGxldGlvbiA9IG51bGxwdHI7CkBAIC01MDQsMTYgKzUwOCw3IEBA IHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnBsYXRmb3JtQ29tcGxldGVTaGlwcGlu Z0NvbnRhY3RTZWxlY3Rpb24oY29uc3QKICAgICBhdXRvIHN0YXR1cyA9IHVwZGF0ZSA/IHVwZGF0 ZS0+c3RhdHVzIDogV2ViQ29yZTo6UGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXM6OlN1Y2Nlc3M7 CiAKICAgICBpZiAodXBkYXRlKSB7Ci0gICAgICAgIGF1dG8gcGF5bWVudFN1bW1hcnlJdGVtcyA9 IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdF0pOwotICAgICAgICBmb3IgKGF1 dG8mIGxpbmVJdGVtIDogdXBkYXRlLT5uZXdUb3RhbEFuZExpbmVJdGVtcy5saW5lSXRlbXMpIHsK LSAgICAgICAgICAgIGlmIChhdXRvIHN1bW1hcnlJdGVtID0gdG9QS1BheW1lbnRTdW1tYXJ5SXRl bShsaW5lSXRlbSkpCi0gICAgICAgICAgICAgICAgW3BheW1lbnRTdW1tYXJ5SXRlbXMgYWRkT2Jq ZWN0OnN1bW1hcnlJdGVtLmdldCgpXTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChhdXRvIHRv dGFsSXRlbSA9IHRvUEtQYXltZW50U3VtbWFyeUl0ZW0odXBkYXRlLT5uZXdUb3RhbEFuZExpbmVJ dGVtcy50b3RhbCkpCi0gICAgICAgICAgICBbcGF5bWVudFN1bW1hcnlJdGVtcyBhZGRPYmplY3Q6 dG90YWxJdGVtLmdldCgpXTsKLQotICAgICAgICBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0Nv bnRyb2xsZXJEZWxlZ2F0ZS0+X3BheW1lbnRTdW1tYXJ5SXRlbXMgPSBXVEZNb3ZlKHBheW1lbnRT dW1tYXJ5SXRlbXMpOworICAgICAgICBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xs ZXJEZWxlZ2F0ZS0+X3BheW1lbnRTdW1tYXJ5SXRlbXMgPSB0b1BLUGF5bWVudFN1bW1hcnlJdGVt cyh1cGRhdGUtPm5ld1RvdGFsQW5kTGluZUl0ZW1zKTsKIAogICAgICAgICBhdXRvIHNoaXBwaW5n TWV0aG9kcyA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdF0pOwogICAgICAg ICBmb3IgKGF1dG8mIHNoaXBwaW5nTWV0aG9kIDogdXBkYXRlLT5uZXdTaGlwcGluZ01ldGhvZHMp Cg==