136243 2014-08-25 19:21:22 -0700 [iOS WK2] Provide a delegate callback to skip Geolocation authorization per page for WebApp 2014-08-27 14:50:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue dev+webkit sam oldest_to_newest 1031291 0 benjamin 2014-08-25 19:21:22 -0700 [iOS WK2] Provide a delegate callback to skip Geolocation authorization per page for WebApp 1031292 1 237126 benjamin 2014-08-25 19:23:32 -0700 Created attachment 237126 Patch 1031293 2 commit-queue 2014-08-25 19:25:45 -0700 Attachment 237126 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm:187: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm:188: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1031790 3 237126 benjamin 2014-08-27 14:50:06 -0700 Comment on attachment 237126 Patch Clearing flags on attachment: 237126 Committed r173019: <http://trac.webkit.org/changeset/173019> 1031791 4 benjamin 2014-08-27 14:50:09 -0700 All reviewed patches have been landed. Closing bug. 237126 2014-08-25 19:23:32 -0700 2014-08-27 14:50:06 -0700 Patch bug-136243-20140825192240.patch text/plain 13930 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyOTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDk3MmYxNTA2YzgyNzBi YjdkY2ZlNzViOWY4ZDlhMDhhNjVlZjU4OS4uOTUyOWRjZGQ4N2NmYmMzNDY1ZTljYTNlNjE4MzJk YjU3MjM2ZTA2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA4LTI1ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBQ cm92aWRlIGEgZGVsZWdhdGUgY2FsbGJhY2sgdG8gc2tpcCBHZW9sb2NhdGlvbiBhdXRob3JpemF0 aW9uIHBlciBwYWdlIGZvciBXZWJBcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNjI0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEp1c3QgYXNrIHRoZSBVSSBpZiB0aGUgYXV0aG9yaXphdGlvbiBkaWFs b2cgbmVlZHMgdG8gYmUgc2tpcHBlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tVSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdh dGVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5t bToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmRlY2lkZVBvbGljeUZvckdlb2xv Y2F0aW9uUGVybWlzc2lvblJlcXVlc3QpOgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblJlcXVl c3RGcm9tT3JpZ2luOmZyYW1lOnJlcXVlc3Q6XSk6IERlbGV0ZWQuCisgICAgICAgIFRoZSBjb2Rl IGluIFdLQ29udGVudFZpZXcgb25seSBleGlzdHMgZHVlIHRvIGxlZ2FjeS4gSW5zdGVhZCwgdGhl IFBhZ2VDbGllbnQgZGlzcGF0Y2ggdGhlIHJlcXVlc3QKKyAgICAgICAgdG8gdGhlIEdlb2xvY2F0 aW9uUHJvdmlkZXIgZGlyZWN0bHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLR2VvbG9j YXRpb25Qcm92aWRlcklPUy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tHZW9sb2NhdGlv blByb3ZpZGVySU9TLm1tOgorICAgICAgICAoLVtXS0dlb2xvY2F0aW9uUHJvdmlkZXJJT1MgZGVj aWRlUG9saWN5Rm9yR2VvbG9jYXRpb25SZXF1ZXN0RnJvbU9yaWdpbjpmcmFtZTpyZXF1ZXN0OnZp ZXc6XSk6CisgICAgICAgICgtW1dLR2VvbG9jYXRpb25Qcm92aWRlcklPUyBnZW9sb2NhdGlvbkF1 dGhvcml6YXRpb25HcmFudGVkXSk6CisgICAgICAgICgtW1dLR2VvbG9jYXRpb25Qcm92aWRlcklP UyBwb3NpdGlvbkNoYW5nZWQ6XSk6CisgICAgICAgICgtW1dLR2VvbG9jYXRpb25Qcm92aWRlcklP UyBkZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblJlcXVlc3RGcm9tT3JpZ2luOmZyYW1lOnJlcXVl c3Q6d2luZG93Ol0pOiBEZWxldGVkLgorCiAyMDE0LTA4LTI1ICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbG9hZCBzY2hlZHVsaW5nIGNvZGUgZnJv bSBuZXR3b3JrIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tVSURlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLVUlEZWxlZ2F0ZS5oCmluZGV4IDA5ZDE0MTg5ZTNiMWY1N2Y5YzlhZjQzZjRkZjRlMmRh ZjA5NmI0YjMuLjRjMTlmNmJlZGJjYjdhZWJjZjMxN2E3ZjJkMTUwMmFjNzRjYjcyNWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGUuaApA QCAtMzAsNiArMzAsNyBAQAogI2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CiAKIEBj bGFzcyBXS0ZyYW1lSW5mbzsKK0BjbGFzcyBXS05hdmlnYXRpb25BY3Rpb247CiBAY2xhc3MgV0tX ZWJWaWV3Q29uZmlndXJhdGlvbjsKIEBjbGFzcyBXS1dpbmRvd0ZlYXR1cmVzOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZh dGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJp dmF0ZS5oCmluZGV4IDcxYjBjMGNhNWRlNDFmYzBkYWYzODA1NGVmODM1ZGVmYTBmMGUyYzUuLmE0 YWY5ZThjMzNkYTVjZTQyZTE3MDc5MTc1ZmY0NzUzNGQ4MzhkODggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5o CkBAIC00OCw2ICs0OCw3IEBACiAtIChOU0FycmF5ICopX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdl YlZpZXcgYWN0aW9uc0ZvckVsZW1lbnQ6KF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICopZWxlbWVu dCBkZWZhdWx0QWN0aW9uczooTlNBcnJheSAqKWRlZmF1bHRBY3Rpb25zOwogLSAodm9pZClfd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWROb3RIYW5kbGVUYXBBc0NsaWNrQXRQb2ludDoo Q0dQb2ludClwb2ludDsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgdXNl c01pbmltYWxVSTooQk9PTCl3YW50TWluaW1hbFVJOworLSAoYm9vbClfd2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldyBzaG91bGRSZXF1ZXN0R2VvbG9jYXRpb25BdXRob3JpemF0aW9uRm9yVVJM OihOU1VSTCAqKXVybCBpc01haW5GcmFtZTooQk9PTClpc01haW5GcmFtZSBtYWluRnJhbWVVUkw6 KE5TVVJMICopbWFpbkZyYW1lVVJMOwogI2VuZGlmCiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCmluZGV4IGE3NTBmZDZkOTU3 OTMzMTMxZWIxNDMwZGUxY2QyMTE1ODcwMmRiZDUuLjc1NmM2MDc0NDg1NzQ5NDVjMzNmMmFmMzhj NTQxMWEzN2YzMGVmYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv UGFnZUNsaWVudEltcGxJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Q YWdlQ2xpZW50SW1wbElPUy5tbQpAQCAtMzgsNiArMzgsOCBAQAogI2ltcG9ydCAiVmlld1NuYXBz aG90U3RvcmUuaCIKICNpbXBvcnQgIldLQ29udGVudFZpZXcuaCIKICNpbXBvcnQgIldLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5oIgorI2ltcG9ydCAiV0tHZW9sb2NhdGlvblByb3ZpZGVySU9TLmgi CisjaW1wb3J0ICJXS1Byb2Nlc3NQb29sSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLV2ViVmlld0Nv bmZpZ3VyYXRpb25JbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXZWJWaWV3Q29udGVudFByb3ZpZGVy UmVnaXN0cnkuaCIKICNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgiCkBAIC0yMjgsNyArMjMw LDcgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6dG9vbFRpcENoYW5nZWQoY29uc3QgU3RyaW5nJiwg Y29uc3QgU3RyaW5nJikKIAogYm9vbCBQYWdlQ2xpZW50SW1wbDo6ZGVjaWRlUG9saWN5Rm9yR2Vv bG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdChXZWJGcmFtZVByb3h5JiBmcmFtZSwgV2ViU2VjdXJp dHlPcmlnaW4mIG9yaWdpbiwgR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByb3h5JiByZXF1 ZXN0KQogewotICAgIFttX2NvbnRlbnRWaWV3IF9kZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblJl cXVlc3RGcm9tT3JpZ2luOm9yaWdpbiBmcmFtZTpmcmFtZSByZXF1ZXN0OnJlcXVlc3RdOworICAg IFtbd3JhcHBlcihtX3dlYlZpZXctPl9wYWdlLT5wcm9jZXNzKCkuY29udGV4dCgpKSBfZ2VvbG9j YXRpb25Qcm92aWRlcl0gZGVjaWRlUG9saWN5Rm9yR2VvbG9jYXRpb25SZXF1ZXN0RnJvbU9yaWdp bjpvcmlnaW4uc2VjdXJpdHlPcmlnaW4oKSBmcmFtZTpmcmFtZSByZXF1ZXN0OnJlcXVlc3Qgdmll dzptX3dlYlZpZXddOwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oCmluZGV4IGE3YWM3NjlkNzA3MjBmMTNhMjk4NjUy OWVlZGI2OWM1MjI1ZmVlNTcuLmNiN2UwOWM1MWUwNzY1MzZkN2RlMjMyZmI4ZmFjY2Y0ZjhjNjUz NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll dy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oCkBA IC04NSw4ICs4NSw2IEBAIHN0cnVjdCBXZWJQYWdlQ29uZmlndXJhdGlvbjsKIC0gKHZvaWQpX2Rp ZENvbW1pdExvYWRGb3JNYWluRnJhbWU7CiAtICh2b2lkKV9kaWRDb21taXRMYXllclRyZWU6KGNv bnN0IFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKWxheWVyVHJlZVRyYW5zYWN0 aW9uOwogCi0tICh2b2lkKV9kZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblJlcXVlc3RGcm9tT3Jp Z2luOihXZWJLaXQ6OldlYlNlY3VyaXR5T3JpZ2luJilvcmlnaW4gZnJhbWU6KFdlYktpdDo6V2Vi RnJhbWVQcm94eSYpZnJhbWUgcmVxdWVzdDooV2ViS2l0OjpHZW9sb2NhdGlvblBlcm1pc3Npb25S ZXF1ZXN0UHJveHkmKXBlcm1pc3Npb25SZXF1ZXN0OwotCiAtICh2b2lkKV9zZXRBY2Nlc3NpYmls aXR5V2ViUHJvY2Vzc1Rva2VuOihOU0RhdGEgKilkYXRhOwogCiAtIChCT09MKV9zY3JvbGxUb1Jl Y3Q6KENHUmVjdCl0YXJnZXRSZWN0IHdpdGhPcmlnaW46KENHUG9pbnQpb3JpZ2luIG1pbmltdW1T Y3JvbGxEaXN0YW5jZTooQ0dGbG9hdCltaW5pbXVtU2Nyb2xsRGlzdGFuY2U7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggYTA4ODdmZjcyNDNl MzcxZjZmZmE4ZjA3NmY5ZTkzZjA2YjJjYWVjZS4uYzNhNjVhMjkzODUzZjQ5ODQ1ZjRiYjFkMzUz MDdiMzllMzkyMmViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlldy5tbQpAQCAtMzQsMTEgKzM0LDkgQEAKICNpbXBvcnQgIlNtYXJ0TWFnbmlmaWNhdGlv bkNvbnRyb2xsZXIuaCIKICNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckludGVy bmFsLmgiCiAjaW1wb3J0ICJXS0Jyb3dzaW5nQ29udGV4dEdyb3VwUHJpdmF0ZS5oIgotI2ltcG9y dCAiV0tHZW9sb2NhdGlvblByb3ZpZGVySU9TLmgiCiAjaW1wb3J0ICJXS0luc3BlY3RvckhpZ2hs aWdodFZpZXcuaCIKICNpbXBvcnQgIldLUHJlZmVyZW5jZXNJbnRlcm5hbC5oIgogI2ltcG9ydCAi V0tQcm9jZXNzR3JvdXBQcml2YXRlLmgiCi0jaW1wb3J0ICJXS1Byb2Nlc3NQb29sSW50ZXJuYWwu aCIKICNpbXBvcnQgIldLV2ViVmlld0NvbmZpZ3VyYXRpb24uaCIKICNpbXBvcnQgIldLV2ViVmll d0ludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJDb250ZXh0LmgiCkBAIC00NzMsMTEgKzQ3MSw2IEBA IHByaXZhdGU6CiAgICAgW19yb290Q29udGVudFZpZXcgYWRkU3Vidmlldzpyb290Vmlld107CiB9 CiAKLS0gKHZvaWQpX2RlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUmVxdWVzdEZyb21PcmlnaW46 KFdlYlNlY3VyaXR5T3JpZ2luJilvcmlnaW4gZnJhbWU6KFdlYkZyYW1lUHJveHkmKWZyYW1lIHJl cXVlc3Q6KEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94eSYpcGVybWlzc2lvblJlcXVl c3QKLXsKLSAgICBbW3dyYXBwZXIoX3BhZ2UtPnByb2Nlc3MoKS5jb250ZXh0KCkpIF9nZW9sb2Nh dGlvblByb3ZpZGVyXSBkZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblJlcXVlc3RGcm9tT3JpZ2lu OnRvQVBJKCZvcmlnaW4pIGZyYW1lOnRvQVBJKCZmcmFtZSkgcmVxdWVzdDp0b0FQSSgmcGVybWlz c2lvblJlcXVlc3QpIHdpbmRvdzpbc2VsZiB3aW5kb3ddXTsKLX0KLQogLSAoQk9PTClfc2Nyb2xs VG9SZWN0OihDR1JlY3QpdGFyZ2V0UmVjdCB3aXRoT3JpZ2luOihDR1BvaW50KW9yaWdpbiBtaW5p bXVtU2Nyb2xsRGlzdGFuY2U6KENHRmxvYXQpbWluaW11bVNjcm9sbERpc3RhbmNlCiB7CiAgICAg cmV0dXJuIFtfd2ViVmlldyBfc2Nyb2xsVG9SZWN0OnRhcmdldFJlY3Qgb3JpZ2luOm9yaWdpbiBt aW5pbXVtU2Nyb2xsRGlzdGFuY2U6bWluaW11bVNjcm9sbERpc3RhbmNlXTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tHZW9sb2NhdGlvblByb3ZpZGVySU9TLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLR2VvbG9jYXRpb25Qcm92aWRlcklPUy5o CmluZGV4IDAwNmI1YjdiZTQ3MzdkNjExMDg4ZjRlYWI3ODU1NDU0MjAxOWQ0NzYuLjkxNzdiOTJj OWQ5NjAyMjJlNGIwODcxNzQwOWU2YjZhYmMyNTlhMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9pb3MvV0tHZW9sb2NhdGlvblByb3ZpZGVySU9TLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0dlb2xvY2F0aW9uUHJvdmlkZXJJT1MuaApAQCAtMSw1 ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyLCAyMDE0IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjksMTQg KzI5LDIwIEBACiAjaW1wb3J0IDxXZWJLaXQvV0tCYXNlLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQg eworY2xhc3MgR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByb3h5OwogY2xhc3MgV2ViQ29u dGV4dDsKK2NsYXNzIFdlYkZyYW1lUHJveHk7CiB9CiAKLUBjbGFzcyBVSVdpbmRvdzsKK25hbWVz cGFjZSBXZWJDb3JlIHsKK2NsYXNzIFNlY3VyaXR5T3JpZ2luOworfQorCitAY2xhc3MgV0tXZWJW aWV3OwogCiBAaW50ZXJmYWNlIFdLR2VvbG9jYXRpb25Qcm92aWRlcklPUyA6IE5TT2JqZWN0CiAt KGlkKWluaXRXaXRoQ29udGV4dDooV2ViS2l0OjpXZWJDb250ZXh0Kiljb250ZXh0OwotLSh2b2lk KWRlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUmVxdWVzdEZyb21PcmlnaW46KFdLU2VjdXJpdHlP cmlnaW5SZWYpb3JpZ2luIGZyYW1lOihXS0ZyYW1lUmVmKWZyYW1lIHJlcXVlc3Q6KFdLR2VvbG9j YXRpb25QZXJtaXNzaW9uUmVxdWVzdFJlZilwZXJtaXNzaW9uUmVxdWVzdCB3aW5kb3c6KFVJV2lu ZG93Kil3aW5kb3c7CistKHZvaWQpZGVjaWRlUG9saWN5Rm9yR2VvbG9jYXRpb25SZXF1ZXN0RnJv bU9yaWdpbjooV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4mKW9yaWdpbiBmcmFtZTooV2ViS2l0OjpX ZWJGcmFtZVByb3h5JilmcmFtZSByZXF1ZXN0OihXZWJLaXQ6Okdlb2xvY2F0aW9uUGVybWlzc2lv blJlcXVlc3RQcm94eSYpcGVybWlzc2lvblJlcXVlc3QgdmlldzooV0tXZWJWaWV3Kil2aWV3Owog QGVuZAogCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XS0dlb2xvY2F0aW9uUHJvdmlkZXJJT1MubW0gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLR2VvbG9jYXRpb25Qcm92aWRlcklPUy5tbQppbmRleCA0Njdk MDZjMjkzMTMwNmU1YzE0Zjk4ZTE0NWRhNWFmZmMxYjRhZTAwLi41NjRiY2M3NjIwM2VmOTE5MDNm NTNiNzVkNjJhYjAxMTJhNDY5MWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLR2VvbG9jYXRpb25Qcm92aWRlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1dLR2VvbG9jYXRpb25Qcm92aWRlcklPUy5tbQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyLTIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOSwxMiArMjks MTQgQEAKICNpZiBQTEFURk9STShJT1MpCiAKICNpbXBvcnQgIkdlb2xvY2F0aW9uUGVybWlzc2lv blJlcXVlc3RQcm94eS5oIgorI2ltcG9ydCAiV0tVSURlbGVnYXRlUHJpdmF0ZS5oIgorI2ltcG9y dCAiV0tXZWJWaWV3LmgiCiAjaW1wb3J0ICJXZWJDb250ZXh0LmgiCiAjaW1wb3J0ICJXZWJHZW9s b2NhdGlvbk1hbmFnZXJQcm94eS5oIgogI2ltcG9ydCAiV2ViU2VjdXJpdHlPcmlnaW4uaCIKICNp bXBvcnQgPFdlYkdlb2xvY2F0aW9uUG9zaXRpb24uaD4KICNpbXBvcnQgPFdlYkNvcmUvR2VvbG9j YXRpb25Qb3NpdGlvbi5oPgotI2ltcG9ydCA8V2ViS2l0L1dLR2VvbG9jYXRpb25QZXJtaXNzaW9u UmVxdWVzdC5oPgorI2ltcG9ydCA8V2ViQ29yZS9VUkwuaD4KICNpbXBvcnQgPHd0Zi9Bc3NlcnRp b25zLmg+CiAjaW1wb3J0IDx3dGYvUGFzc1JlZlB0ci5oPgogI2ltcG9ydCA8d3RmL1JlZlB0ci5o PgpAQCAtNDUsNiArNDcsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dlYkdlb2xvY2F0aW9uQ29yZUxv Y2F0aW9uUHJvdmlkZXIuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJBbGxvd0RlbnlQb2xpY3lMaXN0 ZW5lci5oPgogCit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJL aXQ7CiAKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNoCkBAIC01OSwxNCArNjIsMTQgQEAg dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIEBlbmQKIAogbmFtZXNwYWNlIFdlYktpdCB7Ci12b2lk IGRlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUmVxdWVzdEZyb21PcmlnaW4oV2ViQ29yZTo6U2Vj dXJpdHlPcmlnaW4qLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZywgaWQ8V2ViQWxsb3dEZW55UG9s aWN5TGlzdGVuZXI+LCBVSVdpbmRvdyopOwordm9pZCBkZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlv blJlcXVlc3RGcm9tT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiB1cmxTdHJp bmcsIGlkPFdlYkFsbG93RGVueVBvbGljeUxpc3RlbmVyPiwgVUlXaW5kb3cqKTsKIH07CiAKIHN0 cnVjdCBHZW9sb2NhdGlvblJlcXVlc3REYXRhIHsKLSAgICBSZWZQdHI8V2ViQ29yZTo6U2VjdXJp dHlPcmlnaW4+IG9yaWdpbjsKKyAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG9yaWdpbjsKICAg ICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gZnJhbWU7CiAgICAgUmVmUHRyPEdlb2xvY2F0aW9uUGVy bWlzc2lvblJlcXVlc3RQcm94eT4gcGVybWlzc2lvblJlcXVlc3Q7Ci0gICAgUmV0YWluUHRyPFVJ V2luZG93PiB3aW5kb3c7CisgICAgUmV0YWluUHRyPFdLV2ViVmlldz4gdmlldzsKIH07CiAKIEBp bXBsZW1lbnRhdGlvbiBXS0dlb2xvY2F0aW9uUHJvdmlkZXJJT1MgewpAQCAtMTUwLDE0ICsxNTMs MTQgQEAgc3RhdGljIHZvaWQgc2V0RW5hYmxlSGlnaEFjY3VyYWN5KFdLR2VvbG9jYXRpb25NYW5h Z2VyUmVmIGdlb2xvY2F0aW9uTWFuYWdlciwgYm8KICAgICByZXR1cm4gc2VsZjsKIH0KIAotLSh2 b2lkKWRlY2lkZVBvbGljeUZvckdlb2xvY2F0aW9uUmVxdWVzdEZyb21PcmlnaW46KFdLU2VjdXJp dHlPcmlnaW5SZWYpb3JpZ2luIGZyYW1lOihXS0ZyYW1lUmVmKWZyYW1lIHJlcXVlc3Q6KFdLR2Vv bG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFJlZilwZXJtaXNzaW9uUmVxdWVzdCB3aW5kb3c6KFVJ V2luZG93Kil3aW5kb3cKKy0odm9pZClkZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblJlcXVlc3RG cm9tT3JpZ2luOihTZWN1cml0eU9yaWdpbiYpb3JpZ2luIGZyYW1lOihXZWJGcmFtZVByb3h5Jilm cmFtZSByZXF1ZXN0OihHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJveHkmKXBlcm1pc3Np b25SZXF1ZXN0IHZpZXc6KFdLV2ViVmlldyopY29udGVudFZpZXcKIHsKICAgICAvLyBTdGVwIDE6 IGFzayB0aGUgdXNlciBpZiB0aGUgYXBwIGNhbiB1c2UgR2VvbG9jYXRpb24uCiAgICAgR2VvbG9j YXRpb25SZXF1ZXN0RGF0YSBnZW9sb2NhdGlvblJlcXVlc3REYXRhOwotICAgIGdlb2xvY2F0aW9u UmVxdWVzdERhdGEub3JpZ2luID0gY29uc3RfY2FzdDxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbio+ KCZ0b0ltcGwob3JpZ2luKS0+c2VjdXJpdHlPcmlnaW4oKSk7Ci0gICAgZ2VvbG9jYXRpb25SZXF1 ZXN0RGF0YS5mcmFtZSA9IHRvSW1wbChmcmFtZSk7Ci0gICAgZ2VvbG9jYXRpb25SZXF1ZXN0RGF0 YS5wZXJtaXNzaW9uUmVxdWVzdCA9IHRvSW1wbChwZXJtaXNzaW9uUmVxdWVzdCk7Ci0gICAgZ2Vv bG9jYXRpb25SZXF1ZXN0RGF0YS53aW5kb3cgPSB3aW5kb3c7CisgICAgZ2VvbG9jYXRpb25SZXF1 ZXN0RGF0YS5vcmlnaW4gPSAmb3JpZ2luOworICAgIGdlb2xvY2F0aW9uUmVxdWVzdERhdGEuZnJh bWUgPSAmZnJhbWU7CisgICAgZ2VvbG9jYXRpb25SZXF1ZXN0RGF0YS5wZXJtaXNzaW9uUmVxdWVz dCA9ICZwZXJtaXNzaW9uUmVxdWVzdDsKKyAgICBnZW9sb2NhdGlvblJlcXVlc3REYXRhLnZpZXcg PSBjb250ZW50VmlldzsKICAgICBfcmVxdWVzdHNXYWl0aW5nRm9yQ29yZUxvY2F0aW9uQXV0aG9y aXphdGlvbi5hcHBlbmQoZ2VvbG9jYXRpb25SZXF1ZXN0RGF0YSk7CiAgICAgW19jb3JlTG9jYXRp b25Qcm92aWRlciByZXF1ZXN0R2VvbG9jYXRpb25BdXRob3JpemF0aW9uXTsKIH0KQEAgLTE3Miw4 ICsxNzUsMjUgQEAgc3RhdGljIHZvaWQgc2V0RW5hYmxlSGlnaEFjY3VyYWN5KFdLR2VvbG9jYXRp b25NYW5hZ2VyUmVmIGdlb2xvY2F0aW9uTWFuYWdlciwgYm8KICAgICAvLyBTdGVwIDI6IGFzayB0 aGUgdXNlciBpZiB0aGUgdGhpcyBwYXJ0aWN1bGFyIHBhZ2UgY2FuIHVzZSBnZWxvY2F0aW9uLgog ICAgIFZlY3RvcjxHZW9sb2NhdGlvblJlcXVlc3REYXRhPiByZXF1ZXN0cyA9IFdURjo6bW92ZShf cmVxdWVzdHNXYWl0aW5nRm9yQ29yZUxvY2F0aW9uQXV0aG9yaXphdGlvbik7CiAgICAgZm9yIChj b25zdCBhdXRvJiByZXF1ZXN0IDogcmVxdWVzdHMpIHsKLSAgICAgICAgUmV0YWluUHRyPFdLV2Vi QWxsb3dEZW55UG9saWN5TGlzdGVuZXI+IHBvbGljeUxpc3RlbmVyID0gYWRvcHROUyhbW1dLV2Vi QWxsb3dEZW55UG9saWN5TGlzdGVuZXIgYWxsb2NdIGluaXRXaXRoUGVybWlzc2lvblJlcXVlc3RQ cm94eTpyZXF1ZXN0LnBlcm1pc3Npb25SZXF1ZXN0LmdldCgpXSk7Ci0gICAgICAgIGRlY2lkZVBv bGljeUZvckdlb2xvY2F0aW9uUmVxdWVzdEZyb21PcmlnaW4ocmVxdWVzdC5vcmlnaW4uZ2V0KCks IHJlcXVlc3QuZnJhbWUtPnVybCgpLCBwb2xpY3lMaXN0ZW5lci5nZXQoKSwgcmVxdWVzdC53aW5k b3cuZ2V0KCkpOworICAgICAgICBib29sIHJlcXVpcmVzVXNlckF1dGhvcml6YXRpb24gPSB0cnVl OworCisgICAgICAgIGlkPFdLVUlEZWxlZ2F0ZVByaXZhdGU+IHVpRGVsZWdhdGUgPSBzdGF0aWNf Y2FzdDxpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4+KFtyZXF1ZXN0LnZpZXcgVUlEZWxlZ2F0ZV0p OworICAgICAgICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihf d2ViVmlldzpzaG91bGRSZXF1ZXN0R2VvbG9jYXRpb25BdXRob3JpemF0aW9uRm9yVVJMOmlzTWFp bkZyYW1lOm1haW5GcmFtZVVSTDopXSkgeworICAgICAgICAgICAgY29uc3QgV2ViRnJhbWVQcm94 eSogbWFpbkZyYW1lID0gcmVxdWVzdC5mcmFtZS0+cGFnZSgpLT5tYWluRnJhbWUoKTsKKyAgICAg ICAgICAgIGJvb2wgaXNNYWluRnJhbWUgPSByZXF1ZXN0LmZyYW1lID09IG1haW5GcmFtZTsKKyAg ICAgICAgICAgIFVSTCByZXF1ZXN0RnJhbWVVUkwoVVJMKCksIHJlcXVlc3QuZnJhbWUtPnVybCgp KTsKKyAgICAgICAgICAgIFVSTCBtYWluRnJhbWVVUkwoVVJMKCksIG1haW5GcmFtZS0+dXJsKCkp OworICAgICAgICAgICAgcmVxdWlyZXNVc2VyQXV0aG9yaXphdGlvbiA9IFt1aURlbGVnYXRlIF93 ZWJWaWV3OnJlcXVlc3Qudmlldy5nZXQoKQorICAgICAgICAgICAgICAgICBzaG91bGRSZXF1ZXN0 R2VvbG9jYXRpb25BdXRob3JpemF0aW9uRm9yVVJMOnJlcXVlc3RGcmFtZVVSTAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlzTWFpbkZyYW1lOmlzTWFp bkZyYW1lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt YWluRnJhbWVVUkw6bWFpbkZyYW1lVVJMXTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChyZXF1 aXJlc1VzZXJBdXRob3JpemF0aW9uKSB7CisgICAgICAgICAgICBSZXRhaW5QdHI8V0tXZWJBbGxv d0RlbnlQb2xpY3lMaXN0ZW5lcj4gcG9saWN5TGlzdGVuZXIgPSBhZG9wdE5TKFtbV0tXZWJBbGxv d0RlbnlQb2xpY3lMaXN0ZW5lciBhbGxvY10gaW5pdFdpdGhQZXJtaXNzaW9uUmVxdWVzdFByb3h5 OnJlcXVlc3QucGVybWlzc2lvblJlcXVlc3QuZ2V0KCldKTsKKyAgICAgICAgICAgIGRlY2lkZVBv bGljeUZvckdlb2xvY2F0aW9uUmVxdWVzdEZyb21PcmlnaW4ocmVxdWVzdC5vcmlnaW4uZ2V0KCks IHJlcXVlc3QuZnJhbWUtPnVybCgpLCBwb2xpY3lMaXN0ZW5lci5nZXQoKSwgW3JlcXVlc3Qudmll dyB3aW5kb3ddKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICByZXF1ZXN0LnBlcm1pc3Np b25SZXF1ZXN0LT5hbGxvdygpOwogICAgIH0KIH0KIApAQCAtMTg0LDcgKzIwNCw3IEBAIHN0YXRp YyB2b2lkIHNldEVuYWJsZUhpZ2hBY2N1cmFjeShXS0dlb2xvY2F0aW9uTWFuYWdlclJlZiBnZW9s b2NhdGlvbk1hbmFnZXIsIGJvCiAgICAgICAgIHJlcXVlc3REYXRhLnBlcm1pc3Npb25SZXF1ZXN0 LT5kZW55KCk7CiB9CiAKLS0gKHZvaWQpcG9zaXRpb25DaGFuZ2VkOihXZWJDb3JlOjpHZW9sb2Nh dGlvblBvc2l0aW9uKilwb3NpdGlvbgorLSAodm9pZClwb3NpdGlvbkNoYW5nZWQ6KEdlb2xvY2F0 aW9uUG9zaXRpb24qKXBvc2l0aW9uCiB7CiAgICAgX2xhc3RBY3RpdmVQb3NpdGlvbiA9IFdlYkdl b2xvY2F0aW9uUG9zaXRpb246OmNyZWF0ZShwb3NpdGlvbi0+dGltZXN0YW1wKCksIHBvc2l0aW9u LT5sYXRpdHVkZSgpLCBwb3NpdGlvbi0+bG9uZ2l0dWRlKCksIHBvc2l0aW9uLT5hY2N1cmFjeSgp LCBwb3NpdGlvbi0+Y2FuUHJvdmlkZUFsdGl0dWRlKCksIHBvc2l0aW9uLT5hbHRpdHVkZSgpLCBw b3NpdGlvbi0+Y2FuUHJvdmlkZUFsdGl0dWRlQWNjdXJhY3koKSwgcG9zaXRpb24tPmFsdGl0dWRl QWNjdXJhY3koKSwgcG9zaXRpb24tPmNhblByb3ZpZGVIZWFkaW5nKCksIHBvc2l0aW9uLT5oZWFk aW5nKCksIHBvc2l0aW9uLT5jYW5Qcm92aWRlU3BlZWQoKSwgcG9zaXRpb24tPnNwZWVkKCkpOwog ICAgIF9nZW9sb2NhdGlvbk1hbmFnZXItPnByb3ZpZGVyRGlkQ2hhbmdlUG9zaXRpb24oX2xhc3RB Y3RpdmVQb3NpdGlvbi5nZXQoKSk7Cg==