174686 2017-07-20 13:13:58 -0700 Avoid unnecessary WorkQueue dispatch in WebResourceLoadStatisticsStore::processStatisticsAndDataRecords() 2017-07-20 14:09:40 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez achristensen bfulgham ggaren rniwa oldest_to_newest 1330729 0 cdumez 2017-07-20 13:13:58 -0700 Avoid unnecessary WorkQueue dispatch in WebResourceLoadStatisticsStore::processStatisticsAndDataRecords(). The most common call site is already on the right thread. 1330730 1 316019 cdumez 2017-07-20 13:14:45 -0700 Created attachment 316019 Patch 1330747 2 316019 bfulgham 2017-07-20 13:43:10 -0700 Comment on attachment 316019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316019&action=review > Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp:-223 > - }); Shouldn’t this be calling ‘processStatisticsAndDataRecords’ here? Seems like this is a no-op now? 1330749 3 316025 cdumez 2017-07-20 13:46:32 -0700 Created attachment 316025 Patch 1330750 4 316025 ggaren 2017-07-20 13:47:37 -0700 Comment on attachment 316025 Patch r=me 1330754 5 316026 cdumez 2017-07-20 13:49:30 -0700 Created attachment 316026 Patch 1330768 6 316026 cdumez 2017-07-20 14:09:39 -0700 Comment on attachment 316026 Patch Clearing flags on attachment: 316026 Committed r219705: <http://trac.webkit.org/changeset/219705> 1330769 7 cdumez 2017-07-20 14:09:40 -0700 All reviewed patches have been landed. Closing bug. 316019 2017-07-20 13:14:45 -0700 2017-07-20 13:46:30 -0700 Patch bug-174686-20170720131444.patch text/plain 5628 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5Njk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVkNTNiMjgzMTMwYTdiYTQ1 YjlhODgwOTM2NWQ5YTdjZjQ0ZDk3NzkuLjg4YjVlZDY0NjYwMGIxMDk2NmJjMjcxZGQ2OGJjMWRk NGE4ODlhMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTctMDctMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBBdm9pZCB1bm5lY2Vzc2FyeSBXb3Jr UXVldWUgZGlzcGF0Y2ggaW4gV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwcm9jZXNz U3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE3NDY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEF2b2lkIHVubmVjZXNzYXJ5IFdvcmtRdWV1ZSBkaXNwYXRjaCBp biBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0 YVJlY29yZHMoKS4gVGhlIG1vc3QgY29tbW9uCisgICAgICAgIGNhbGwgc2l0ZSBpcyBhbHJlYWR5 IG9uIHRoZSByaWdodCB0aHJlYWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzUHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jkc10pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlU3Rh dGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2luZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jk cyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5o OgorCiAyMDE3LTA3LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIGdldEJvdW5kaW5nQ2xpZW50UmVjdHMgbm90IHVwZGF0ZWQgZm9yIHByb2dyYW1t YXRpYyBzY3JvbGxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCAxYTU5Yzc1MzAzODZmMWMwY2ZkMWQ3NTNm NzY3MjI0MmQ2YThlYmVmLi5hYTNhNTZiZDU3YTRlZWFlYTUwNTc4NDFjNDVlZTMyNGEwNzU4NGU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl RGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YnNpdGVEYXRhU3RvcmUubW0KQEAgLTM3OCw3ICszNzgsNyBAQCAtICh2b2lkKV9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzUHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3JkcwogICAgIGlmICghc3Rv cmUpCiAgICAgICAgIHJldHVybjsKIAotICAgIHN0b3JlLT5wcm9jZXNzU3RhdGlzdGljc0FuZERh dGFSZWNvcmRzKCk7CisgICAgc3RvcmUtPnNjaGVkdWxlU3RhdGlzdGljc0FuZERhdGFSZWNvcmRz UHJvY2Vzc2luZygpOwogfQogCiAtICh2b2lkKV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzVXBkYXRl Q29va2llUGFydGl0aW9uaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCAxYmEzNzI5OWVhNTY0 NzkwYTk5ZTU3NWFjYzVmZTgyZTBjM2JlMmIyLi4zOTk3MzMxMjY1N2VmMDFmMDcwMDZjMjVjOTg1 YTc2NDA2OTAwODRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTIwNCwyNyArMjA0LDM1IEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZW1vdmVEYXRhUmVjb3Jkcygp CiAgICAgfSk7CiB9CiAKLXZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwcm9j ZXNzU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCkKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpzY2hlZHVsZVN0YXRpc3RpY3NBbmREYXRhUmVjb3Jkc1Byb2Nlc3NpbmcoKQog eworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgbV9zdGF0aXN0aWNzUXVldWUt PmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIHsKLSAg ICAgICAgaWYgKG1fcGFyYW1ldGVycy5zaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFS ZWNvcmRzUmVtb3ZhbCkgewotICAgICAgICAgICAgZm9yIChhdXRvJiByZXNvdXJjZVN0YXRpc3Rp YyA6IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICAgICAg aWYgKCFyZXNvdXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlICYmIG1fcmVzb3VyY2VM b2FkU3RhdGlzdGljc0NsYXNzaWZpZXIuaGFzUHJldmFsZW50UmVzb3VyY2VDaGFyYWN0ZXJpc3Rp Y3MocmVzb3VyY2VTdGF0aXN0aWMpKQotICAgICAgICAgICAgICAgICAgICByZXNvdXJjZVN0YXRp c3RpYy5pc1ByZXZhbGVudFJlc291cmNlID0gdHJ1ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAg fQotICAgICAgICByZW1vdmVEYXRhUmVjb3JkcygpOwotICAgICAgICAKLSAgICAgICAgcHJ1bmVT dGF0aXN0aWNzSWZOZWVkZWQoKTsKIAotICAgICAgICBpZiAobV9wYXJhbWV0ZXJzLnNob3VsZE5v dGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQpIHsKLSAgICAgICAgICAgIFJ1bkxv b3A6Om1haW4oKS5kaXNwYXRjaChbXSB7Ci0gICAgICAgICAgICAgICAgV2ViUHJvY2Vzc1Byb3h5 Ojpub3RpZnlQYWdlU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2VkKCk7Ci0gICAgICAg ICAgICB9KTsKKyAgICB9KTsKK30KKwordm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0YVJlY29yZHMoKQoreworICAgIEFTU0VSVCghUnVu TG9vcDo6aXNNYWluKCkpOworCisgICAgaWYgKG1fcGFyYW1ldGVycy5zaG91bGRDbGFzc2lmeVJl c291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCkgeworICAgICAgICBmb3IgKGF1dG8mIHJl c291cmNlU3RhdGlzdGljIDogbV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAudmFsdWVzKCkpIHsKKyAg ICAgICAgICAgIGlmICghcmVzb3VyY2VTdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSAmJiBt X3Jlc291cmNlTG9hZFN0YXRpc3RpY3NDbGFzc2lmaWVyLmhhc1ByZXZhbGVudFJlc291cmNlQ2hh cmFjdGVyaXN0aWNzKHJlc291cmNlU3RhdGlzdGljKSkKKyAgICAgICAgICAgICAgICByZXNvdXJj ZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlID0gdHJ1ZTsKICAgICAgICAgfQorICAgIH0K KyAgICByZW1vdmVEYXRhUmVjb3JkcygpOwogCi0gICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2Uu c2NoZWR1bGVPcldyaXRlTWVtb3J5U3RvcmUoKTsKLSAgICB9KTsKKyAgICBwcnVuZVN0YXRpc3Rp Y3NJZk5lZWRlZCgpOworCisgICAgaWYgKG1fcGFyYW1ldGVycy5zaG91bGROb3RpZnlQYWdlc1do ZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkKSB7CisgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChbXSB7CisgICAgICAgICAgICBXZWJQcm9jZXNzUHJveHk6Om5vdGlmeVBhZ2VTdGF0aXN0 aWNzQW5kRGF0YVJlY29yZHNQcm9jZXNzZWQoKTsKKyAgICAgICAgfSk7CisgICAgfQorCisgICAg bV9wZXJzaXN0ZW50U3RvcmFnZS5zY2hlZHVsZU9yV3JpdGVNZW1vcnlTdG9yZSgpOwogfQogCiB2 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVzb3VyY2VMb2FkU3RhdGlzdGlj c1VwZGF0ZWQoVmVjdG9yPFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M+JiYgb3JpZ2lu cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlLmgKaW5kZXggYzFlNjUxMTcyZmM2ZDA1NDlkODMzNDU1MWM2YjZiNzI2 ZjZlMTNlYS4uY2Q1YjUwOTgyMWE2ZWM5NWY1N2YyYzc2ZGRiYzk4ODEyOWNjMWI2NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmgKQEAgLTkzLDcgKzkzLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U3VicmVz b3VyY2VVbmlxdWVSZWRpcmVjdFRvKGNvbnN0IFdlYkNvcmU6OlVSTCYgc3VicmVzb3VyY2UsIGNv bnN0IFdlYkNvcmU6OlVSTCYgaG9zdE5hbWVSZWRpcmVjdGVkVG8pOwogICAgIHZvaWQgc2NoZWR1 bGVDb29raWVQYXJ0aXRpb25pbmdVcGRhdGUoKTsKICAgICB2b2lkIHNjaGVkdWxlQ29va2llUGFy dGl0aW9uaW5nVXBkYXRlRm9yRG9tYWlucyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1Rv UmVtb3ZlLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvQWRkLCBTaG91bGRDbGVhckZp cnN0KTsKLSAgICB2b2lkIHByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0YVJlY29yZHMoKTsKKyAgICB2 b2lkIHNjaGVkdWxlU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2luZygpOwogICAgIHZv aWQgc3VibWl0VGVsZW1ldHJ5KCk7CiAgICAgdm9pZCBzY2hlZHVsZUNvb2tpZVBhcnRpdGlvbmlu Z1N0YXRlUmVzZXQoKTsKIApAQCAtMTM5LDYgKzEzOSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1 cGRhdGVDb29raWVQYXJ0aXRpb25pbmdGb3JEb21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBk b21haW5zVG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9BZGQsIFNob3Vs ZENsZWFyRmlyc3QpOwogICAgIHZvaWQgbWVyZ2VTdGF0aXN0aWNzKFZlY3RvcjxXZWJDb3JlOjpS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiYmKTsKICAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzJiBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKGNvbnN0IFN0 cmluZyYpOworICAgIHZvaWQgcHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3JkcygpOwogCiAg ICAgdm9pZCByZXNldENvb2tpZVBhcnRpdGlvbmluZ1N0YXRlKCk7CiAK 316025 2017-07-20 13:46:32 -0700 2017-07-20 13:49:28 -0700 Patch bug-174686-20170720134631.patch text/plain 5690 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5Njk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVkNTNiMjgzMTMwYTdiYTQ1 YjlhODgwOTM2NWQ5YTdjZjQ0ZDk3NzkuLjg4YjVlZDY0NjYwMGIxMDk2NmJjMjcxZGQ2OGJjMWRk NGE4ODlhMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTctMDctMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBBdm9pZCB1bm5lY2Vzc2FyeSBXb3Jr UXVldWUgZGlzcGF0Y2ggaW4gV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwcm9jZXNz U3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE3NDY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEF2b2lkIHVubmVjZXNzYXJ5IFdvcmtRdWV1ZSBkaXNwYXRjaCBp biBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0 YVJlY29yZHMoKS4gVGhlIG1vc3QgY29tbW9uCisgICAgICAgIGNhbGwgc2l0ZSBpcyBhbHJlYWR5 IG9uIHRoZSByaWdodCB0aHJlYWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzUHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jkc10pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlU3Rh dGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2luZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jk cyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5o OgorCiAyMDE3LTA3LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIGdldEJvdW5kaW5nQ2xpZW50UmVjdHMgbm90IHVwZGF0ZWQgZm9yIHByb2dyYW1t YXRpYyBzY3JvbGxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCAxYTU5Yzc1MzAzODZmMWMwY2ZkMWQ3NTNm NzY3MjI0MmQ2YThlYmVmLi5hYTNhNTZiZDU3YTRlZWFlYTUwNTc4NDFjNDVlZTMyNGEwNzU4NGU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl RGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YnNpdGVEYXRhU3RvcmUubW0KQEAgLTM3OCw3ICszNzgsNyBAQCBzdGF0aWMgVmVjdG9yPFdlYktp dDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0ZURhdGFSZWNvcmRzKE5TQXJyYXkgKmRhdGFS ZWNvcgogICAgIGlmICghc3RvcmUpCiAgICAgICAgIHJldHVybjsKIAotICAgIHN0b3JlLT5wcm9j ZXNzU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCk7CisgICAgc3RvcmUtPnNjaGVkdWxlU3RhdGlz dGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2luZygpOwogfQogCiAtICh2b2lkKV9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzVXBkYXRlQ29va2llUGFydGl0aW9uaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApp bmRleCAxYmEzNzI5OWVhNTY0NzkwYTk5ZTU3NWFjYzVmZTgyZTBjM2JlMmIyLi5iNGQ4OTJjMDcw NTEyY2M3MmFhY2I1NjdiMDZhODM1MDMyZDJiMWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAg LTIwNCwyNyArMjA0LDM1IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpy ZW1vdmVEYXRhUmVjb3JkcygpCiAgICAgfSk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzY2hlZHVsZVN0YXRpc3RpY3NBbmREYXRhUmVjb3Jkc1Byb2Nlc3Npbmco KQoreworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisgICAgbV9zdGF0aXN0aWNzUXVl dWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKKyAg ICAgICAgcHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3JkcygpOworICAgIH0pOworfQorCiB2 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3NBbmRE YXRhUmVjb3JkcygpCiB7Ci0gICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIHsKLSAgICAgICAgaWYgKG1fcGFyYW1l dGVycy5zaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCkgewot ICAgICAgICAgICAgZm9yIChhdXRvJiByZXNvdXJjZVN0YXRpc3RpYyA6IG1fcmVzb3VyY2VTdGF0 aXN0aWNzTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFyZXNvdXJjZVN0YXRp c3RpYy5pc1ByZXZhbGVudFJlc291cmNlICYmIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0NsYXNz aWZpZXIuaGFzUHJldmFsZW50UmVzb3VyY2VDaGFyYWN0ZXJpc3RpY3MocmVzb3VyY2VTdGF0aXN0 aWMpKQotICAgICAgICAgICAgICAgICAgICByZXNvdXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJl c291cmNlID0gdHJ1ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICByZW1vdmVE YXRhUmVjb3JkcygpOwotICAgICAgICAKLSAgICAgICAgcHJ1bmVTdGF0aXN0aWNzSWZOZWVkZWQo KTsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgICAgICBpZiAobV9wYXJh bWV0ZXJzLnNob3VsZE5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQpIHsKLSAg ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbXSB7Ci0gICAgICAgICAgICAgICAg V2ViUHJvY2Vzc1Byb3h5Ojpub3RpZnlQYWdlU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vz c2VkKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICBpZiAobV9wYXJhbWV0ZXJzLnNob3VsZENsYXNz aWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsKSB7CisgICAgICAgIGZvciAoYXV0 byYgcmVzb3VyY2VTdGF0aXN0aWMgOiBtX3Jlc291cmNlU3RhdGlzdGljc01hcC52YWx1ZXMoKSkg eworICAgICAgICAgICAgaWYgKCFyZXNvdXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNl ICYmIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0NsYXNzaWZpZXIuaGFzUHJldmFsZW50UmVzb3Vy Y2VDaGFyYWN0ZXJpc3RpY3MocmVzb3VyY2VTdGF0aXN0aWMpKQorICAgICAgICAgICAgICAgIHJl c291cmNlU3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgPSB0cnVlOwogICAgICAgICB9Cisg ICAgfQorICAgIHJlbW92ZURhdGFSZWNvcmRzKCk7CiAKLSAgICAgICAgbV9wZXJzaXN0ZW50U3Rv cmFnZS5zY2hlZHVsZU9yV3JpdGVNZW1vcnlTdG9yZSgpOwotICAgIH0pOworICAgIHBydW5lU3Rh dGlzdGljc0lmTmVlZGVkKCk7CisKKyAgICBpZiAobV9wYXJhbWV0ZXJzLnNob3VsZE5vdGlmeVBh Z2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQpIHsKKyAgICAgICAgUnVuTG9vcDo6bWFpbigp LmRpc3BhdGNoKFtdIHsKKyAgICAgICAgICAgIFdlYlByb2Nlc3NQcm94eTo6bm90aWZ5UGFnZVN0 YXRpc3RpY3NBbmREYXRhUmVjb3Jkc1Byb2Nlc3NlZCgpOworICAgICAgICB9KTsKKyAgICB9CisK KyAgICBtX3BlcnNpc3RlbnRTdG9yYWdlLnNjaGVkdWxlT3JXcml0ZU1lbW9yeVN0b3JlKCk7CiB9 CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZXNvdXJjZUxvYWRTdGF0 aXN0aWNzVXBkYXRlZChWZWN0b3I8V2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcz4mJiBv cmlnaW5zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCBjMWU2NTExNzJmYzZkMDU0OWQ4MzM0NTUxYzZi NmI3MjZmNmUxM2VhLi5jZDViNTA5ODIxYTZlYzk1ZjU3ZjJjNzZkZGJjOTg4MTI5Y2MxYjY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuaApAQCAtOTMsNyArOTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRT dWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0VG8oY29uc3QgV2ViQ29yZTo6VVJMJiBzdWJyZXNvdXJj ZSwgY29uc3QgV2ViQ29yZTo6VVJMJiBob3N0TmFtZVJlZGlyZWN0ZWRUbyk7CiAgICAgdm9pZCBz Y2hlZHVsZUNvb2tpZVBhcnRpdGlvbmluZ1VwZGF0ZSgpOwogICAgIHZvaWQgc2NoZWR1bGVDb29r aWVQYXJ0aXRpb25pbmdVcGRhdGVGb3JEb21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21h aW5zVG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9BZGQsIFNob3VsZENs ZWFyRmlyc3QpOwotICAgIHZvaWQgcHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3JkcygpOwor ICAgIHZvaWQgc2NoZWR1bGVTdGF0aXN0aWNzQW5kRGF0YVJlY29yZHNQcm9jZXNzaW5nKCk7CiAg ICAgdm9pZCBzdWJtaXRUZWxlbWV0cnkoKTsKICAgICB2b2lkIHNjaGVkdWxlQ29va2llUGFydGl0 aW9uaW5nU3RhdGVSZXNldCgpOwogCkBAIC0xMzksNiArMTM5LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHVwZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0ZvckRvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmlu Zz4mIGRvbWFpbnNUb1JlbW92ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0FkZCwg U2hvdWxkQ2xlYXJGaXJzdCk7CiAgICAgdm9pZCBtZXJnZVN0YXRpc3RpY3MoVmVjdG9yPFdlYkNv cmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M+JiYpOwogICAgIFdlYkNvcmU6OlJlc291cmNlTG9h ZFN0YXRpc3RpY3MmIGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4oY29u c3QgU3RyaW5nJik7CisgICAgdm9pZCBwcm9jZXNzU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCk7 CiAKICAgICB2b2lkIHJlc2V0Q29va2llUGFydGl0aW9uaW5nU3RhdGUoKTsKIAo= 316026 2017-07-20 13:49:30 -0700 2017-07-20 14:09:39 -0700 Patch bug-174686-20170720134929.patch text/plain 5690 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5Njk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVkNTNiMjgzMTMwYTdiYTQ1 YjlhODgwOTM2NWQ5YTdjZjQ0ZDk3NzkuLmJkMGJlZGEzZDAxNjAxYTg4YjQyMTU4Yzg3MzBmY2I2 Nzc1NjliZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTctMDctMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBBdm9pZCB1bm5lY2Vzc2FyeSBXb3Jr UXVldWUgZGlzcGF0Y2ggaW4gV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwcm9jZXNz U3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE3NDY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5 IEdhcmVuLgorCisgICAgICAgIEF2b2lkIHVubmVjZXNzYXJ5IFdvcmtRdWV1ZSBkaXNwYXRjaCBp biBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0 YVJlY29yZHMoKS4gVGhlIG1vc3QgY29tbW9uCisgICAgICAgIGNhbGwgc2l0ZSBpcyBhbHJlYWR5 IG9uIHRoZSByaWdodCB0aHJlYWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzUHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jkc10pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNjaGVkdWxlU3Rh dGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2luZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3Jk cyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5o OgorCiAyMDE3LTA3LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIGdldEJvdW5kaW5nQ2xpZW50UmVjdHMgbm90IHVwZGF0ZWQgZm9yIHByb2dyYW1t YXRpYyBzY3JvbGxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCAxYTU5Yzc1MzAzODZmMWMwY2ZkMWQ3NTNm NzY3MjI0MmQ2YThlYmVmLi5hYTNhNTZiZDU3YTRlZWFlYTUwNTc4NDFjNDVlZTMyNGEwNzU4NGU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl RGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YnNpdGVEYXRhU3RvcmUubW0KQEAgLTM3OCw3ICszNzgsNyBAQCBzdGF0aWMgVmVjdG9yPFdlYktp dDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0ZURhdGFSZWNvcmRzKE5TQXJyYXkgKmRhdGFS ZWNvcgogICAgIGlmICghc3RvcmUpCiAgICAgICAgIHJldHVybjsKIAotICAgIHN0b3JlLT5wcm9j ZXNzU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCk7CisgICAgc3RvcmUtPnNjaGVkdWxlU3RhdGlz dGljc0FuZERhdGFSZWNvcmRzUHJvY2Vzc2luZygpOwogfQogCiAtICh2b2lkKV9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzVXBkYXRlQ29va2llUGFydGl0aW9uaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApp bmRleCAxYmEzNzI5OWVhNTY0NzkwYTk5ZTU3NWFjYzVmZTgyZTBjM2JlMmIyLi5iNGQ4OTJjMDcw NTEyY2M3MmFhY2I1NjdiMDZhODM1MDMyZDJiMWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAg LTIwNCwyNyArMjA0LDM1IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpy ZW1vdmVEYXRhUmVjb3JkcygpCiAgICAgfSk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzY2hlZHVsZVN0YXRpc3RpY3NBbmREYXRhUmVjb3Jkc1Byb2Nlc3Npbmco KQoreworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisgICAgbV9zdGF0aXN0aWNzUXVl dWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKKyAg ICAgICAgcHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3JkcygpOworICAgIH0pOworfQorCiB2 b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3NBbmRE YXRhUmVjb3JkcygpCiB7Ci0gICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldICgpIHsKLSAgICAgICAgaWYgKG1fcGFyYW1l dGVycy5zaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCkgewot ICAgICAgICAgICAgZm9yIChhdXRvJiByZXNvdXJjZVN0YXRpc3RpYyA6IG1fcmVzb3VyY2VTdGF0 aXN0aWNzTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFyZXNvdXJjZVN0YXRp c3RpYy5pc1ByZXZhbGVudFJlc291cmNlICYmIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0NsYXNz aWZpZXIuaGFzUHJldmFsZW50UmVzb3VyY2VDaGFyYWN0ZXJpc3RpY3MocmVzb3VyY2VTdGF0aXN0 aWMpKQotICAgICAgICAgICAgICAgICAgICByZXNvdXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJl c291cmNlID0gdHJ1ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICByZW1vdmVE YXRhUmVjb3JkcygpOwotICAgICAgICAKLSAgICAgICAgcHJ1bmVTdGF0aXN0aWNzSWZOZWVkZWQo KTsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotICAgICAgICBpZiAobV9wYXJh bWV0ZXJzLnNob3VsZE5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQpIHsKLSAg ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbXSB7Ci0gICAgICAgICAgICAgICAg V2ViUHJvY2Vzc1Byb3h5Ojpub3RpZnlQYWdlU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzUHJvY2Vz c2VkKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICBpZiAobV9wYXJhbWV0ZXJzLnNob3VsZENsYXNz aWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsKSB7CisgICAgICAgIGZvciAoYXV0 byYgcmVzb3VyY2VTdGF0aXN0aWMgOiBtX3Jlc291cmNlU3RhdGlzdGljc01hcC52YWx1ZXMoKSkg eworICAgICAgICAgICAgaWYgKCFyZXNvdXJjZVN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNl ICYmIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0NsYXNzaWZpZXIuaGFzUHJldmFsZW50UmVzb3Vy Y2VDaGFyYWN0ZXJpc3RpY3MocmVzb3VyY2VTdGF0aXN0aWMpKQorICAgICAgICAgICAgICAgIHJl c291cmNlU3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgPSB0cnVlOwogICAgICAgICB9Cisg ICAgfQorICAgIHJlbW92ZURhdGFSZWNvcmRzKCk7CiAKLSAgICAgICAgbV9wZXJzaXN0ZW50U3Rv cmFnZS5zY2hlZHVsZU9yV3JpdGVNZW1vcnlTdG9yZSgpOwotICAgIH0pOworICAgIHBydW5lU3Rh dGlzdGljc0lmTmVlZGVkKCk7CisKKyAgICBpZiAobV9wYXJhbWV0ZXJzLnNob3VsZE5vdGlmeVBh Z2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQpIHsKKyAgICAgICAgUnVuTG9vcDo6bWFpbigp LmRpc3BhdGNoKFtdIHsKKyAgICAgICAgICAgIFdlYlByb2Nlc3NQcm94eTo6bm90aWZ5UGFnZVN0 YXRpc3RpY3NBbmREYXRhUmVjb3Jkc1Byb2Nlc3NlZCgpOworICAgICAgICB9KTsKKyAgICB9CisK KyAgICBtX3BlcnNpc3RlbnRTdG9yYWdlLnNjaGVkdWxlT3JXcml0ZU1lbW9yeVN0b3JlKCk7CiB9 CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZXNvdXJjZUxvYWRTdGF0 aXN0aWNzVXBkYXRlZChWZWN0b3I8V2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcz4mJiBv cmlnaW5zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCBjMWU2NTExNzJmYzZkMDU0OWQ4MzM0NTUxYzZi NmI3MjZmNmUxM2VhLi5jZDViNTA5ODIxYTZlYzk1ZjU3ZjJjNzZkZGJjOTg4MTI5Y2MxYjY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuaApAQCAtOTMsNyArOTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRT dWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0VG8oY29uc3QgV2ViQ29yZTo6VVJMJiBzdWJyZXNvdXJj ZSwgY29uc3QgV2ViQ29yZTo6VVJMJiBob3N0TmFtZVJlZGlyZWN0ZWRUbyk7CiAgICAgdm9pZCBz Y2hlZHVsZUNvb2tpZVBhcnRpdGlvbmluZ1VwZGF0ZSgpOwogICAgIHZvaWQgc2NoZWR1bGVDb29r aWVQYXJ0aXRpb25pbmdVcGRhdGVGb3JEb21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21h aW5zVG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9BZGQsIFNob3VsZENs ZWFyRmlyc3QpOwotICAgIHZvaWQgcHJvY2Vzc1N0YXRpc3RpY3NBbmREYXRhUmVjb3JkcygpOwor ICAgIHZvaWQgc2NoZWR1bGVTdGF0aXN0aWNzQW5kRGF0YVJlY29yZHNQcm9jZXNzaW5nKCk7CiAg ICAgdm9pZCBzdWJtaXRUZWxlbWV0cnkoKTsKICAgICB2b2lkIHNjaGVkdWxlQ29va2llUGFydGl0 aW9uaW5nU3RhdGVSZXNldCgpOwogCkBAIC0xMzksNiArMTM5LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHVwZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0ZvckRvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmlu Zz4mIGRvbWFpbnNUb1JlbW92ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0FkZCwg U2hvdWxkQ2xlYXJGaXJzdCk7CiAgICAgdm9pZCBtZXJnZVN0YXRpc3RpY3MoVmVjdG9yPFdlYkNv cmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M+JiYpOwogICAgIFdlYkNvcmU6OlJlc291cmNlTG9h ZFN0YXRpc3RpY3MmIGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4oY29u c3QgU3RyaW5nJik7CisgICAgdm9pZCBwcm9jZXNzU3RhdGlzdGljc0FuZERhdGFSZWNvcmRzKCk7 CiAKICAgICB2b2lkIHJlc2V0Q29va2llUGFydGl0aW9uaW5nU3RhdGUoKTsKIAo=