130569 2014-03-21 00:49:05 -0700 Add callbacks in WebKit2 Cocoa API for page load testing 2014-03-21 10:56:28 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psolanki psolanki andersca commit-queue psolanki sam oldest_to_newest 992954 0 psolanki 2014-03-21 00:49:05 -0700 Add callbacks in WebKit2 Cocoa API for page load testing 992956 1 227392 psolanki 2014-03-21 00:53:01 -0700 Created attachment 227392 Patch 993173 2 227392 andersca 2014-03-21 10:13:54 -0700 Comment on attachment 227392 Patch OK. 993204 3 227392 commit-queue 2014-03-21 10:56:26 -0700 Comment on attachment 227392 Patch Clearing flags on attachment: 227392 Committed r166075: <http://trac.webkit.org/changeset/166075> 993205 4 commit-queue 2014-03-21 10:56:28 -0700 All reviewed patches have been landed. Closing bug. 227392 2014-03-21 00:53:01 -0700 2014-03-21 10:56:26 -0700 Patch bug-130569-20140321005239.patch text/plain 10521 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTFkOTBiMWJlMjZhYzYw NTNlYjEyZmVmN2NlYjZmMDBhOGEyOTQxOC4uMWQ2ZmExNTk4NDM0M2E1MDgyNDhkZDBkODVmMzMz MjQ4OWQzNTQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAzLTIxICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgY2FsbGJhY2tz IGluIFdlYktpdDIgQ29jb2EgQVBJIGZvciBwYWdlIGxvYWQgdGVzdGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNTY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUuaDoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tOgorICAgICAgICAoZGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0Rm9yRnJhbWUpOgorICAgICAgICAoZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9y RnJhbWUpOgorICAgICAgICAoc2V0VXBQYWdlTG9hZGVyQ2xpZW50KToKKyAgICAgICAgKHdpbGxT ZW5kUmVxdWVzdEZvckZyYW1lKToKKyAgICAgICAgKGRpZEluaXRpYXRlTG9hZEZvclJlc291cmNl KToKKyAgICAgICAgKGRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSk6CisgICAgICAgIChkaWRGYWls TG9hZEZvclJlc291cmNlKToKKyAgICAgICAgKHNldFVwUmVzb3VyY2VMb2FkQ2xpZW50KToKKwog MjAxNC0wMy0yMCAgSHlvd29uIEtpbSAgPGh3MTAwOC5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAg ICAgTW92ZSB0byB1c2luZyBzdGQ6OnVuaXF1ZV9wdHIgZm9yIEVGTCBvYmplY3RzLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2Ev V0tXZWJQcm9jZXNzUGx1Z0luTG9hZERlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdh dGUuaAppbmRleCBjODYzMGViY2ZiZGM0MTQwNzZiZmE0ZTJiYmYzODgzYzZlZDBiMGVhLi5hOTA1 ZDk1ZWRjOTA5YjEyZjJmY2E1Yzg2NGUyN2Y2N2MwZmIyODNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQ bHVnSW5Mb2FkRGVsZWdhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUuaApAQCAt NDIsMTMgKzQyLDE5IEBACiAtICh2b2lkKXdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENv bnRyb2xsZXI6KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciopY29u dHJvbGxlciBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWU6KFdLV2ViUHJvY2Vzc1Bs dWdJbkZyYW1lICopZnJhbWU7CiAtICh2b2lkKXdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4 dENvbnRyb2xsZXI6KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciop Y29udHJvbGxlciBnbG9iYWxPYmplY3RJc0F2YWlsYWJsZUZvckZyYW1lOihXS1dlYlByb2Nlc3NQ bHVnSW5GcmFtZSAqKWZyYW1lIGluU2NyaXB0V29ybGQ6KFdLV2ViUHJvY2Vzc1BsdWdJblNjcmlw dFdvcmxkICopc2NyaXB0V29ybGQ7CiAtICh2b2lkKXdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29u dGV4dENvbnRyb2xsZXI6KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxl ciAqKWNvbnRyb2xsZXIgZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5OihXS1dlYlByb2Nlc3NQ bHVnSW5GcmFtZSAqKWZyYW1lOworLSAodm9pZCl3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRl eHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIg Kiljb250cm9sbGVyIGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lOihXS1dlYlByb2Nlc3NQ bHVnSW5GcmFtZSAqKWZyYW1lOwogCiAvLyBMYXlvdXQKIC0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJ bkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRl eHRDb250cm9sbGVyKiljb250cm9sbGVyIGRpZExheW91dEZvckZyYW1lOihXS1dlYlByb2Nlc3NQ bHVnSW5GcmFtZSAqKWZyYW1lOwogLSAodm9pZCl3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRl eHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIq KWNvbnRyb2xsZXIgcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U6KFdLUmVuZGVyaW5nUHJvZ3Jl c3NFdmVudHMpZXZlbnRzOworLSAodm9pZCl3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRD b250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIqKWNv bnRyb2xsZXIgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWU6KFdLV2ViUHJv Y2Vzc1BsdWdJbkZyYW1lICopZnJhbWU7CiAKIC8vIFJlc291cmNlIGxvYWRpbmcKIAogLSAoTlNV UkxSZXF1ZXN0ICopd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tX ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY29udHJvbGxlciBmcmFt ZTooV0tXZWJQcm9jZXNzUGx1Z0luRnJhbWUgKilmcmFtZSB3aWxsU2VuZFJlcXVlc3Q6KE5TVVJM UmVxdWVzdCAqKXJlcXVlc3QgcmVkaXJlY3RSZXNwb25zZTooTlNVUkxSZXNwb25zZSAqKXJlZGly ZWN0UmVzcG9uc2U7CiAKKy0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29u dHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY29u dHJvbGxlciBmcmFtZTooV0tXZWJQcm9jZXNzUGx1Z0luRnJhbWUgKilmcmFtZSBkaWRJbml0aWF0 ZUxvYWRGb3JSZXNvdXJjZToodWludDY0X3QpcmVzb3VyY2UgcmVxdWVzdDooTlNVUkxSZXF1ZXN0 ICopcmVxdWVzdDsKKy0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJv bGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY29udHJv bGxlciBmcmFtZTooV0tXZWJQcm9jZXNzUGx1Z0luRnJhbWUgKilmcmFtZSBkaWRGaW5pc2hMb2Fk Rm9yUmVzb3VyY2U6KHVpbnQ2NF90KXJlc291cmNlOworLSAodm9pZCl3ZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4 dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGZyYW1lOihXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZSAq KWZyYW1lIGRpZEZhaWxMb2FkRm9yUmVzb3VyY2U6KHVpbnQ2NF90KXJlc291cmNlIGVycm9yOihO U0Vycm9yICopZXJyb3I7CisKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29u dGV4dENvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1t CmluZGV4IGZjNThhNjUwNTgxMDAxM2E2ZGVjZGZmOTA2NTVhYmY2MzlhZDE4OTUuLjQ0Yzk4ZGJk MzViMmM3ZTBhNjRiOGI5ZmJiOGQ5NDMwODNhOTcyNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5C cm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0 Q29udHJvbGxlci5tbQpAQCAtMTU0LDYgKzE1NCwyMyBAQCBzdGF0aWMgdm9pZCBkaWRMYXlvdXQo V0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLTGF5b3V0TWlsZXN0b25lcyBtaWxlc3RvbmVzLCBXS1R5 cAogICAgICAgICBbbG9hZERlbGVnYXRlIHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENv bnRyb2xsZXI6cGx1Z2luQ29udGV4dENvbnRyb2xsZXIgcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFu Z2U6cmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMobWlsZXN0b25lcyldOwogfQogCitzdGF0aWMgdm9p ZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYg cGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmKiB1c2VyRGF0YSwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbykKK3sKKyAgICBXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4 dENvbnRyb2xsZXIgKnBsdWdpbkNvbnRleHRDb250cm9sbGVyID0gKFdLV2ViUHJvY2Vzc1BsdWdJ bkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAqKWNsaWVudEluZm87CisgICAgYXV0byBsb2FkRGVs ZWdhdGUgPSBwbHVnaW5Db250ZXh0Q29udHJvbGxlci0+X2xvYWREZWxlZ2F0ZS5nZXQoKTsKKwor ICAgIGlmIChbbG9hZERlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViUHJv Y2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRGb3JGcmFtZTopXSkKKyAgICAgICAgW2xvYWREZWxlZ2F0ZSB3ZWJQcm9jZXNzUGx1 Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOnBsdWdpbkNvbnRleHRDb250cm9sbGVyIGRpZEZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lOndyYXBwZXIoKnRvSW1wbChmcmFtZSkp XTsKK30KKworc3RhdGljIHZvaWQgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUoV0tCdW5k bGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pCit7CisgICAgV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVy ICpwbHVnaW5Db250ZXh0Q29udHJvbGxlciA9IChXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29u dGV4dENvbnRyb2xsZXIgKiljbGllbnRJbmZvOworICAgIGF1dG8gbG9hZERlbGVnYXRlID0gcGx1 Z2luQ29udGV4dENvbnRyb2xsZXItPl9sb2FkRGVsZWdhdGUuZ2V0KCk7CisKKyAgICBpZiAoW2xv YWREZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlByb2Nlc3NQbHVnSW5C cm93c2VyQ29udGV4dENvbnRyb2xsZXI6ZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU6KV0p CisgICAgICAgIFtsb2FkRGVsZWdhdGUgd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29u dHJvbGxlcjpwbHVnaW5Db250ZXh0Q29udHJvbGxlciBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JG cmFtZTp3cmFwcGVyKCp0b0ltcGwoZnJhbWUpKV07Cit9CiBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VM b2FkZXJDbGllbnQoV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICpj b250ZXh0Q29udHJvbGxlciwgV2ViUGFnZSYgcGFnZSkKIHsKICAgICBXS0J1bmRsZVBhZ2VMb2Fk ZXJDbGllbnRWNyBjbGllbnQ7CkBAIC0xNjksNiArMTg2LDggQEAgc3RhdGljIHZvaWQgc2V0VXBQ YWdlTG9hZGVyQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxl ciAqY28KICAgICBjbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0gZGlkRmluaXNoTG9hZEZv ckZyYW1lOwogICAgIGNsaWVudC5nbG9iYWxPYmplY3RJc0F2YWlsYWJsZUZvckZyYW1lID0gZ2xv YmFsT2JqZWN0SXNBdmFpbGFibGVGb3JGcmFtZTsKICAgICBjbGllbnQuZGlkUmVtb3ZlRnJhbWVG cm9tSGllcmFyY2h5ID0gZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5OworICAgIGNsaWVudC5k aWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZSA9IGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZy YW1lOworICAgIGNsaWVudC5kaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSA9 IGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lOwogCiAgICAgY2xpZW50LmRp ZExheW91dEZvckZyYW1lID0gZGlkTGF5b3V0Rm9yRnJhbWU7CiAgICAgY2xpZW50LmRpZExheW91 dCA9IGRpZExheW91dDsKQEAgLTE3Niw3ICsxOTUsNyBAQCBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VM b2FkZXJDbGllbnQoV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICpj bwogICAgIHBhZ2UuaW5pdGlhbGl6ZUluamVjdGVkQnVuZGxlTG9hZGVyQ2xpZW50KCZjbGllbnQu YmFzZSk7CiB9CiAKLXN0YXRpYyBXS1VSTFJlcXVlc3RSZWYgd2lsbFNlbmRSZXF1ZXN0Rm9yRnJh bWUoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIHVpbnQ2NF90 LCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tVUkxSZXNwb25zZVJlZiByZWRpcmVjdFJlc3Bv bnNlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIFdLVVJMUmVxdWVzdFJlZiB3aWxs U2VuZFJlcXVlc3RGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYgZnJh bWUsIHVpbnQ2NF90LCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tVUkxSZXNwb25zZVJlZiBy ZWRpcmVjdFJlc3BvbnNlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIFdLV2ViUHJv Y2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAqcGx1Z2luQ29udGV4dENvbnRyb2xs ZXIgPSAoV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY2xpZW50 SW5mbzsKICAgICBhdXRvIGxvYWREZWxlZ2F0ZSA9IHBsdWdpbkNvbnRleHRDb250cm9sbGVyLT5f bG9hZERlbGVnYXRlLmdldCgpOwpAQCAtMTk0LDYgKzIxMyw0NCBAQCBzdGF0aWMgV0tVUkxSZXF1 ZXN0UmVmIHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1 bmRsZUZyYQogICAgIHJldHVybiByZXF1ZXN0OwogfQogCitzdGF0aWMgdm9pZCBkaWRJbml0aWF0 ZUxvYWRGb3JSZXNvdXJjZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUs IHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIGJv b2wsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgV0tXZWJQcm9jZXNzUGx1Z0luQnJv d3NlckNvbnRleHRDb250cm9sbGVyICpwbHVnaW5Db250ZXh0Q29udHJvbGxlciA9IChXS1dlYlBy b2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljbGllbnRJbmZvOworICAgIGF1 dG8gbG9hZERlbGVnYXRlID0gcGx1Z2luQ29udGV4dENvbnRyb2xsZXItPl9sb2FkRGVsZWdhdGUu Z2V0KCk7CisKKyAgICBpZiAoW2xvYWREZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6ZnJhbWU6ZGlkSW5p dGlhdGVMb2FkRm9yUmVzb3VyY2U6cmVxdWVzdDopXSkgeworICAgICAgICBbbG9hZERlbGVnYXRl IHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6cGx1Z2luQ29udGV4dENv bnRyb2xsZXIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZyYW1lOndyYXBwZXIoKnRvSW1wbChmcmFtZSkpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZTpyZXNvdXJjZUlk ZW50aWZpZXIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZXF1ZXN0OnRvSW1wbChyZXF1ZXN0KS0+cmVzb3VyY2VSZXF1ZXN0KCkubnNVUkxS ZXF1ZXN0KERvTm90VXBkYXRlSFRUUEJvZHkpXTsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lkIGRp ZEZpbmlzaExvYWRGb3JSZXNvdXJjZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYg ZnJhbWUsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKK3sKKyAgICBXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKnBs dWdpbkNvbnRleHRDb250cm9sbGVyID0gKFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0 Q29udHJvbGxlciAqKWNsaWVudEluZm87CisgICAgYXV0byBsb2FkRGVsZWdhdGUgPSBwbHVnaW5D b250ZXh0Q29udHJvbGxlci0+X2xvYWREZWxlZ2F0ZS5nZXQoKTsKKworICAgIGlmIChbbG9hZERl bGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViUHJvY2Vzc1BsdWdJbkJyb3dz ZXJDb250ZXh0Q29udHJvbGxlcjpmcmFtZTpkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2U6KV0pIHsK KyAgICAgICAgW2xvYWREZWxlZ2F0ZSB3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250 cm9sbGVyOnBsdWdpbkNvbnRleHRDb250cm9sbGVyCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZTp3cmFwcGVyKCp0b0ltcGwoZnJh bWUpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hMb2Fk Rm9yUmVzb3VyY2U6cmVzb3VyY2VJZGVudGlmaWVyXTsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lk IGRpZEZhaWxMb2FkRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmLCBXS0J1bmRsZUZyYW1lUmVm IGZyYW1lLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFdLRXJyb3JSZWYgZXJyb3IsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNv bnRleHRDb250cm9sbGVyICpwbHVnaW5Db250ZXh0Q29udHJvbGxlciA9IChXS1dlYlByb2Nlc3NQ bHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljbGllbnRJbmZvOworICAgIGF1dG8gbG9h ZERlbGVnYXRlID0gcGx1Z2luQ29udGV4dENvbnRyb2xsZXItPl9sb2FkRGVsZWdhdGUuZ2V0KCk7 CisKKyAgICBpZiAoW2xvYWREZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6ZnJhbWU6ZGlkRmFpbExvYWRG b3JSZXNvdXJjZTplcnJvcjopXSkgeworICAgICAgICBbbG9hZERlbGVnYXRlIHdlYlByb2Nlc3NQ bHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6cGx1Z2luQ29udGV4dENvbnRyb2xsZXIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZy YW1lOndyYXBwZXIoKnRvSW1wbChmcmFtZSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZGlkRmFpbExvYWRGb3JSZXNvdXJjZTpyZXNvdXJjZUlkZW50aWZpZXIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVy cm9yOndyYXBwZXIoKnRvSW1wbChlcnJvcikpXTsKKyAgICB9Cit9CisKIHN0YXRpYyB2b2lkIHNl dFVwUmVzb3VyY2VMb2FkQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29u dHJvbGxlciAqY29udGV4dENvbnRyb2xsZXIsIFdlYlBhZ2UmIHBhZ2UpCiB7CiAgICAgV0tCdW5k bGVQYWdlUmVzb3VyY2VMb2FkQ2xpZW50VjEgY2xpZW50OwpAQCAtMjAyLDYgKzI1OSw5IEBAIHN0 YXRpYyB2b2lkIHNldFVwUmVzb3VyY2VMb2FkQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dz ZXJDb250ZXh0Q29udHJvbGxlciAqCiAgICAgY2xpZW50LmJhc2UudmVyc2lvbiA9IDE7CiAgICAg Y2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IGNvbnRleHRDb250cm9sbGVyOwogICAgIGNsaWVudC53 aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSA9IHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lOworICAgIGNs aWVudC5kaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZSA9IGRpZEluaXRpYXRlTG9hZEZvclJlc291 cmNlOworICAgIGNsaWVudC5kaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UgPSBkaWRGaW5pc2hMb2Fk Rm9yUmVzb3VyY2U7CisgICAgY2xpZW50LmRpZEZhaWxMb2FkRm9yUmVzb3VyY2UgPSBkaWRGYWls TG9hZEZvclJlc291cmNlOwogCiAgICAgcGFnZS5pbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVSZXNv dXJjZUxvYWRDbGllbnQoJmNsaWVudC5iYXNlKTsKIH0K