187277 2018-07-02 15:59:48 -0700 Resource Load Statistics: Make WebsiteDataStore::getAllStorageAccessEntries() call the right network process instead of iterating over the process pools 2018-07-03 11:25:44 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander cdumez commit-queue webkit-bug-importer oldest_to_newest 1438684 0 wilander 2018-07-02 15:59:48 -0700 WebsiteDataStore::getAllStorageAccessEntries() needs to know which page is calling it and get the storage access entries from the associated network process. 1438685 1 webkit-bug-importer 2018-07-02 16:00:14 -0700 <rdar://problem/41745510> 1438690 2 344143 wilander 2018-07-02 16:15:49 -0700 Created attachment 344143 Patch 1438865 3 344143 cdumez 2018-07-03 09:08:56 -0700 Comment on attachment 344143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344143&action=review r=me > Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:350 > + if (webView) { This should be an early return instead. > Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:352 > + if (webPageProxy) { This should be an early return instead. > Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:26 > +#import <WebKit/WKWebView.h> Can this be forward-declared below like so? @class WKWebView; > Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:269 > + if (auto* parentView = mainWebView()) { Should be an early return. 1438885 4 344195 wilander 2018-07-03 10:46:32 -0700 Created attachment 344195 Patch for landing 1438887 5 wilander 2018-07-03 10:47:47 -0700 Thanks, Chris! I took action on all your comments. 1438898 6 344195 commit-queue 2018-07-03 11:25:42 -0700 Comment on attachment 344195 Patch for landing Clearing flags on attachment: 344195 Committed r233468: <https://trac.webkit.org/changeset/233468> 1438899 7 commit-queue 2018-07-03 11:25:44 -0700 All reviewed patches have been landed. Closing bug. 344143 2018-07-02 16:15:49 -0700 2018-07-03 10:46:30 -0700 Patch bug-187277-20180702161548.patch text/plain 10283 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2YzA4ZTI5MjE1YjhkZDM0 M2VmZWJjZmMwNzNlMWViZWY3M2JmNzMuLmM1NTZmNTJiNDA4OGQzYTg4MTg4YzgyZmYxNDNjNjNj MGM0YWU0MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTgtMDctMDIgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0 aXN0aWNzOiBNYWtlIFdlYnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVz KCkgY2FsbCB0aGUgcmlnaHQgbmV0d29yayBwcm9jZXNzIGluc3RlYWQgb2YgaXRlcmF0aW5nIG92 ZXIgdGhlIHByb2Nlc3MgcG9vbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NzI3NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDE3NDU1MTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhpc3Rpbmcg dGVzdHMgdXNlIHRoaXMgY29kZS4gVGhpcyBjaGFuZ2UgaXMgZm9yIGNvcnJlY3RuZXNzLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAg ICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfZ2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXNGb3I6 Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICAgICBOb3cgcmVjZWl2ZXMgYSBXS1dlYlZp ZXcgZnJvbSBpdHMgY2FsbGVyIGFuZCBnZXRzIHRoZSBwYWdlIElEIGZyb20gaXQuCisgICAgICAg ICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfZ2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXM6XSk6IERl bGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQ cml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpnZXRBbGxTdG9yYWdl QWNjZXNzRW50cmllcyk6CisgICAgICAgICAgICBOb3cgZ2V0cyBhIHBhZ2UgSUQgZnJvbSBpdHMg Y2FsbGVyIGFuZCBnZXRzIHRoZSByaWdodCBuZXR3b3JrIHByb2Nlc3MKKyAgICAgICAgICAgIHRo cm91Z2ggaXQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuaDoKKwogMjAxOC0wNy0wMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjMzMzgxKTogRG91YmxlIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZSBkZXN0cnVjdG9yIGludm9jYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCmluZGV4IDg3 MmJhM2RiNzQ2Nzg0YjFiMmQ5NmY3ODU2ZmNlYTEyNDYyNDI4NjguLmQ0Zjc5NWQwOWE5MGQxMmU5 YmM3NWJkNWRiYzNhNDNjMDZjMGJhZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMzEsNyArMzEsOSBA QAogI2ltcG9ydCAiQVBJU3RyaW5nLmgiCiAjaW1wb3J0ICJXS0hUVFBDb29raWVTdG9yZUludGVy bmFsLmgiCiAjaW1wb3J0ICJXS05TQXJyYXkuaCIKKyNpbXBvcnQgIldLV2ViVmlld0ludGVybmFs LmgiCiAjaW1wb3J0ICJXS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaCIKKyNpbXBvcnQgIldl YlBhZ2VQcm94eS5oIgogI2ltcG9ydCAiV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgi CiAjaW1wb3J0ICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGVsZW1ldHJ5LmgiCiAjaW1wb3J0 ICJXZWJzaXRlRGF0YUZldGNoT3B0aW9uLmgiCkBAIC0zNDMsMTYgKzM0NSwyMyBAQCArICh2b2lk KV9hbGxvd1dlYnNpdGVEYXRhUmVjb3Jkc0ZvckFsbE9yaWdpbnMKICAgICBXZWJLaXQ6OldlYnNp dGVEYXRhU3RvcmU6OmFsbG93V2Vic2l0ZURhdGFSZWNvcmRzRm9yQWxsT3JpZ2lucygpOwogfQog Ci0tICh2b2lkKV9nZXRBbGxTdG9yYWdlQWNjZXNzRW50cmllczoodm9pZCAoXikoTlNBcnJheTxO U1N0cmluZyAqPiAqZG9tYWlucykpY29tcGxldGlvbkhhbmRsZXIKLXsKLSAgICBfd2Vic2l0ZURh dGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKFtj b21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uSGFuZGxlcildKGF1dG8g ZG9tYWlucykgewotICAgICAgICBWZWN0b3I8UmVmUHRyPEFQSTo6T2JqZWN0Pj4gYXBpRG9tYWlu czsKLSAgICAgICAgYXBpRG9tYWlucy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGRvbWFpbnMuc2l6 ZSgpKTsKLSAgICAgICAgZm9yIChhdXRvJiBkb21haW4gOiBkb21haW5zKQotICAgICAgICAgICAg YXBpRG9tYWlucy51bmNoZWNrZWRBcHBlbmQoQVBJOjpTdHJpbmc6OmNyZWF0ZShkb21haW4pKTsK LQotICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih3cmFwcGVyKEFQSTo6QXJyYXk6OmNyZWF0ZShX VEZNb3ZlKGFwaURvbWFpbnMpKSkpOwotICAgIH0pOworLSAodm9pZClfZ2V0QWxsU3RvcmFnZUFj Y2Vzc0VudHJpZXNGb3I6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29tcGxldGlvbkhhbmRsZXI6KHZv aWQgKF4pKE5TQXJyYXk8TlNTdHJpbmcgKj4gKmRvbWFpbnMpKWNvbXBsZXRpb25IYW5kbGVyCit7 CisgICAgaWYgKHdlYlZpZXcpIHsKKyAgICAgICAgYXV0byogd2ViUGFnZVByb3h5ID0gW3dlYlZp ZXcgX3BhZ2VdOworICAgICAgICBpZiAod2ViUGFnZVByb3h5KSB7CisgICAgICAgICAgICBfd2Vi c2l0ZURhdGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRy aWVzKHdlYlBhZ2VQcm94eS0+cGFnZUlEKCksIFtjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9j a1B0cihjb21wbGV0aW9uSGFuZGxlcildKGF1dG8gZG9tYWlucykgeworICAgICAgICAgICAgICAg IFZlY3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiBhcGlEb21haW5zOworICAgICAgICAgICAgICAg IGFwaURvbWFpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShkb21haW5zLnNpemUoKSk7CisgICAg ICAgICAgICAgICAgZm9yIChhdXRvJiBkb21haW4gOiBkb21haW5zKQorICAgICAgICAgICAgICAg ICAgICBhcGlEb21haW5zLnVuY2hlY2tlZEFwcGVuZChBUEk6OlN0cmluZzo6Y3JlYXRlKGRvbWFp bikpOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KHdyYXBwZXIoQVBJOjpBcnJheTo6Y3JlYXRlKFdURk1vdmUoYXBpRG9tYWlucykpKSk7CisgICAg ICAgICAgICB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgIH0KKyAgICBj b21wbGV0aW9uSGFuZGxlcih7IH0pOwogfQogCiAtIChib29sKV9oYXNSZWdpc3RlcmVkU2Vydmlj ZVdvcmtlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgKaW5kZXggZGRhN2NkZTU2YTYwMTAwMzc1 ZTc2OGFlMzdhNWFkYzc2NGMwYTQ3Ny4uNTIwZDNlODgxOWRhOGE4ODFkYjdhMTFhYTg2MmU4Zjk4 ZTc0ZTRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0ZS5oCkBAIC0yMyw2ICsyMyw3IEBACiAg KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorI2ltcG9ydCA8V2ViS2l0 L1dLV2ViVmlldy5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0ZURhdGFTdG9yZS5oPgogCiAj aWYgV0tfQVBJX0VOQUJMRUQKQEAgLTU2LDcgKzU3LDcgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5T VUludGVnZXIsIF9XS1dlYnNpdGVEYXRhU3RvcmVGZXRjaE9wdGlvbnMpIHsKIAogLSAodm9pZClf cmVzb3VyY2VMb2FkU3RhdGlzdGljc1NldFNob3VsZFN1Ym1pdFRlbGVtZXRyeTooQk9PTCl2YWx1 ZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xMyksIGlvcygxMS4wKSk7CiAtICh2b2lkKV9z ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGVzdGluZ0NhbGxiYWNrOihudWxsYWJsZSB2b2lkIChe KShXS1dlYnNpdGVEYXRhU3RvcmUgKiwgTlNTdHJpbmcgKikpY2FsbGJhY2sgV0tfQVBJX0FWQUlM QUJMRShtYWNvc3goMTAuMTMpLCBpb3MoMTEuMCkpOwotLSAodm9pZClfZ2V0QWxsU3RvcmFnZUFj Y2Vzc0VudHJpZXM6KHZvaWQgKF4pKE5TQXJyYXk8TlNTdHJpbmcgKj4gKmRvbWFpbnMpKWNvbXBs ZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tf SU9TX1RCQSkpOworLSAodm9pZClfZ2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXNGb3I6KFdLV2Vi VmlldyAqKXdlYlZpZXcgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TQXJyYXk8TlNTdHJp bmcgKj4gKmRvbWFpbnMpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4 KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogKyAodm9pZClfYWxsb3dXZWJzaXRlRGF0 YVJlY29yZHNGb3JBbGxPcmlnaW5zIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjEzLjQpLCBp b3MoMTEuMykpOwogLSAoYm9vbClfaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXIgV0tfQVBJX0FW QUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9y ZS5jcHAKaW5kZXggNTBkYTEwYWU1ZDY3ZGRhZjUxMWRhODMxMzY4OWFmN2ZmZjUwZWRiYS4uMDZm YzUwNWVkMmJiOWE1NGZhZWQyMTcxNWVhNDNlMGJiZWUwN2M5YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAK QEAgLTEyMzAsMTEgKzEyMzAsMTYgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpoYXNTdG9yYWdl QWNjZXNzRm9yRnJhbWVIYW5kbGVyKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEb20KICAgICBuZXR3 b3JrUHJvY2Vzcy5oYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWUobV9zZXNzaW9uSUQsIHJlc291cmNl RG9tYWluLCBmaXJzdFBhcnR5RG9tYWluLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKTsKIH0KIAotdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXRBbGxTdG9yYWdl QWNjZXNzRW50cmllcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxTdHJpbmc+JiYgZG9t YWlucyk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdldEFs bFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKHVpbnQ2NF90IHBhZ2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChWZWN0b3I8U3RyaW5nPiYmIGRvbWFpbnMpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewot ICAgIC8vIEZJWE1FOiBBbHRob3VnaCB0aGlzIGlzIG9ubHkgdXNlZCBmb3IgdGVzdGluZywgaXQg c2hvdWxkIG5vdCBpdGVyYXRlIGFuZCBXVEZNb3ZlIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIuCi0g ICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKQotICAgICAgICBwcm9j ZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKS0+Z2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXMobV9z ZXNzaW9uSUQsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBhdXRvKiB3ZWJQYWdl ID0gV2ViUHJvY2Vzc1Byb3h5Ojp3ZWJQYWdlKHBhZ2VJRCk7CisgICAgaWYgKCF3ZWJQYWdlKSB7 CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisgICAgCisgICAgYXV0byYgbmV0d29ya1Byb2Nlc3MgPSB3ZWJQYWdlLT5wcm9jZXNzKCkucHJv Y2Vzc1Bvb2woKS5lbnN1cmVOZXR3b3JrUHJvY2VzcygpOworICAgIG5ldHdvcmtQcm9jZXNzLmdl dEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKG1fc2Vzc2lvbklELCBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKSk7CiB9CiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNz SGFuZGxlcihjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBTdHJpbmcmIGZpcnN0 UGFydHlEb21haW4sIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHVpbnQ2NF90IHBh Z2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sIHdhc0dyYW50ZWQpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IGI5MDY2YWU0ZTFiMDhlYjQ1NjY4MTlkNjA5NzVj ZTFhOGFhZGMxOGEuLjAyZGUxOGVmNjlkMDllMDM5ZTg4ZmVkOTQ0ZTlhNjJiNGRmYmRjNzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmgKQEAgLTEzMiw3ICsxMzIsNyBAQCBwdWJsaWM6CiAjaWYgSEFWRShDRk5FVFdP UktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCiAgICAgdm9pZCB1cGRhdGVQcmV2YWxlbnREb21haW5z VG9QYXJ0aXRpb25PckJsb2NrQ29va2llcyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1Rv UGFydGl0aW9uLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvQmxvY2ssIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBkb21haW5zVG9OZWl0aGVyUGFydGl0aW9uTm9yQmxvY2ssIFNob3VsZENs ZWFyRmlyc3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBoYXNTdG9y YWdlQWNjZXNzRm9yRnJhbWVIYW5kbGVyKGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEb21haW4sIGNv bnN0IFN0cmluZyYgZmlyc3RQYXJ0eURvbWFpbiwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg cGFnZUlELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wgaGFzQWNjZXNzKT4mJik7Ci0gICAg dm9pZCBnZXRBbGxTdG9yYWdlQWNjZXNzRW50cmllcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZl Y3RvcjxTdHJpbmc+JiYgZG9tYWlucyk+JiYpOworICAgIHZvaWQgZ2V0QWxsU3RvcmFnZUFjY2Vz c0VudHJpZXModWludDY0X3QgcGFnZUlELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxT dHJpbmc+JiYgZG9tYWlucyk+JiYpOwogICAgIHZvaWQgZ3JhbnRTdG9yYWdlQWNjZXNzSGFuZGxl cihjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBTdHJpbmcmIGZpcnN0UGFydHlE b21haW4sIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sIHdhc0dyYW50ZWQpPiYmKTsKICAgICB2b2lkIHJl bW92ZUFsbFN0b3JhZ2VBY2Nlc3NIYW5kbGVyKCk7CiAgICAgdm9pZCByZW1vdmVQcmV2YWxlbnRE b21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zKTsKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0YmU3MTMzZjhhOTA1NTk5ZmZhN2Vm Mjc3YmQ3ZTQyOGZmZDI0NTU5Li5mZmIwNWJiMDVhYTgyMzY4NjFiYjUzMWQ2Y2Y2ZGJjOThiNWIx NzE1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTgtMDctMDIgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0aXN0aWNzOiBNYWtlIFdlYnNpdGVE YXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKCkgY2FsbCB0aGUgcmlnaHQgbmV0 d29yayBwcm9jZXNzIGluc3RlYWQgb2YgaXRlcmF0aW5nIG92ZXIgdGhlIHByb2Nlc3MgcG9vbHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzI3Nwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDE3NDU1MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RD b250cm9sbGVyQ29jb2EubW06CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpnZXRBbGxT dG9yYWdlQWNjZXNzRW50cmllcyk6CisKIDIwMTgtMDctMDIgIFphbiBEb2JlcnNlayAgPHpkb2Jl cnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdIEFkZCB0b3VjaCBzdXBwb3J0IHRvIFdp bmRvd1ZpZXdCYWNrZW5kCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29h L1Rlc3RDb250cm9sbGVyQ29jb2EubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rl c3RDb250cm9sbGVyQ29jb2EubW0KaW5kZXggZTZlZmIyNzk1ZDIxYmNkZmYzOTZiYzY4MmU2Mjcw ZjYwNzcwYzBjZS4uYzk4YmVhNDc2MmMyZjA0MjQxMTUzYzRkMTFmMWU5NjNiZDUyYTQyMCAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29h Lm1tCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2Nv YS5tbQpAQCAtMjY2LDEzICsyNjYsMTUgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cmVtb3ZlQWxs U2Vzc2lvbkNyZWRlbnRpYWxzKCkKIHZvaWQgVGVzdENvbnRyb2xsZXI6OmdldEFsbFN0b3JhZ2VB Y2Nlc3NFbnRyaWVzKCkKIHsKICNpZiBXS19BUElfRU5BQkxFRAotICAgIFtnbG9iYWxXZWJWaWV3 Q29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3JlIF9nZXRBbGxTdG9yYWdlQWNjZXNzRW50cmll czpeKE5TQXJyYXk8TlNTdHJpbmcgKj4gKm5zRG9tYWlucykgewotICAgICAgICBWZWN0b3I8U3Ry aW5nPiBkb21haW5zOwotICAgICAgICBkb21haW5zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobnNE b21haW5zLmNvdW50KTsKLSAgICAgICAgZm9yIChOU1N0cmluZyAqZG9tYWluIDogbnNEb21haW5z KQotICAgICAgICAgICAgZG9tYWlucy51bmNoZWNrZWRBcHBlbmQoZG9tYWluKTsKLSAgICAgICAg bV9jdXJyZW50SW52b2NhdGlvbi0+ZGlkUmVjZWl2ZUFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKGRv bWFpbnMpOwotICAgIH1dOworICAgIGlmIChhdXRvKiBwYXJlbnRWaWV3ID0gbWFpbldlYlZpZXco KSkgeworICAgICAgICBbZ2xvYmFsV2ViVmlld0NvbmZpZ3VyYXRpb24ud2Vic2l0ZURhdGFTdG9y ZSBfZ2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXNGb3I6cGFyZW50Vmlldy0+cGxhdGZvcm1WaWV3 KCkgY29tcGxldGlvbkhhbmRsZXI6XihOU0FycmF5PE5TU3RyaW5nICo+ICpuc0RvbWFpbnMpIHsK KyAgICAgICAgICAgIFZlY3RvcjxTdHJpbmc+IGRvbWFpbnM7CisgICAgICAgICAgICBkb21haW5z LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobnNEb21haW5zLmNvdW50KTsKKyAgICAgICAgICAgIGZv ciAoTlNTdHJpbmcgKmRvbWFpbiA6IG5zRG9tYWlucykKKyAgICAgICAgICAgICAgICBkb21haW5z LnVuY2hlY2tlZEFwcGVuZChkb21haW4pOworICAgICAgICAgICAgbV9jdXJyZW50SW52b2NhdGlv bi0+ZGlkUmVjZWl2ZUFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKGRvbWFpbnMpOworICAgICAgICB9 XTsKKyAgICB9CiAjZW5kaWYKIH0KIAo= 344195 2018-07-03 10:46:32 -0700 2018-07-03 11:25:42 -0700 Patch for landing bug-187277-20180703104631.patch text/plain 9574 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2YzA4ZTI5MjE1YjhkZDM0 M2VmZWJjZmMwNzNlMWViZWY3M2JmNzMuLjNjYzgzM2NkZTNhNDZhOGIyNWQ3NTNmYzNhYzg2NmYw ODZiY2Y3NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTgtMDctMDMgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0 aXN0aWNzOiBNYWtlIFdlYnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVz KCkgY2FsbCB0aGUgcmlnaHQgbmV0d29yayBwcm9jZXNzIGluc3RlYWQgb2YgaXRlcmF0aW5nIG92 ZXIgdGhlIHByb2Nlc3MgcG9vbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NzI3NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDE3NDU1MTA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgRXhpc3RpbmcgdGVz dHMgdXNlIHRoaXMgY29kZS4gVGhlIGNoYW5nZSBpcyBmb3IgY29ycmVjdG5lc3MuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAg KC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9nZXRBbGxTdG9yYWdlQWNjZXNzRW50cmllc0Zvcjpjb21w bGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgICAgIE5vdyByZWNlaXZlcyBhIFdLV2ViVmlldyBm cm9tIGl0cyBjYWxsZXIgYW5kIGdldHMgdGhlIHBhZ2UgSUQgZnJvbSBpdC4KKyAgICAgICAgKC1b V0tXZWJzaXRlRGF0YVN0b3JlIF9nZXRBbGxTdG9yYWdlQWNjZXNzRW50cmllczpdKTogRGVsZXRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZh dGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nl c3NFbnRyaWVzKToKKyAgICAgICAgICAgIE5vdyBnZXRzIGEgcGFnZSBJRCBmcm9tIGl0cyBjYWxs ZXIgYW5kIGdldHMgdGhlIHJpZ2h0IG5ldHdvcmsgcHJvY2VzcworICAgICAgICAgICAgdGhyb3Vn aCBpdC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5o OgorCiAyMDE4LTA3LTAyICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OKHIyMzMzODEpOiBEb3VibGUgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlIGRlc3RydWN0b3IgaW52b2NhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KaW5kZXggODcyYmEz ZGI3NDY3ODRiMWIyZDk2Zjc4NTZmY2VhMTI0NjI0Mjg2OC4uODI1MjMyMjY4MmVhOWE4MDYyNDVj Y2U1ODY4NWNhZDk0MjI0OGYxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCkBAIC0zMSw3ICszMSw5IEBACiAj aW1wb3J0ICJBUElTdHJpbmcuaCIKICNpbXBvcnQgIldLSFRUUENvb2tpZVN0b3JlSW50ZXJuYWwu aCIKICNpbXBvcnQgIldLTlNBcnJheS5oIgorI2ltcG9ydCAiV0tXZWJWaWV3SW50ZXJuYWwuaCIK ICNpbXBvcnQgIldLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oIgorI2ltcG9ydCAiV2ViUGFn ZVByb3h5LmgiCiAjaW1wb3J0ICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCIKICNp bXBvcnQgIldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NUZWxlbWV0cnkuaCIKICNpbXBvcnQgIldl YnNpdGVEYXRhRmV0Y2hPcHRpb24uaCIKQEAgLTM0MywxNCArMzQ1LDI0IEBAICsgKHZvaWQpX2Fs bG93V2Vic2l0ZURhdGFSZWNvcmRzRm9yQWxsT3JpZ2lucwogICAgIFdlYktpdDo6V2Vic2l0ZURh dGFTdG9yZTo6YWxsb3dXZWJzaXRlRGF0YVJlY29yZHNGb3JBbGxPcmlnaW5zKCk7CiB9CiAKLS0g KHZvaWQpX2dldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzOih2b2lkICheKShOU0FycmF5PE5TU3Ry aW5nICo+ICpkb21haW5zKSljb21wbGV0aW9uSGFuZGxlcgorLSAodm9pZClfZ2V0QWxsU3RvcmFn ZUFjY2Vzc0VudHJpZXNGb3I6KFdLV2ViVmlldyAqKXdlYlZpZXcgY29tcGxldGlvbkhhbmRsZXI6 KHZvaWQgKF4pKE5TQXJyYXk8TlNTdHJpbmcgKj4gKmRvbWFpbnMpKWNvbXBsZXRpb25IYW5kbGVy CiB7Ci0gICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5nZXRBbGxTdG9y YWdlQWNjZXNzRW50cmllcyhbY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxl dGlvbkhhbmRsZXIpXShhdXRvIGRvbWFpbnMpIHsKKyAgICBpZiAoIXdlYlZpZXcpIHsKKyAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIoeyB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IGF1dG8qIHdlYlBhZ2VQcm94eSA9IFt3ZWJWaWV3IF9wYWdlXTsKKyAgICBpZiAoIXdlYlBhZ2VQ cm94eSkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5nZXRB bGxTdG9yYWdlQWNjZXNzRW50cmllcyh3ZWJQYWdlUHJveHktPnBhZ2VJRCgpLCBbY29tcGxldGlv bkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIpXShhdXRvIGRvbWFpbnMp IHsKICAgICAgICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IGFwaURvbWFpbnM7CiAgICAg ICAgIGFwaURvbWFpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShkb21haW5zLnNpemUoKSk7CiAg ICAgICAgIGZvciAoYXV0byYgZG9tYWluIDogZG9tYWlucykKICAgICAgICAgICAgIGFwaURvbWFp bnMudW5jaGVja2VkQXBwZW5kKEFQSTo6U3RyaW5nOjpjcmVhdGUoZG9tYWluKSk7Ci0KICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIod3JhcHBlcihBUEk6OkFycmF5OjpjcmVhdGUoV1RGTW92ZShh cGlEb21haW5zKSkpKTsKICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0ZS5oCmluZGV4 IGRkYTdjZGU1NmE2MDEwMDM3NWU3NjhhZTM3YTVhZGM3NjRjMGE0NzcuLjM2OTQ0ZmNjNDhkNTg1 NjEwYjkxMzI5N2ZhZTAwOTU2OWI2ZmM2NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaApA QCAtMzAsNiArMzAsNyBAQAogTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIAogQGNsYXNzIF9XS1dl YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uOworQGNsYXNzIFdLV2ViVmlldzsKIAogdHlwZWRl ZiBOU19PUFRJT05TKE5TVUludGVnZXIsIF9XS1dlYnNpdGVEYXRhU3RvcmVGZXRjaE9wdGlvbnMp IHsKICAgICBfV0tXZWJzaXRlRGF0YVN0b3JlRmV0Y2hPcHRpb25Db21wdXRlU2l6ZXMgPSAxIDw8 IDAsCkBAIC01Niw3ICs1Nyw3IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tX ZWJzaXRlRGF0YVN0b3JlRmV0Y2hPcHRpb25zKSB7CiAKIC0gKHZvaWQpX3Jlc291cmNlTG9hZFN0 YXRpc3RpY3NTZXRTaG91bGRTdWJtaXRUZWxlbWV0cnk6KEJPT0wpdmFsdWUgV0tfQVBJX0FWQUlM QUJMRShtYWNvc3goMTAuMTMpLCBpb3MoMTEuMCkpOwogLSAodm9pZClfc2V0UmVzb3VyY2VMb2Fk U3RhdGlzdGljc1Rlc3RpbmdDYWxsYmFjazoobnVsbGFibGUgdm9pZCAoXikoV0tXZWJzaXRlRGF0 YVN0b3JlICosIE5TU3RyaW5nICopKWNhbGxiYWNrIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEw LjEzKSwgaW9zKDExLjApKTsKLS0gKHZvaWQpX2dldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzOih2 b2lkICheKShOU0FycmF5PE5TU3RyaW5nICo+ICpkb21haW5zKSljb21wbGV0aW9uSGFuZGxlciBX S19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0g KHZvaWQpX2dldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzRm9yOihXS1dlYlZpZXcgKil3ZWJWaWV3 IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU0FycmF5PE5TU3RyaW5nICo+ICpkb21haW5z KSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKICsgKHZvaWQpX2FsbG93V2Vic2l0ZURhdGFSZWNvcmRzRm9yQWxs T3JpZ2lucyBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xMy40KSwgaW9zKDExLjMpKTsKIC0g KGJvb2wpX2hhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4 KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDUw ZGExMGFlNWQ2N2RkYWY1MTFkYTgzMTM2ODlhZjdmZmY1MGVkYmEuLjA2ZmM1MDVlZDJiYjlhNTRm YWVkMjE3MTVlYTQzZTBiYmVlMDdjOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xMjMwLDExICsx MjMwLDE2IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6aGFzU3RvcmFnZUFjY2Vzc0ZvckZyYW1l SGFuZGxlcihjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tCiAgICAgbmV0d29ya1Byb2Nlc3MuaGFz U3RvcmFnZUFjY2Vzc0ZvckZyYW1lKG1fc2Vzc2lvbklELCByZXNvdXJjZURvbWFpbiwgZmlyc3RQ YXJ0eURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7 CiB9CiAKLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6Z2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXMo Q29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8U3RyaW5nPiYmIGRvbWFpbnMpPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXRBbGxTdG9yYWdlQWNjZXNz RW50cmllcyh1aW50NjRfdCBwYWdlSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFN0 cmluZz4mJiBkb21haW5zKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICAvLyBGSVhNRTog QWx0aG91Z2ggdGhpcyBpcyBvbmx5IHVzZWQgZm9yIHRlc3RpbmcsIGl0IHNob3VsZCBub3QgaXRl cmF0ZSBhbmQgV1RGTW92ZSB0aGUgY29tcGxldGlvbiBoYW5kbGVyLgotICAgIGZvciAoYXV0byYg cHJvY2Vzc1Bvb2wgOiBwcm9jZXNzUG9vbHMoKSkKLSAgICAgICAgcHJvY2Vzc1Bvb2wtPm5ldHdv cmtQcm9jZXNzKCktPmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKG1fc2Vzc2lvbklELCBXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgYXV0byogd2ViUGFnZSA9IFdlYlByb2Nlc3NQ cm94eTo6d2ViUGFnZShwYWdlSUQpOworICAgIGlmICghd2ViUGFnZSkgeworICAgICAgICBjb21w bGV0aW9uSGFuZGxlcih7IH0pOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAorICAgIGF1 dG8mIG5ldHdvcmtQcm9jZXNzID0gd2ViUGFnZS0+cHJvY2VzcygpLnByb2Nlc3NQb29sKCkuZW5z dXJlTmV0d29ya1Byb2Nlc3MoKTsKKyAgICBuZXR3b3JrUHJvY2Vzcy5nZXRBbGxTdG9yYWdlQWNj ZXNzRW50cmllcyhtX3Nlc3Npb25JRCwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQog CiB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzc0hhbmRsZXIoY29uc3Qg U3RyaW5nJiByZXNvdXJjZURvbWFpbiwgY29uc3QgU3RyaW5nJiBmaXJzdFBhcnR5RG9tYWluLCBz dGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoYm9vbCB3YXNHcmFudGVkKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh U3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh U3RvcmUuaAppbmRleCBiOTA2NmFlNGUxYjA4ZWI0NTY2ODE5ZDYwOTc1Y2UxYThhYWRjMThhLi4w MmRlMThlZjY5ZDA5ZTAzOWU4OGZlZDk0NGU5YTYyYjRkZmJkYzc5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCkBA IC0xMzIsNyArMTMyLDcgQEAgcHVibGljOgogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JBR0VfUEFS VElUSU9OSU5HKQogICAgIHZvaWQgdXBkYXRlUHJldmFsZW50RG9tYWluc1RvUGFydGl0aW9uT3JC bG9ja0Nvb2tpZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb1BhcnRpdGlvbiwgY29u c3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0Jsb2NrLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYg ZG9tYWluc1RvTmVpdGhlclBhcnRpdGlvbk5vckJsb2NrLCBTaG91bGRDbGVhckZpcnN0LCBDb21w bGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgaGFzU3RvcmFnZUFjY2Vzc0ZvckZy YW1lSGFuZGxlcihjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBTdHJpbmcmIGZp cnN0UGFydHlEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChib29sIGhhc0FjY2Vzcyk+JiYpOwotICAgIHZvaWQgZ2V0QWxsU3Rv cmFnZUFjY2Vzc0VudHJpZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8U3RyaW5nPiYm IGRvbWFpbnMpPiYmKTsKKyAgICB2b2lkIGdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKHVpbnQ2 NF90IHBhZ2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8U3RyaW5nPiYmIGRvbWFp bnMpPiYmKTsKICAgICB2b2lkIGdyYW50U3RvcmFnZUFjY2Vzc0hhbmRsZXIoY29uc3QgU3RyaW5n JiByZXNvdXJjZURvbWFpbiwgY29uc3QgU3RyaW5nJiBmaXJzdFBhcnR5RG9tYWluLCBzdGQ6Om9w dGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIENvbXBsZXRpb25IYW5k bGVyPHZvaWQoYm9vbCB3YXNHcmFudGVkKT4mJik7CiAgICAgdm9pZCByZW1vdmVBbGxTdG9yYWdl QWNjZXNzSGFuZGxlcigpOwogICAgIHZvaWQgcmVtb3ZlUHJldmFsZW50RG9tYWlucyhjb25zdCBW ZWN0b3I8U3RyaW5nPiYgZG9tYWlucyk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggNGJlNzEzM2Y4YTkwNTU5OWZmYTdlZjI3N2JkN2U0MjhmZmQy NDU1OS4uZTc5NTc3NGJmZTE0YTQ1Zjc4ODQ5NzZkMDQyODhhZTlkM2JjMzgxYyAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDE4LTA3LTAzICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAg ICAgIFJlc291cmNlIExvYWQgU3RhdGlzdGljczogTWFrZSBXZWJzaXRlRGF0YVN0b3JlOjpnZXRB bGxTdG9yYWdlQWNjZXNzRW50cmllcygpIGNhbGwgdGhlIHJpZ2h0IG5ldHdvcmsgcHJvY2VzcyBp bnN0ZWFkIG9mIGl0ZXJhdGluZyBvdmVyIHRoZSBwcm9jZXNzIHBvb2xzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODcyNzcKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzQxNzQ1NTEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6Lgor CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1t OgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Z2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJp ZXMpOgorCiAyMDE4LTA3LTAyICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4K IAogICAgICAgICBbV1BFXSBBZGQgdG91Y2ggc3VwcG9ydCB0byBXaW5kb3dWaWV3QmFja2VuZApk aWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNv Y29hLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29h Lm1tCmluZGV4IGU2ZWZiMjc5NWQyMWJjZGZmMzk2YmM2ODJlNjI3MGY2MDc3MGMwY2UuLmM3Yjdh ZGMwZDQwZjE0NTU4MDlhNmFkNmQ4MjIyYmQ5OTFmYzg1MmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQorKysgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0KQEAgLTI2Niw3ICsy NjYsMTEgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cmVtb3ZlQWxsU2Vzc2lvbkNyZWRlbnRpYWxz KCkKIHZvaWQgVGVzdENvbnRyb2xsZXI6OmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKCkKIHsK ICNpZiBXS19BUElfRU5BQkxFRAotICAgIFtnbG9iYWxXZWJWaWV3Q29uZmlndXJhdGlvbi53ZWJz aXRlRGF0YVN0b3JlIF9nZXRBbGxTdG9yYWdlQWNjZXNzRW50cmllczpeKE5TQXJyYXk8TlNTdHJp bmcgKj4gKm5zRG9tYWlucykgeworICAgIGF1dG8qIHBhcmVudFZpZXcgPSBtYWluV2ViVmlldygp OworICAgIGlmICghcGFyZW50VmlldykKKyAgICAgICAgcmV0dXJuOworCisgICAgW2dsb2JhbFdl YlZpZXdDb25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmUgX2dldEFsbFN0b3JhZ2VBY2Nlc3NF bnRyaWVzRm9yOnBhcmVudFZpZXctPnBsYXRmb3JtVmlldygpIGNvbXBsZXRpb25IYW5kbGVyOl4o TlNBcnJheTxOU1N0cmluZyAqPiAqbnNEb21haW5zKSB7CiAgICAgICAgIFZlY3RvcjxTdHJpbmc+ IGRvbWFpbnM7CiAgICAgICAgIGRvbWFpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShuc0RvbWFp bnMuY291bnQpOwogICAgICAgICBmb3IgKE5TU3RyaW5nICpkb21haW4gOiBuc0RvbWFpbnMpCg==