142060 2015-02-26 14:56:35 -0800 Add API to remove all website data for the given data records 2015-02-26 15:34:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin commit-queue japhet oldest_to_newest 1072501 0 andersca 2015-02-26 14:56:35 -0800 Add API to remove all website data for the given data records 1072511 1 247453 andersca 2015-02-26 15:19:52 -0800 Created attachment 247453 Patch 1072515 2 commit-queue 2015-02-26 15:23:29 -0800 Attachment 247453 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:334: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:337: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:362: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h:62: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1072523 3 247453 thorton 2015-02-26 15:31:41 -0800 Comment on attachment 247453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247453&action=review > Source/WebCore/ChangeLog:10 > + New function that removes resources all resources that match the set of origins in a given session. Some kind of typo in the middle of this sentence. > Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:108 > + no blank line here 1072525 4 247453 bdakin 2015-02-26 15:32:23 -0800 Comment on attachment 247453 Patch Listen to thorton!!! 1072526 5 andersca 2015-02-26 15:34:33 -0800 Committed r180706: <http://trac.webkit.org/changeset/180706> 247453 2015-02-26 15:19:52 -0800 2015-02-26 15:32:23 -0800 Patch bug-142060-20150226151939.patch text/plain 12940 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmUzNWNhZmMwZmJhOWQw NTBhZjdjM2ExNTg4ZjdmNjEzOGFiNDI1OC4uOTk2YTdmODJhODc3NGYxM2M3NjAzYzBlMTM1NzQx ODE0N2YzZWY2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTAyLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEFQSSB0byBy ZW1vdmUgYWxsIHdlYnNpdGUgZGF0YSBmb3IgdGhlIGdpdmVuIGRhdGEgcmVjb3JkcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMDYwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUv TWVtb3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJlbW92ZVJl c291cmNlc1dpdGhPcmlnaW5zKToKKyAgICAgICAgTmV3IGZ1bmN0aW9uIHRoYXQgcmVtb3ZlcyBy ZXNvdXJjZXMgYWxsIHJlc291cmNlcyB0aGF0IG1hdGNoIHRoZSBzZXQgb2Ygb3JpZ2lucyBpbiBh IGdpdmVuIHNlc3Npb24uCisKIDIwMTUtMDItMjYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBh cHBsZS5jb20+CiAKICAgICAgICAgW1dpbl0gTWFrZSBidWlsZCBsb2dzIG1vcmUgbGVnaWJsZSBi eSByZWR1Y2luZyBub2lzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGQ1OTI4NGM3M2Y0NzY5YzcyN2QxOWY3NGJj Y2I4MWIwMmJjNDRmYjIuLjM2NzQ1MmI1MGNlNTdjODlkY2NkN2FhZTkwMjJkZDhiMTcyNmJkMzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxNS0wMi0yNiAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBBUEkgdG8gcmVtb3ZlIGFsbCB3 ZWJzaXRlIGRhdGEgZm9yIHRoZSBnaXZlbiBkYXRhIHJlY29yZHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjA2MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tX ZWJzaXRlRGF0YVN0b3JlLmg6CisgICAgICAgIEFkZCBuZXcgbWV0aG9kIGRlY2xhcmF0aW9uLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgor ICAgICAgICAodG9XZWJzaXRlRGF0YVJlY29yZHMpOgorICAgICAgICBBZGQgYSBoZWxwZXIgZnVu Y3Rpb24gdGhhdCBjb252ZXJ0cyBhbiBOU0FycmF5IG9mIF9XS1dlYnNpdGVEYXRhUmVjb3JkcyB0 byBhIFZlY3RvciBvZiBXZWJzaXRlRGF0YVJlY29yZHMuCisKKyAgICAgICAgKC1bX1dLV2Vic2l0 ZURhdGFTdG9yZSByZW1vdmVEYXRhT2ZUeXBlczpmb3JEYXRhUmVjb3Jkczpjb21wbGV0aW9uSGFu ZGxlcjpdKToKKyAgICAgICAgQ2FsbCB0aHJvdWdoIHRvIHRoZSB1bmRlcmx5aW5nIFdlYnNpdGVE YXRhU3RvcmUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEp OgorICAgICAgICBGaWd1cmUgb3V0IHdoaWNoIHByb2Nlc3NlcyB0byBjYWxsIGRlbGV0ZVdlYnNp dGVEYXRhRm9yT3JpZ2lucyBmb3IgYW5kIGRvIHNvLiBBZGQgYSBjYWxsYmFjayBhZ2dyZWdhdG9y IHNvIHdlIGNhbgorICAgICAgICBjYWxsIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgYXQgdGhlIHJp Z2h0IHRpbWUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5oOgorICAgICAgICBBZGQgbmV3IG1lbWJlcnMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpkZWxldGVXZWJz aXRlRGF0YUZvck9yaWdpbnMpOgorICAgICAgICBVc2UgdGhlIG5ld2x5IGFkZGVkIE1lbW9yeUNh Y2hlIG1lbWJlciBmdW5jdGlvbiB0byBkZWxldGUgYWxsIHJlc291cmNlcyBtYXRjaGluZyB0aGUg c2V0IG9mIG9yaWdpbnMuCisKIDIwMTUtMDItMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgKHVudXNlZCBmb3Igbm93KSBjb2RlIHRvIGRlbGV0 ZSB3ZWJzaXRlIGRhdGEgZm9yIGEgc2V0IG9mIG9yaWdpbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCmluZGV4IDhlYWFiNzRiMGE4YzE2N2E5ZTViNzllZmZk ZjdmYzQzOGM1OTA5ZWQuLjVmMzc2ZDRjNjNjNTc5ZDIwMGU4YzQ5YmYzNjliZDNjOGIwNDEwMTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcApAQCAtNTQz LDYgKzU0MywzOSBAQCB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVSZXNvdXJjZXNXaXRoT3JpZ2lu KFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4pCiAgICAgICAgIHJlbW92ZSgqcmVzb3VyY2UpOwogfQog Cit2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVSZXNvdXJjZXNXaXRoT3JpZ2lucyhTZXNzaW9uSUQg c2Vzc2lvbklELCBjb25zdCBIYXNoU2V0PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+JiBvcmlnaW5z KQoreworICAgIGF1dG8qIHJlc291cmNlTWFwID0gc2Vzc2lvblJlc291cmNlTWFwKHNlc3Npb25J RCk7CisgICAgaWYgKCFyZXNvdXJjZU1hcCkKKyAgICAgICAgcmV0dXJuOworCisjaWYgRU5BQkxF KENBQ0hFX1BBUlRJVElPTklORykKKyAgICBIYXNoU2V0PFN0cmluZz4gb3JpZ2luUGFydGl0aW9u czsKKworICAgIGZvciAoYXV0byYgb3JpZ2luIDogb3JpZ2lucykKKyAgICAgICAgb3JpZ2luUGFy dGl0aW9ucy5hZGQoUmVzb3VyY2VSZXF1ZXN0OjpwYXJ0aXRpb25OYW1lKG9yaWdpbi0+aG9zdCgp KSk7CisjZW5kaWYKKworICAgIFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+IHJlc291cmNlc1RvUmVt b3ZlOworICAgIGZvciAoYXV0byYga2V5VmFsdWVQYWlyIDogKnJlc291cmNlTWFwKSB7CisgICAg ICAgIGF1dG8mIHJlc291cmNlID0gKmtleVZhbHVlUGFpci52YWx1ZTsKKworI2lmIEVOQUJMRShD QUNIRV9QQVJUSVRJT05JTkcpCisgICAgICAgIGF1dG8mIHBhcnRpdGlvbk5hbWUgPSBrZXlWYWx1 ZVBhaXIua2V5LnNlY29uZDsKKyAgICAgICAgaWYgKG9yaWdpblBhcnRpdGlvbnMuY29udGFpbnMo cGFydGl0aW9uTmFtZSkpIHsKKyAgICAgICAgICAgIHJlc291cmNlc1RvUmVtb3ZlLmFwcGVuZCgm cmVzb3VyY2UpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyNlbmRpZgorCisg ICAgICAgIGlmIChvcmlnaW5zLmNvbnRhaW5zKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocmVzb3Vy Y2UudXJsKCkpLnB0cigpKSkKKyAgICAgICAgICAgIHJlc291cmNlc1RvUmVtb3ZlLmFwcGVuZCgm cmVzb3VyY2UpOworICAgIH0KKworICAgIGZvciAoYXV0byYgcmVzb3VyY2UgOiByZXNvdXJjZXNU b1JlbW92ZSkKKyAgICAgICAgcmVtb3ZlKCpyZXNvdXJjZSk7Cit9CisKIHZvaWQgTWVtb3J5Q2Fj aGU6OmdldE9yaWdpbnNXaXRoQ2FjaGUoU2VjdXJpdHlPcmlnaW5TZXQmIG9yaWdpbnMpCiB7CiAj aWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKQEAgLTU2OCw3ICs2MDEsNiBAQCBIYXNoU2V0 PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IE1lbW9yeUNhY2hlOjpvcmlnaW5zV2l0aENhY2hlKFNl c3Npb25JRCBzZXNzaW9uSQogCiAgICAgYXV0byBpdCA9IG1fc2Vzc2lvblJlc291cmNlcy5maW5k KHNlc3Npb25JRCk7CiAgICAgaWYgKGl0ICE9IG1fc2Vzc2lvblJlc291cmNlcy5lbmQoKSkgewot CiAgICAgICAgIGZvciAoYXV0byYga2V5VmFsdWUgOiAqaXQtPnZhbHVlKSB7CiAgICAgICAgICAg ICBhdXRvJiByZXNvdXJjZSA9ICprZXlWYWx1ZS52YWx1ZTsKICNpZiBFTkFCTEUoQ0FDSEVfUEFS VElUSU9OSU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9y eUNhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaAppbmRl eCBhZWU2NTY4Y2IyYTAyNzhkMGE5YjIzMzk0NjIyZDMwODJkMWY1YTY0Li43Njc0MjQyMTliZGUx MmMzZTE4MGFkZjJiMDJmZjAwMGJkMjgwODQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvTWVtb3J5Q2FjaGUuaApAQCAtMTQ3LDYgKzE0Nyw3IEBAIHB1YmxpYzoKIAogICAgIHR5cGVk ZWYgSGFzaFNldDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiBTZWN1cml0eU9yaWdpblNldDsKICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlbW92ZVJlc291cmNlc1dpdGhPcmlnaW4oU2VjdXJpdHlP cmlnaW4mKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlbW92ZVJlc291cmNlc1dpdGhPcmln aW5zKFNlc3Npb25JRCwgY29uc3QgSGFzaFNldDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiYpOwog ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZ2V0T3JpZ2luc1dpdGhDYWNoZShTZWN1cml0eU9yaWdp blNldCYgb3JpZ2lucyk7CiAgICAgV0VCQ09SRV9FWFBPUlQgSGFzaFNldDxSZWZQdHI8U2VjdXJp dHlPcmlnaW4+PiBvcmlnaW5zV2l0aENhY2hlKFNlc3Npb25JRCkgY29uc3Q7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9y ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0 b3JlLmgKaW5kZXggOTJmNTY4NGFhNjI2NGNjZDdhYWMzNGVjYTZlYjU3YmFiZDg2OGU2MC4uYTMx NDk5NDRkOWIzN2JhMTA1NTg2YmJhMjk2NTRmZjEyOGEzNzAyMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLmgK QEAgLTQwLDcgKzQwLDggQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKDEwXzEwLCA4XzApCiAKIEBwcm9w ZXJ0eSAocmVhZG9ubHksIGdldHRlcj1pc05vblBlcnNpc3RlbnQpIEJPT0wgbm9uUGVyc2lzdGVu dDsKIAotLSAodm9pZClmZXRjaERhdGFSZWNvcmRzT2ZUeXBlczooV0tXZWJzaXRlRGF0YVR5cGVz KXdlYnNpdGVEYXRhVHlwZXMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TQXJyYXkgKikp Y29tcGxldGlvbkhhbmRsZXI7CistICh2b2lkKWZldGNoRGF0YVJlY29yZHNPZlR5cGVzOihXS1dl YnNpdGVEYXRhVHlwZXMpd2Vic2l0ZURhdGFUeXBlcyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo XikoTlNBcnJheSAqKSljb21wbGV0aW9uSGFuZGxlciBXS19BVkFJTEFCTEUoV0tfTUFDX1RCQSwg V0tfSU9TX1RCQSk7CistICh2b2lkKXJlbW92ZURhdGFPZlR5cGVzOihXS1dlYnNpdGVEYXRhVHlw ZXMpd2Vic2l0ZURhdGFUeXBlcyBmb3JEYXRhUmVjb3JkczooTlNBcnJheSAqKWRhdGFSZWNvcmRz IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSgpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FWQUlM QUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJBKTsKIC0gKHZvaWQpcmVtb3ZlRGF0YU9mVHlwZXM6 KFdLV2Vic2l0ZURhdGFUeXBlcyl3ZWJzaXRlRGF0YVR5cGVzIG1vZGlmaWVkU2luY2U6KE5TRGF0 ZSAqKWRhdGUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKCkpY29tcGxldGlvbkhhbmRsZXIg V0tfQVZBSUxBQkxFKFdLX01BQ19UQkEsIFdLX0lPU19UQkEpOwogCiBAZW5kCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmUu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3Rv cmUubW0KaW5kZXggN2JkYjlkNjVhMzkxNzBiNTg2MzZmMmRiZWMyMzU5OGEyMmJkN2VlMi4uNGY2 ZTBjMDEzOGY1N2JiZGZlM2ZiOWZhYzEyMDYwOGRlNDk5MTYxOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5t bQpAQCAtOTAsNiArOTAsMjcgQEAgc3RhdGljIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRp bWVfcG9pbnQgdG9TeXN0ZW1DbG9ja1RpbWUoTlNEYXRlICpkYXRlKQogICAgIH0pOwogfQogCitz dGF0aWMgVmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0ZURhdGFSZWNv cmRzKE5TQXJyYXkgKmRhdGFSZWNvcmRzKQoreworICAgIFZlY3RvcjxXZWJLaXQ6OldlYnNpdGVE YXRhUmVjb3JkPiByZXN1bHQ7CisKKyAgICBmb3IgKF9XS1dlYnNpdGVEYXRhUmVjb3JkICpkYXRh UmVjb3JkIGluIGRhdGFSZWNvcmRzKQorICAgICAgICByZXN1bHQuYXBwZW5kKGRhdGFSZWNvcmQt Pl93ZWJzaXRlRGF0YVJlY29yZC0+d2Vic2l0ZURhdGFSZWNvcmQoKSk7CisKKyAgICByZXR1cm4g cmVzdWx0OworfQorCistICh2b2lkKXJlbW92ZURhdGFPZlR5cGVzOihXS1dlYnNpdGVEYXRhVHlw ZXMpd2Vic2l0ZURhdGFUeXBlcyBmb3JEYXRhUmVjb3JkczooTlNBcnJheSAqKWRhdGFSZWNvcmRz IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSgpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAg YXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25IYW5kbGVy KTsKKworICAgIF93ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkucmVtb3ZlRGF0 YShXZWJLaXQ6OnRvV2Vic2l0ZURhdGFUeXBlcyh3ZWJzaXRlRGF0YVR5cGVzKSwgdG9XZWJzaXRl RGF0YVJlY29yZHMoZGF0YVJlY29yZHMpLCBbY29tcGxldGlvbkhhbmRsZXJDb3B5XSB7CisKKyAg ICAgICAgY29tcGxldGlvbkhhbmRsZXJDb3B5KCk7CisgICAgICAgIEJsb2NrX3JlbGVhc2UoY29t cGxldGlvbkhhbmRsZXJDb3B5KTsKKyAgICB9KTsKK30KKwogI3ByYWdtYSBtYXJrIFdLT2JqZWN0 IHByb3RvY29sIGltcGxlbWVudGF0aW9uCiAKIC0gKEFQSTo6T2JqZWN0JilfYXBpT2JqZWN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0 ZURhdGFTdG9yZS5jcHAKaW5kZXggZTllMzZlYmRkNWE1OWQyZDdkNmIzNzRlNmJmZjE3OWQ3MmQ0 Y2ZlZi4uNWY3NDg5NGVkMmVjZjY1YjEyOGZkYjBkZDUzMzNiMmM2MmY3YWQ3MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmNwcApAQCAtMjMzLDcgKzIzMyw2IEBAIHN0YXRpYyBQcm9jZXNzQWNjZXNzVHlwZSBj b21wdXRlV2ViUHJvY2Vzc0FjY2Vzc1R5cGVGb3JEYXRhUmVtb3ZhbChXZWJzaXRlRGF0YVR5CiAg ICAgcmV0dXJuIHByb2Nlc3NBY2Nlc3NUeXBlOwogfQogCi0KIHZvaWQgV2Vic2l0ZURhdGFTdG9y ZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5 c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQg KCk+IGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIHN0cnVjdCBDYWxsYmFja0FnZ3JlZ2F0b3Ig OiBwdWJsaWMgUmVmQ291bnRlZDxDYWxsYmFja0FnZ3JlZ2F0b3I+IHsKQEAgLTMzMiw2ICszMzEs NzUgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMg ZGF0YVR5cGVzLCBzdGQ6OmNocm9ubzo6c3lzdGUKICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmNh bGxJZk5lZWRlZCgpOwogfQogCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vi c2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4m IGRhdGFSZWNvcmRzLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQor eworICAgIHN0cnVjdCBDYWxsYmFja0FnZ3JlZ2F0b3IgOiBwdWJsaWMgUmVmQ291bnRlZDxDYWxs YmFja0FnZ3JlZ2F0b3I+IHsKKyAgICAgICAgZXhwbGljaXQgQ2FsbGJhY2tBZ2dyZWdhdG9yIChz dGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQorICAgICAgICAgICAgOiBj b21wbGV0aW9uSGFuZGxlcihXVEY6Om1vdmUoY29tcGxldGlvbkhhbmRsZXIpKQorICAgICAgICB7 CisgICAgICAgIH0KKworICAgICAgICB2b2lkIGFkZFBlbmRpbmdDYWxsYmFjaygpCisgICAgICAg IHsKKyAgICAgICAgICAgIHBlbmRpbmdDYWxsYmFja3MrKzsKKyAgICAgICAgfQorCisgICAgICAg IHZvaWQgcmVtb3ZlUGVuZGluZ0NhbGxiYWNrKCkKKyAgICAgICAgeworICAgICAgICAgICAgQVNT RVJUKHBlbmRpbmdDYWxsYmFja3MpOworICAgICAgICAgICAgLS1wZW5kaW5nQ2FsbGJhY2tzOwor CisgICAgICAgICAgICBjYWxsSWZOZWVkZWQoKTsKKyAgICAgICAgfQorCisgICAgICAgIHZvaWQg Y2FsbElmTmVlZGVkKCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCFwZW5kaW5nQ2FsbGJh Y2tzKQorICAgICAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChXVEY6Om1vdmUo Y29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAgfQorCisgICAgICAgIHVuc2lnbmVkIHBlbmRp bmdDYWxsYmFja3MgPSAwOworICAgICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRp b25IYW5kbGVyOworICAgIH07CisKKyAgICBSZWZQdHI8Q2FsbGJhY2tBZ2dyZWdhdG9yPiBjYWxs YmFja0FnZ3JlZ2F0b3IgPSBhZG9wdFJlZihuZXcgQ2FsbGJhY2tBZ2dyZWdhdG9yKFdURjo6bW92 ZShjb21wbGV0aW9uSGFuZGxlcikpKTsKKworICAgIGF1dG8gd2ViUHJvY2Vzc0FjY2Vzc1R5cGUg PSBjb21wdXRlV2ViUHJvY2Vzc0FjY2Vzc1R5cGVGb3JEYXRhUmVtb3ZhbChkYXRhVHlwZXMsIGlz Tm9uUGVyc2lzdGVudCgpKTsKKyAgICBpZiAod2ViUHJvY2Vzc0FjY2Vzc1R5cGUgIT0gUHJvY2Vz c0FjY2Vzc1R5cGU6Ok5vbmUpIHsKKyAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vz c2VzKCkpIHsKKyAgICAgICAgICAgIHN3aXRjaCAod2ViUHJvY2Vzc0FjY2Vzc1R5cGUpIHsKKyAg ICAgICAgICAgIGNhc2UgUHJvY2Vzc0FjY2Vzc1R5cGU6Ok9ubHlJZkxhdW5jaGVkOgorICAgICAg ICAgICAgICAgIGlmICghcHJvY2Vzcy0+Y2FuU2VuZE1lc3NhZ2UoKSkKKyAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNh c2UgUHJvY2Vzc0FjY2Vzc1R5cGU6OkxhdW5jaDoKKyAgICAgICAgICAgICAgICAvLyBGSVhNRTog SGFuZGxlIHRoaXMuCisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNhc2UgUHJvY2Vzc0FjY2Vzc1R5cGU6 Ok5vbmU6CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNr KCk7CisgICAgICAgICAgICBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4g b3JpZ2luczsKKworICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBkYXRhUmVjb3JkIDogZGF0 YVJlY29yZHMpIHsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IGRhdGFSZWNv cmQub3JpZ2lucykKKyAgICAgICAgICAgICAgICAgICAgb3JpZ2lucy5hcHBlbmQob3JpZ2luKTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcHJvY2Vzcy0+ZGVsZXRlV2Vic2l0ZURhdGFG b3JPcmlnaW5zKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMsIG9yaWdpbnMsIFtjYWxsYmFja0FnZ3Jl Z2F0b3JdIHsKKyAgICAgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPnJlbW92ZVBlbmRp bmdDYWxsYmFjaygpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICAv LyBUaGVyZSdzIGEgY2hhbmNlIHRoYXQgd2UgZG9uJ3QgaGF2ZSBhbnkgcGVuZGluZyBjYWxsYmFj a3MuIElmIHNvLCB3ZSB3YW50IHRvIGRpc3BhdGNoIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgcmln aHQgYXdheS4KKyAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmNhbGxJZk5lZWRlZCgpOworfQorCiB2 b2lkIFdlYnNpdGVEYXRhU3RvcmU6OndlYlBhZ2VXYXNBZGRlZChXZWJQYWdlUHJveHkmIHdlYlBh Z2VQcm94eSkKIHsKICAgICBpZiAobV9zdG9yYWdlTWFuYWdlcikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4 IGU1NzFlM2QzZTZiZWZkNzIxODc3MjgyY2I2NTYzNGVkM2JiZmQ4MTUuLmYyN2VkMzFhMmUwMjVm NWRlZDAwODRhMWQ4MGEyMzI0NGIyNTYxZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaApAQCAtNTksNiArNTks NyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZldGNoRGF0YShXZWJzaXRlRGF0YVR5cGVzLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4pPiBjb21wbGV0aW9uSGFu ZGxlcik7CiAgICAgdm9pZCByZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMsIHN0ZDo6Y2hyb25v OjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpmdW5jdGlvbjx2 b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcik7CisgICAgdm9pZCByZW1vdmVEYXRhKFdlYnNpdGVE YXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4mLCBzdGQ6OmZ1bmN0aW9u PHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKTsKIAogICAgIFN0b3JhZ2VNYW5hZ2VyKiBzdG9y YWdlTWFuYWdlcigpIHsgcmV0dXJuIG1fc3RvcmFnZU1hbmFnZXIuZ2V0KCk7IH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggZjJjMjZmNWY2ZmIxYTI4OGM0 ZDAyN2EwZWZmOTlmZjQzMDFkMDNjYS4uNjlkY2I0MGE4MDc3MmRkZmUzOWE3N2I0MTNjOGEzNDQx NTA4N2E4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC0x MTYwLDkgKzExNjAsMTUgQEAgdm9pZCBXZWJQcm9jZXNzOjpkZWxldGVXZWJzaXRlRGF0YShTZXNz aW9uSUQgc2Vzc2lvbklELCB1aW50NjRfdCB3ZWJzaXRlRGF0YVR5cGUKICAgICBwYXJlbnRQcm9j ZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkRpZERlbGV0 ZVdlYnNpdGVEYXRhKGNhbGxiYWNrSUQpLCAwKTsKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjpkZWxl dGVXZWJzaXRlRGF0YUZvck9yaWdpbnMoV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCwgdWlu dDY0X3Qgd2Vic2l0ZURhdGFUeXBlcywgY29uc3QgVmVjdG9yPFdlYktpdDo6U2VjdXJpdHlPcmln aW5EYXRhPiYgb3JpZ2lucywgdWludDY0X3QgY2FsbGJhY2tJRCkKK3ZvaWQgV2ViUHJvY2Vzczo6 ZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFdlYkNvcmU6OlNlc3Npb25JRCBzZXNzaW9uSUQs IHVpbnQ2NF90IHdlYnNpdGVEYXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJLaXQ6OlNlY3VyaXR5 T3JpZ2luRGF0YT4mIG9yaWdpbkRhdGFzLCB1aW50NjRfdCBjYWxsYmFja0lEKQogewotICAgIC8v IEZJWE1FOiBBY3R1YWxseSBkZWxldGUgc29tZXRoaW5nIGhlcmUuCisgICAgaWYgKHdlYnNpdGVE YXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZSkgeworICAgICAgICBIYXNoU2V0 PFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnM7CisgICAgICAgIGZvciAoYXV0byYgb3Jp Z2luRGF0YSA6IG9yaWdpbkRhdGFzKQorICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luRGF0 YS5zZWN1cml0eU9yaWdpbigpKTsKKworICAgICAgICBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCku cmVtb3ZlUmVzb3VyY2VzV2l0aE9yaWdpbnMoc2Vzc2lvbklELCBvcmlnaW5zKTsKKyAgICB9CiAK ICAgICBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNz UHJveHk6OkRpZERlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyhjYWxsYmFja0lEKSwgMCk7CiB9 Cg==