217228 2020-10-02 08:59:23 -0700 Multiple calls to suspend media playback for the same page may result in resuming media playback too soon 2020-10-02 16:16:52 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1694101 0 katherine_cheney 2020-10-02 08:59:23 -0700 It’s possible that multiple calls to _suspendAllMediaPlayback() could occur in the same WKWebView with different expectations of when to resume. The current implementation will resume after one call to _resumeAllMediaPlayback(). Instead, we should make sure that all calls to _suspendAllMediaPlayback() have been resolved with _resumeAllMediaPlayback() before actually resuming media content. Adding a counter to track how many calls to suspend have been made and only resuming when the counter is at 0 is a potential solution. 1694102 1 katherine_cheney 2020-10-02 08:59:40 -0700 rdar://problem/69709346 1694111 2 410330 katherine_cheney 2020-10-02 09:20:49 -0700 Created attachment 410330 Patch 1694224 3 410366 katherine_cheney 2020-10-02 13:58:03 -0700 Created attachment 410366 Patch 1694252 4 410366 eric.carlson 2020-10-02 15:10:53 -0700 Comment on attachment 410366 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410366&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:1897 > + return (NSInteger *)(static_cast<long>(_page->suspendMediaPlaybackCounter())); can you `return @(_page->suspendMediaPlaybackCounter())` ? > Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:345 > +- (NSInteger *)_suspendMediaPlaybackCounter WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); This should probably be WKWebViewPrivateForTesting.h > Source/WebKit/UIProcess/WebPageProxy.cpp:6045 > + if (!m_mediaPlaybackIsSuspended || m_suspendMediaPlaybackCounter > 0) if (!m_mediaPlaybackIsSuspended || m_suspendMediaPlaybackCounter) > Tools/TestWebKitAPI/Tests/WebKitCocoa/StopSuspendResumeAllMedia.mm:115 > + auto counter = [webView _suspendMediaPlaybackCounter]; > + if (counter >= (NSInteger *)(static_cast<long>(2))) if ([webView _suspendMediaPlaybackCounter] <= @(2)) > Tools/TestWebKitAPI/Tests/WebKitCocoa/StopSuspendResumeAllMedia.mm:123 > + auto counter = [webView _suspendMediaPlaybackCounter]; > + if (counter <= (NSInteger *)(static_cast<long>(1))) if ([webView _suspendMediaPlaybackCounter] <= @(1)) 1694261 5 katherine_cheney 2020-10-02 15:32:15 -0700 (In reply to Eric Carlson from comment #4) > Comment on attachment 410366 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=410366&action=review > Thanks for the review! > > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:1897 > > + return (NSInteger *)(static_cast<long>(_page->suspendMediaPlaybackCounter())); > > can you `return @(_page->suspendMediaPlaybackCounter())` ? > Yep, will change. > > Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:345 > > +- (NSInteger *)_suspendMediaPlaybackCounter WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); > > This should probably be WKWebViewPrivateForTesting.h > Cool, didn't know about this, I'll move it. > > Source/WebKit/UIProcess/WebPageProxy.cpp:6045 > > + if (!m_mediaPlaybackIsSuspended || m_suspendMediaPlaybackCounter > 0) > > if (!m_mediaPlaybackIsSuspended || m_suspendMediaPlaybackCounter) > Will fix. > > Tools/TestWebKitAPI/Tests/WebKitCocoa/StopSuspendResumeAllMedia.mm:115 > > + auto counter = [webView _suspendMediaPlaybackCounter]; > > + if (counter >= (NSInteger *)(static_cast<long>(2))) > > if ([webView _suspendMediaPlaybackCounter] <= @(2)) > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/StopSuspendResumeAllMedia.mm:123 > > + auto counter = [webView _suspendMediaPlaybackCounter]; > > + if (counter <= (NSInteger *)(static_cast<long>(1))) > > if ([webView _suspendMediaPlaybackCounter] <= @(1)) I got 'error: direct comparison of a numeric literal has undefined behavior' with this change, but I can change it to if ([webView _suspendMediaPlaybackCounter].intValue <= 1) to avoid the casting. 1694265 6 410382 katherine_cheney 2020-10-02 15:36:19 -0700 Created attachment 410382 Patch for landing 1694281 7 ews-feeder 2020-10-02 16:15:17 -0700 Committed r267899: <https://trac.webkit.org/changeset/267899> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410382. 1694282 8 webkit-bug-importer 2020-10-02 16:16:52 -0700 <rdar://problem/69901158> 410330 2020-10-02 09:20:49 -0700 2020-10-02 13:58:01 -0700 Patch bug-217228-20201002092049.patch text/plain 9320 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFhNjBiOWIwN2QxOTI0NmFj YzlmZGE2ZDU0MGUyMDM5YjdlMzRkYmQuLjE0MTFiYzEwOGIzN2RlODYxNDk4OGE0ZDdiZDUyNmFh OTJlNDFmNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjAtMTAtMDIgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgTXVsdGlwbGUgY2Fs bHMgdG8gc3VzcGVuZCBtZWRpYSBwbGF5YmFjayBmb3IgdGhlIHNhbWUgV0tXZWJWaWV3IG1heSBy ZXN1bHQgaW4gcmVzdW1pbmcgbWVkaWEgcGxheWJhY2sgdG9vIHNvb24KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzIyOAorICAgICAgICByZGFyOi8v cHJvYmxlbS82OTcwOTM0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENhbGxzIHRvIHN1c3BlbmQvcmVzdW1lIG1lZGlhIHBsYXliYWNrIHNob3VsZCBh bHdheXMgYmUgY2FsbGVkIGluCisgICAgICAgIHBhaXJzLiBUaGUgY3VycmVudCBpbXBsZW1lbnRh dGlvbiByZXN1bWVzIG1lZGlhIHBsYXliYWNrIG9uIHRoZSBmaXJzdAorICAgICAgICBjYWxsIHRv IF9yZXN1bWVBbGxNZWRpYVBsYXliYWNrIGV2ZW4gaWYgbXVsdGlwbGUgY2FsbHMgdG8gX3N1c3Bl bmRBbGxNZWRpYVBsYXliYWNrCisgICAgICAgIGhhdmUgYmVlbiBtYWRlLiBUaGlzIHBhdGNoIGFk ZHMgYSBjb3VudGVyIHRvIHRyYWNrIGhvdyBtYW55IGNhbGxzIHRvCisgICAgICAgIF9zdXNwZW5k QWxsTWVkaWFQbGF5YmFjayBoYXZlIG9jY3VycmVkLCBhbmQgb25seSByZXN1bWVzIG9uY2UgdGhl CisgICAgICAgIGNvdW50ZXIgcmVhY2hlcyAwLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfc3VzcGVuZE1lZGlhUGxh eWJhY2tDb3VudGVyXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc3VzcGVuZEFsbE1lZGlhUGxh eWJhY2tdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9yZXN1bWVBbGxNZWRpYVBsYXliYWNrXSk6 CisgICAgICAgIE5ldmVyIGxldCB0aGUgY291bnRlciBnZXQgYmVsb3cgemVyby4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpz ZXRTdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnN1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcik6CisKIDIwMjAtMDktMzAgIEthdGUg Q2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3JlYXRlIGFu IEFQSSBmb3IgYSBwYWdlIHRvIGFzayBpZiBpdCBzaG91bGQgZGlzcGxheSBhIGNvbnNlbnQgYmFu bmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpp bmRleCAwZDYxNzcwNTIyY2EyNDA5M2RhMzBlYzVkYzkyYmY4ODY0ODJjMmYzLi42NmQxMmE0NmUy YmRlMmUxNTJjZjBhYzBkNDgwZmU2ZWUwZmFlMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE4OTIsMTQgKzE4OTIsMjMgQEAgLSAo dm9pZClfc3RvcEFsbE1lZGlhUGxheWJhY2sKICAgICBfcGFnZS0+c3RvcEFsbE1lZGlhUGxheWJh Y2soKTsKIH0KIAorLSAoTlNJbnRlZ2VyICopX3N1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcgor eworICAgIHJldHVybiAoTlNJbnRlZ2VyICopKHN0YXRpY19jYXN0PGxvbmc+KF9wYWdlLT5zdXNw ZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIoKSkpOworfQorCiAtICh2b2lkKV9zdXNwZW5kQWxsTWVk aWFQbGF5YmFjawogeworICAgIF9wYWdlLT5zZXRTdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIo X3BhZ2UtPnN1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcigpICsgMSk7CiAgICAgX3BhZ2UtPnN1 c3BlbmRBbGxNZWRpYVBsYXliYWNrKCk7CiB9CiAKIC0gKHZvaWQpX3Jlc3VtZUFsbE1lZGlhUGxh eWJhY2sKIHsKLSAgICBfcGFnZS0+cmVzdW1lQWxsTWVkaWFQbGF5YmFjaygpOworICAgIGlmIChf cGFnZS0+c3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyKCkgPiAwKQorICAgICAgICBfcGFnZS0+ c2V0U3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyKF9wYWdlLT5zdXNwZW5kTWVkaWFQbGF5YmFj a0NvdW50ZXIoKSAtIDEpOworICAgIGlmIChfcGFnZS0+c3VzcGVuZE1lZGlhUGxheWJhY2tDb3Vu dGVyKCkgPD0gMCkKKyAgICAgICAgX3BhZ2UtPnJlc3VtZUFsbE1lZGlhUGxheWJhY2soKTsKIH0K IAogLSAoTlNVUkwgKilfdW5yZWFjaGFibGVVUkwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IDgyYTE3ZGM2Yzg5ZmEx MjViYTZlNDg3ZGRiZWZmZGY2MTI3YjhkNTUuLjI2MDQyYWQyYjM4YzhhM2YzMmI5YjA4OTBkYTIz ZWMxZTRmZmE1YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlld1ByaXZhdGUuaApAQCAtMzQyLDYgKzM0Miw3IEBAIGZvciB0aGlzIHByb3Bl cnR5LgogLSAodm9pZClfc3VzcGVuZEFsbE1lZGlhUGxheWJhY2s7CiAtICh2b2lkKV9yZXN1bWVB bGxNZWRpYVBsYXliYWNrOwogLSAodm9pZClfY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnM7Cist IChOU0ludGVnZXIgKilfc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyOwogCiAtICh2b2lkKV90 YWtlUERGU25hcHNob3RXaXRoQ29uZmlndXJhdGlvbjooV0tTbmFwc2hvdENvbmZpZ3VyYXRpb24g KilzbmFwc2hvdENvbmZpZ3VyYXRpb24gY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TRGF0 YSAqcGRmU25hcHNob3REYXRhLCBOU0Vycm9yICplcnJvcikpY29tcGxldGlvbkhhbmRsZXIgV0tf QVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAwOWUxYzhkMWIyNjMxNzA2YTdm NGE1NDNhMmRmMDU1NWY2MDk2NDUxLi4zODBmZDcxZjUxM2U0NDBiYTYxNTY1OGE0M2VlNTI4OWMz N2Y2NjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTgzMCw2 ICsxODMwLDggQEAgcHVibGljOgogCiAgICAgU2Vjb25kcyBtZWRpYUNhcHR1cmVSZXBvcnRpbmdE ZWxheSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFDYXB0dXJlUmVwb3J0aW5nRGVsYXk7IH0KICAg ICB2b2lkIHNldE1lZGlhQ2FwdHVyZVJlcG9ydGluZ0RlbGF5KFNlY29uZHMgY2FwdHVyZVJlcG9y dGluZ0RlbGF5KSB7IG1fbWVkaWFDYXB0dXJlUmVwb3J0aW5nRGVsYXkgPSBjYXB0dXJlUmVwb3J0 aW5nRGVsYXk7IH0KKyAgICB2b2lkIHNldFN1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcihzaXpl X3QgY291bnQpIHsgbV9zdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIgPSBjb3VudDsgfQorICAg IHNpemVfdCBzdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIoKSB7IHJldHVybiBtX3N1c3BlbmRN ZWRpYVBsYXliYWNrQ291bnRlcjsgfQogCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+JiYp OwpAQCAtMjkwMSw2ICsyOTAzLDggQEAgcHJpdmF0ZToKICAgICBib29sIG1fdXNlclNjcmlwdHNO b3RpZmllZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc0V4ZWN1dGVkQXBwQm91bmRCZWhhdmlv ckJlZm9yZU5hdmlnYXRpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9jYW5Vc2VDcmVkZW50aWFs U3RvcmFnZSB7IHRydWUgfTsKKworICAgIHVuc2lnbmVkIG1fc3VzcGVuZE1lZGlhUGxheWJhY2tD b3VudGVyIHsgMCB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGI1MjNiNTIyNzA4YjA0OWU2 NDk1YzdlNzdmMzRiMzU4ODY3ZTFmYS4uMmE4M2JmYzYzODQxOWIxMjMxMjBkMDY1MGQ0M2YxNTI4 YTA5Nzc5OSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEwLTAyICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9j aGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIE11bHRpcGxlIGNhbGxzIHRvIHN1c3BlbmQgbWVk aWEgcGxheWJhY2sgZm9yIHRoZSBzYW1lIFdLV2ViVmlldyBtYXkgcmVzdWx0IGluIHJlc3VtaW5n IG1lZGlhIHBsYXliYWNrIHRvbyBzb29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTcyMjgKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjk3MDkzNDYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJ IHRlc3QgY292ZXJhZ2UuIEZpeCB0aGUgZXhpc3RpbmcgU3VzcGVuZFJlc3VtZUFsbE1lZGlhUGxh eWJhY2sKKyAgICAgICAgdGVzdCB3aGljaCBoYWQgYSBzbWFsbCBKYXZhU2NyaXB0IGJ1ZywgYW5k IHdhcyBtaXNzaW5nIGEgY2FsbCB0bworICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRpZFJlamVjdCkgd2hpY2ggYWxsb3dlZCB0aGUgYnVnIHRvIGdvCisgICAgICAgIHVubm90aWNl ZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3RvcFN1c3Bl bmRSZXN1bWVBbGxNZWRpYS5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAy MDIwLTA5LTMwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAg ICAgICAgIENyZWF0ZSBhbiBBUEkgZm9yIGEgcGFnZSB0byBhc2sgaWYgaXQgc2hvdWxkIGRpc3Bs YXkgYSBjb25zZW50IGJhbm5lcgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9TdG9wU3VzcGVuZFJlc3VtZUFsbE1lZGlhLm1tIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TdG9wU3VzcGVuZFJlc3VtZUFsbE1lZGlhLm1tCmlu ZGV4IGNlNzYwMmRmZWUzZTAxMjg2MWY3YjJhNzRlYzYyMGRkNTIwMGZhOTIuLjRhY2U1MDFmZGQ4 MDAxNjUzMDIwNDUxM2MzZGU4YmNlZGY0MDRmOGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3RvcFN1c3BlbmRSZXN1bWVBbGxNZWRpYS5tbQorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1N0b3BTdXNwZW5kUmVzdW1l QWxsTWVkaWEubW0KQEAgLTc1LDcgKzc1LDYxIEBAIFRFU1QoV0tXZWJWaWV3LCBTdXNwZW5kUmVz dW1lQWxsTWVkaWFQbGF5YmFjaykKIAogICAgIF9fYmxvY2sgYm9vbCBkaWRSZWplY3QgPSBmYWxz ZTsKICAgICBbd2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdNZXNzYWdlOkAicmVqZWN0ZWQi IGFjdGlvbjpeeyBkaWRSZWplY3QgPSB0cnVlOyB9XTsKLSAgICBbd2ViVmlldyBldmFsdWF0ZUph dmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCd2aWRlbycpLnBsYXkoKS5jYXRjaCgo KSA9IHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3Nh Z2UoJ3JlamVjdGVkJyk7IH0pIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAgIFt3ZWJWaWV3 IGV2YWx1YXRlSmF2YVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3ZpZGVvJykucGxh eSgpLmNhdGNoKCgpID0+IHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRs ZXIucG9zdE1lc3NhZ2UoJ3JlamVjdGVkJyk7IH0pIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOwor ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGlkUmVqZWN0KTsKKworICAgIGRpZEJlZ2lu UGxheWluZyA9IGZhbHNlOworICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3Nh Z2U6QCJwbGF5aW5nIiBhY3Rpb246XnsgZGlkQmVnaW5QbGF5aW5nID0gdHJ1ZTsgfV07CisgICAg W3dlYlZpZXcgX3Jlc3VtZUFsbE1lZGlhUGxheWJhY2tdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZGlkQmVnaW5QbGF5aW5nKTsKK30KKworVEVTVChXS1dlYlZpZXcsIFN1c3BlbmRS ZXN1bWVBbGxNZWRpYVBsYXliYWNrTXVsdGlwbGVUaW1lcykKK3sKKyAgICBhdXRvIGNvbmZpZ3Vy YXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwor ICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0 aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMTAwLCAxMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJh dGlvbi5nZXQoKSBhZGRUb1dpbmRvdzpZRVNdKTsKKworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3Vz bHlMb2FkSFRNTFN0cmluZzpAIjx2aWRlbyBzcmM9XCJ2aWRlby13aXRoLWF1ZGlvLm1wNFwiIHdl YmtpdC1wbGF5c2lubGluZT48L3ZpZGVvPiJdOworCisgICAgW3dlYlZpZXcgb2JqZWN0QnlFdmFs dWF0aW5nSmF2YVNjcmlwdDpAImZ1bmN0aW9uIGV2ZW50VG9NZXNzYWdlKGV2ZW50KXt3aW5kb3cu d2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZShldmVudC50eXBl KTt9IHZhciB2aWRlbyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3ZpZGVvJyk7IHZpZGVvLmFk ZEV2ZW50TGlzdGVuZXIoJ3BsYXlpbmcnLCBldmVudFRvTWVzc2FnZSk7IHZpZGVvLmFkZEV2ZW50 TGlzdGVuZXIoJ3BhdXNlJywgZXZlbnRUb01lc3NhZ2UpOyJdOworCisgICAgX19ibG9jayBib29s IGRpZEJlZ2luUGxheWluZyA9IGZhbHNlOworICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2Vp dmluZ01lc3NhZ2U6QCJwbGF5aW5nIiBhY3Rpb246XnsgZGlkQmVnaW5QbGF5aW5nID0gdHJ1ZTsg fV07CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxl Y3RvcigndmlkZW8nKS5wbGF5KCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZkaWRCZWdpblBsYXlpbmcpOworCisgICAgX19ibG9jayBib29s IGRpZFBhdXNlID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nTWVz c2FnZTpAInBhdXNlIiBhY3Rpb246XnsgZGlkUGF1c2UgPSB0cnVlOyB9XTsKKyAgICBbd2ViVmll dyBfc3VzcGVuZEFsbE1lZGlhUGxheWJhY2tdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZGlkUGF1c2UpOworCisgICAgX19ibG9jayBib29sIGRpZFJlamVjdCA9IGZhbHNlOworICAg IFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJyZWplY3RlZCIgYWN0aW9u Ol57IGRpZFJlamVjdCA9IHRydWU7IH1dOworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlw dDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3ZpZGVvJykucGxheSgpLmNhdGNoKCgpID0+IHsg d2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ3Jl amVjdGVkJyk7IH0pIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmZGlkUmVqZWN0KTsKKworICAgIC8vIFN1c3BlbmQgYWdhaW4gdG8gaW5jcmVt ZW50IHRoZSBjb3VudGVyLgorICAgIFt3ZWJWaWV3IF9zdXNwZW5kQWxsTWVkaWFQbGF5YmFja107 CisgICAgZG8geworICAgICAgICBhdXRvIGNvdW50ZXIgPSBbd2ViVmlldyBfc3VzcGVuZE1lZGlh UGxheWJhY2tDb3VudGVyXTsKKyAgICAgICAgaWYgKGNvdW50ZXIgPj0gKE5TSW50ZWdlciAqKShz dGF0aWNfY2FzdDxsb25nPigyKSkpCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoMSk7CisgICAgfSB3aGlsZSAodHJ1ZSk7CisKKyAg ICBbd2ViVmlldyBfcmVzdW1lQWxsTWVkaWFQbGF5YmFja107CisgICAgZG8geworICAgICAgICBh dXRvIGNvdW50ZXIgPSBbd2ViVmlldyBfc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyXTsKKyAg ICAgICAgaWYgKGNvdW50ZXIgPD0gKE5TSW50ZWdlciAqKShzdGF0aWNfY2FzdDxsb25nPigxKSkp CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1 bkxvb3AoMSk7CisgICAgfSB3aGlsZSAodHJ1ZSk7CisKKyAgICAvLyBNYWtlIHN1cmUgdGhlIG1l ZGlhIGlzIHN0aWxsIHN1c3BlbmRlZC4KKyAgICBkaWRSZWplY3QgPSBmYWxzZTsKKyAgICBbd2Vi VmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdNZXNzYWdlOkAicmVqZWN0ZWQiIGFjdGlvbjpeeyBk aWRSZWplY3QgPSB0cnVlOyB9XTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJk b2N1bWVudC5xdWVyeVNlbGVjdG9yKCd2aWRlbycpLnBsYXkoKS5jYXRjaCgoKSA9PiB7IHdpbmRv dy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdyZWplY3Rl ZCcpOyB9KSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGls OjpydW4oJmRpZFJlamVjdCk7CiAKICAgICBkaWRCZWdpblBsYXlpbmcgPSBmYWxzZTsKICAgICBb d2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdNZXNzYWdlOkAicGxheWluZyIgYWN0aW9uOl57 IGRpZEJlZ2luUGxheWluZyA9IHRydWU7IH1dOwo= 410366 2020-10-02 13:58:03 -0700 2020-10-02 15:36:17 -0700 Patch bug-217228-20201002135802.patch text/plain 9733 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDllN2Q0ZjAyZjNkNGUyZjE3 NmZjNDYwMDc0YTI2MWU5MDA1ZmUwNTUuLjE2MDAyNzUwODhhOWY2ZDQ2Y2RkN2IxNmUxMzVlMDNh ZjkyM2NmY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMTAtMDIgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgTXVsdGlwbGUgY2Fs bHMgdG8gc3VzcGVuZCBtZWRpYSBwbGF5YmFjayBmb3IgdGhlIHNhbWUgcGFnZSBtYXkgcmVzdWx0 IGluIHJlc3VtaW5nIG1lZGlhIHBsYXliYWNrIHRvbyBzb29uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcyMjgKKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vNjk3MDkzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDYWxscyB0byBzdXNwZW5kL3Jlc3VtZSBtZWRpYSBwbGF5YmFjayBzaG91bGQgYWx3YXlz IGJlIGNhbGxlZCBpbgorICAgICAgICBwYWlycy4gVGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24g cmVzdW1lcyBtZWRpYSBwbGF5YmFjayBvbiB0aGUgZmlyc3QKKyAgICAgICAgY2FsbCB0byByZXN1 bWVBbGxNZWRpYVBsYXliYWNrIGV2ZW4gaWYgbXVsdGlwbGUgY2FsbHMgdG8gc3VzcGVuZEFsbE1l ZGlhUGxheWJhY2sKKyAgICAgICAgaGF2ZSBiZWVuIG1hZGUuIFRoaXMgcGF0Y2ggYWRkcyBhIGNv dW50ZXIgdG8gdHJhY2sgaG93IG1hbnkgY2FsbHMgdG8KKyAgICAgICAgc3VzcGVuZEFsbE1lZGlh UGxheWJhY2sgaGF2ZSBvY2N1cnJlZCwgYW5kIG9ubHkgcmVzdW1lcyBvbmNlIHRoZQorICAgICAg ICBjb3VudGVyIHJlYWNoZXMgMC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3N1c3BlbmRNZWRpYVBsYXliYWNrQ291 bnRlcl0pOgorICAgICAgICBTUEkgZm9yIHRlc3QgcHVycG9zZXMuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzdXNwZW5k QWxsTWVkaWFQbGF5YmFjayk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVzdW1l QWxsTWVkaWFQbGF5YmFjayk6CisgICAgICAgIE5ldmVyIGxldCB0aGUgY291bnRlciBnZXQgYmVs b3cgMC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpzdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIpOgorCiAyMDIw LTEwLTAyICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0g V2ViIEluc3BlY3RvcjogYWRkIGFuIE9iakMgcHJvdG9jb2wgZm9yIGV4dGVuc2lvbiBzdXBwb3J0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRl eCAwZDYxNzcwNTIyY2EyNDA5M2RhMzBlYzVkYzkyYmY4ODY0ODJjMmYzLi45NTdjNzcyZjIzMzNm YjQ1ZDVhZTRhZDQyYzU1YWE2NTBjOTgwYjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE4OTIsNiArMTg5MiwxMSBAQCAtICh2b2lk KV9zdG9wQWxsTWVkaWFQbGF5YmFjawogICAgIF9wYWdlLT5zdG9wQWxsTWVkaWFQbGF5YmFjaygp OwogfQogCistIChOU0ludGVnZXIgKilfc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyCit7Cisg ICAgcmV0dXJuIChOU0ludGVnZXIgKikoc3RhdGljX2Nhc3Q8bG9uZz4oX3BhZ2UtPnN1c3BlbmRN ZWRpYVBsYXliYWNrQ291bnRlcigpKSk7Cit9CisKIC0gKHZvaWQpX3N1c3BlbmRBbGxNZWRpYVBs YXliYWNrCiB7CiAgICAgX3BhZ2UtPnN1c3BlbmRBbGxNZWRpYVBsYXliYWNrKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaApp bmRleCA4MmExN2RjNmM4OWZhMTI1YmE2ZTQ4N2RkYmVmZmRmNjEyN2I4ZDU1Li4xNzFhM2E3M2Fj ODk2NzE0OGJmMjVjNDJiZWIxOTBlODhmMTQ1MWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTM0Miw2ICszNDIs NyBAQCBmb3IgdGhpcyBwcm9wZXJ0eS4KIC0gKHZvaWQpX3N1c3BlbmRBbGxNZWRpYVBsYXliYWNr OwogLSAodm9pZClfcmVzdW1lQWxsTWVkaWFQbGF5YmFjazsKIC0gKHZvaWQpX2Nsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zOworLSAoTlNJbnRlZ2VyICopX3N1c3BlbmRNZWRpYVBsYXliYWNrQ291 bnRlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkp OwogCiAtICh2b2lkKV90YWtlUERGU25hcHNob3RXaXRoQ29uZmlndXJhdGlvbjooV0tTbmFwc2hv dENvbmZpZ3VyYXRpb24gKilzbmFwc2hvdENvbmZpZ3VyYXRpb24gY29tcGxldGlvbkhhbmRsZXI6 KHZvaWQgKF4pKE5TRGF0YSAqcGRmU25hcHNob3REYXRhLCBOU0Vycm9yICplcnJvcikpY29tcGxl dGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lP U19UQkEpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg NzYyMWY4NzRjMDEzYTI0ODVlZjZlMGFjMzc5NTZkZjg4ZmU5YzllYS4uZTQ4ODcwMmZiYWU2YzEx OWIwODVlMDczMDk4NmJkYzQ3MjQ4OWRmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCkBAIC02MDI2LDYgKzYwMjYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c3Rv cEFsbE1lZGlhUGxheWJhY2soKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c3VzcGVuZEFsbE1lZGlh UGxheWJhY2soKQogeworICAgIG1fc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyKys7CiAgICAg aWYgKG1fbWVkaWFQbGF5YmFja0lzU3VzcGVuZGVkKQogICAgICAgICByZXR1cm47CiAgICAgbV9t ZWRpYVBsYXliYWNrSXNTdXNwZW5kZWQgPSB0cnVlOwpAQCAtNjAzOCw3ICs2MDM5LDEwIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpzdXNwZW5kQWxsTWVkaWFQbGF5YmFjaygpCiAKIHZvaWQgV2ViUGFn ZVByb3h5OjpyZXN1bWVBbGxNZWRpYVBsYXliYWNrKCkKIHsKLSAgICBpZiAoIW1fbWVkaWFQbGF5 YmFja0lzU3VzcGVuZGVkKQorICAgIGlmIChtX3N1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlciA+ IDApCisgICAgICAgIG1fc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyLS07CisKKyAgICBpZiAo IW1fbWVkaWFQbGF5YmFja0lzU3VzcGVuZGVkIHx8IG1fc3VzcGVuZE1lZGlhUGxheWJhY2tDb3Vu dGVyID4gMCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fbWVkaWFQbGF5YmFja0lzU3VzcGVuZGVk ID0gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggZTJj ZDE5MGZkYWZjMmQ3ZTdiM2RiMWIyNGI5YWQ4OTliZWUwNDQ2Yi4uODIxOWViYjUzYjFjZmUzNjM5 ZjJkYzE2Yzc3YzkxZmNmNWZlYjAxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKQEAgLTE4MTAsNiArMTgxMCw3IEBAIHB1YmxpYzoKIAogICAgIFNlY29uZHMgbWVkaWFD YXB0dXJlUmVwb3J0aW5nRGVsYXkoKSBjb25zdCB7IHJldHVybiBtX21lZGlhQ2FwdHVyZVJlcG9y dGluZ0RlbGF5OyB9CiAgICAgdm9pZCBzZXRNZWRpYUNhcHR1cmVSZXBvcnRpbmdEZWxheShTZWNv bmRzIGNhcHR1cmVSZXBvcnRpbmdEZWxheSkgeyBtX21lZGlhQ2FwdHVyZVJlcG9ydGluZ0RlbGF5 ID0gY2FwdHVyZVJlcG9ydGluZ0RlbGF5OyB9CisgICAgc2l6ZV90IHN1c3BlbmRNZWRpYVBsYXli YWNrQ291bnRlcigpIHsgcmV0dXJuIG1fc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyOyB9CiAK IHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkm LCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJik7CkBAIC0yODc3LDYgKzI4NzgsOCBAQCBw cml2YXRlOgogICAgIGJvb2wgbV91c2VyU2NyaXB0c05vdGlmaWVkIHsgZmFsc2UgfTsKICAgICBi b29sIG1faGFzRXhlY3V0ZWRBcHBCb3VuZEJlaGF2aW9yQmVmb3JlTmF2aWdhdGlvbiB7IGZhbHNl IH07CiAgICAgYm9vbCBtX2NhblVzZUNyZWRlbnRpYWxTdG9yYWdlIHsgdHJ1ZSB9OworCisgICAg c2l6ZV90IG1fc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyIHsgMCB9OwogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggZWIxNGI2Y2VhYmVlZTRjNDZmM2Q5NjczMTVjZjI1ZDkzNmM5Nzk4MC4uZDdl NDQwZGM0ZTUwNDI3YjUxMDViYWIyMmMxYTg2YjAxYjhmZWUyYSAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEw LTAyICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAg IE11bHRpcGxlIGNhbGxzIHRvIHN1c3BlbmQgbWVkaWEgcGxheWJhY2sgZm9yIHRoZSBzYW1lIHBh Z2UgbWF5IHJlc3VsdCBpbiByZXN1bWluZyBtZWRpYSBwbGF5YmFjayB0b28gc29vbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MjI4CisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzY5NzA5MzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLiBGaXggdGhlIGV4aXN0aW5n IFN1c3BlbmRSZXN1bWVBbGxNZWRpYVBsYXliYWNrCisgICAgICAgIHRlc3Qgd2hpY2ggaGFkIGEg c21hbGwgSmF2YVNjcmlwdCBidWcsIGFuZCB3YXMgbWlzc2luZyBhIGNhbGwgdG8KKyAgICAgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRSZWplY3QpIHdoaWNoIGFsbG93ZWQgdGhlIGJ1 ZyB0byBnbworICAgICAgICB1bm5vdGljZWQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1N0b3BTdXNwZW5kUmVzdW1lQWxsTWVkaWEubW06CisgICAgICAgIChU ZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMC0xMC0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NNYWtlXSB1bnVzZWQgdmFyaWFibGUgd2Fy bmluZyBzcGFtIGluIFVJU2NyaXB0Q29udHJvbGxlci5oCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1N0b3BTdXNwZW5kUmVzdW1lQWxsTWVkaWEubW0g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1N0b3BTdXNwZW5kUmVzdW1l QWxsTWVkaWEubW0KaW5kZXggY2U3NjAyZGZlZTNlMDEyODYxZjdiMmE3NGVjNjIwZGQ1MjAwZmE5 Mi4uNGFjZTUwMWZkZDgwMDE2NTMwMjA0NTEzYzNkZThiY2VkZjQwNGY4YSAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TdG9wU3VzcGVuZFJlc3VtZUFs bE1lZGlhLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU3Rv cFN1c3BlbmRSZXN1bWVBbGxNZWRpYS5tbQpAQCAtNzUsNyArNzUsNjEgQEAgVEVTVChXS1dlYlZp ZXcsIFN1c3BlbmRSZXN1bWVBbGxNZWRpYVBsYXliYWNrKQogCiAgICAgX19ibG9jayBib29sIGRp ZFJlamVjdCA9IGZhbHNlOwogICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3Nh Z2U6QCJyZWplY3RlZCIgYWN0aW9uOl57IGRpZFJlamVjdCA9IHRydWU7IH1dOwotICAgIFt3ZWJW aWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3ZpZGVvJyku cGxheSgpLmNhdGNoKCgpID0geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFu ZGxlci5wb3N0TWVzc2FnZSgncmVqZWN0ZWQnKTsgfSkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07 CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3Rv cigndmlkZW8nKS5wbGF5KCkuY2F0Y2goKCkgPT4geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5k bGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgncmVqZWN0ZWQnKTsgfSkiIGNvbXBsZXRpb25I YW5kbGVyOm5pbF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRSZWplY3QpOwor CisgICAgZGlkQmVnaW5QbGF5aW5nID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVy UmVjZWl2aW5nTWVzc2FnZTpAInBsYXlpbmciIGFjdGlvbjpeeyBkaWRCZWdpblBsYXlpbmcgPSB0 cnVlOyB9XTsKKyAgICBbd2ViVmlldyBfcmVzdW1lQWxsTWVkaWFQbGF5YmFja107CisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRCZWdpblBsYXlpbmcpOworfQorCitURVNUKFdLV2Vi VmlldywgU3VzcGVuZFJlc3VtZUFsbE1lZGlhUGxheWJhY2tNdWx0aXBsZVRpbWVzKQoreworICAg IGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFs bG9jXSBpbml0XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcg YWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAxMDAsIDEwMCkgY29uZmlndXJh dGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10pOworCisgICAgW3dlYlZp ZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPHZpZGVvIHNyYz1cInZpZGVvLXdpdGgt YXVkaW8ubXA0XCIgd2Via2l0LXBsYXlzaW5saW5lPjwvdmlkZW8+Il07CisKKyAgICBbd2ViVmll dyBvYmplY3RCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZnVuY3Rpb24gZXZlbnRUb01lc3NhZ2Uo ZXZlbnQpe3dpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNz YWdlKGV2ZW50LnR5cGUpO30gdmFyIHZpZGVvID0gZG9jdW1lbnQucXVlcnlTZWxlY3Rvcigndmlk ZW8nKTsgdmlkZW8uYWRkRXZlbnRMaXN0ZW5lcigncGxheWluZycsIGV2ZW50VG9NZXNzYWdlKTsg dmlkZW8uYWRkRXZlbnRMaXN0ZW5lcigncGF1c2UnLCBldmVudFRvTWVzc2FnZSk7Il07CisKKyAg ICBfX2Jsb2NrIGJvb2wgZGlkQmVnaW5QbGF5aW5nID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVy Zm9ybUFmdGVyUmVjZWl2aW5nTWVzc2FnZTpAInBsYXlpbmciIGFjdGlvbjpeeyBkaWRCZWdpblBs YXlpbmcgPSB0cnVlOyB9XTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJkb2N1 bWVudC5xdWVyeVNlbGVjdG9yKCd2aWRlbycpLnBsYXkoKSIgY29tcGxldGlvbkhhbmRsZXI6bmls XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEJlZ2luUGxheWluZyk7CisKKyAg ICBfX2Jsb2NrIGJvb2wgZGlkUGF1c2UgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBwZXJmb3JtQWZ0 ZXJSZWNlaXZpbmdNZXNzYWdlOkAicGF1c2UiIGFjdGlvbjpeeyBkaWRQYXVzZSA9IHRydWU7IH1d OworICAgIFt3ZWJWaWV3IF9zdXNwZW5kQWxsTWVkaWFQbGF5YmFja107CisgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZkaWRQYXVzZSk7CisKKyAgICBfX2Jsb2NrIGJvb2wgZGlkUmVqZWN0 ID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nTWVzc2FnZTpAInJl amVjdGVkIiBhY3Rpb246XnsgZGlkUmVqZWN0ID0gdHJ1ZTsgfV07CisgICAgW3dlYlZpZXcgZXZh bHVhdGVKYXZhU2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcigndmlkZW8nKS5wbGF5KCku Y2F0Y2goKCkgPT4geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5w b3N0TWVzc2FnZSgncmVqZWN0ZWQnKTsgfSkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRSZWplY3QpOworCisgICAgLy8gU3VzcGVuZCBh Z2FpbiB0byBpbmNyZW1lbnQgdGhlIGNvdW50ZXIuCisgICAgW3dlYlZpZXcgX3N1c3BlbmRBbGxN ZWRpYVBsYXliYWNrXTsKKyAgICBkbyB7CisgICAgICAgIGF1dG8gY291bnRlciA9IFt3ZWJWaWV3 IF9zdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXJdOworICAgICAgICBpZiAoY291bnRlciA+PSAo TlNJbnRlZ2VyICopKHN0YXRpY19jYXN0PGxvbmc+KDIpKSkKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxKTsKKyAgICB9IHdoaWxl ICh0cnVlKTsKKworICAgIFt3ZWJWaWV3IF9yZXN1bWVBbGxNZWRpYVBsYXliYWNrXTsKKyAgICBk byB7CisgICAgICAgIGF1dG8gY291bnRlciA9IFt3ZWJWaWV3IF9zdXNwZW5kTWVkaWFQbGF5YmFj a0NvdW50ZXJdOworICAgICAgICBpZiAoY291bnRlciA8PSAoTlNJbnRlZ2VyICopKHN0YXRpY19j YXN0PGxvbmc+KDEpKSkKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpzcGluUnVuTG9vcCgxKTsKKyAgICB9IHdoaWxlICh0cnVlKTsKKworICAgIC8vIE1h a2Ugc3VyZSB0aGUgbWVkaWEgaXMgc3RpbGwgc3VzcGVuZGVkLgorICAgIGRpZFJlamVjdCA9IGZh bHNlOworICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJyZWplY3Rl ZCIgYWN0aW9uOl57IGRpZFJlamVjdCA9IHRydWU7IH1dOworICAgIFt3ZWJWaWV3IGV2YWx1YXRl SmF2YVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3ZpZGVvJykucGxheSgpLmNhdGNo KCgpID0+IHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1l c3NhZ2UoJ3JlamVjdGVkJyk7IH0pIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGlkUmVqZWN0KTsKIAogICAgIGRpZEJlZ2luUGxheWluZyA9 IGZhbHNlOwogICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJwbGF5 aW5nIiBhY3Rpb246XnsgZGlkQmVnaW5QbGF5aW5nID0gdHJ1ZTsgfV07Cg== 410382 2020-10-02 15:36:19 -0700 2020-10-02 16:15:17 -0700 Patch for landing bug-217228-20201002153618.patch text/plain 9665 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRlNWZkZDAzMDE4ZmFhZmYy YzdlNWRjNmM1NWU3NWU4MzliZWUyZWYuLjI1MTNiZGZhNWM2MmMwZDEyN2UwNWUyMmY5ZmNkYTcy MjNmNmI0ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMTAtMDIgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgTXVsdGlwbGUgY2Fs bHMgdG8gc3VzcGVuZCBtZWRpYSBwbGF5YmFjayBmb3IgdGhlIHNhbWUgcGFnZSBtYXkgcmVzdWx0 IGluIHJlc3VtaW5nIG1lZGlhIHBsYXliYWNrIHRvbyBzb29uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcyMjgKKyAgICAgICAgcmRhcjovL3Byb2Js ZW0vNjk3MDkzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAg ICAgQ2FsbHMgdG8gc3VzcGVuZC9yZXN1bWUgbWVkaWEgcGxheWJhY2sgc2hvdWxkIGFsd2F5cyBi ZSBjYWxsZWQgaW4KKyAgICAgICAgcGFpcnMuIFRoZSBjdXJyZW50IGltcGxlbWVudGF0aW9uIHJl c3VtZXMgbWVkaWEgcGxheWJhY2sgb24gdGhlIGZpcnN0CisgICAgICAgIGNhbGwgdG8gcmVzdW1l QWxsTWVkaWFQbGF5YmFjayBldmVuIGlmIG11bHRpcGxlIGNhbGxzIHRvIHN1c3BlbmRBbGxNZWRp YVBsYXliYWNrCisgICAgICAgIGhhdmUgYmVlbiBtYWRlLiBUaGlzIHBhdGNoIGFkZHMgYSBjb3Vu dGVyIHRvIHRyYWNrIGhvdyBtYW55IGNhbGxzIHRvCisgICAgICAgIHN1c3BlbmRBbGxNZWRpYVBs YXliYWNrIGhhdmUgb2NjdXJyZWQsIGFuZCBvbmx5IHJlc3VtZXMgb25jZSB0aGUKKyAgICAgICAg Y291bnRlciByZWFjaGVzIDAuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50 ZXJdKToKKyAgICAgICAgU1BJIGZvciB0ZXN0IHB1cnBvc2VzLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c3VzcGVuZEFs bE1lZGlhUGxheWJhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc3VtZUFs bE1lZGlhUGxheWJhY2spOgorICAgICAgICBOZXZlciBsZXQgdGhlIGNvdW50ZXIgZ2V0IGJlbG93 IDAuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6c3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVyKToKKwogMjAyMC0w OS0zMCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBleGVtcHQgQVBJOjpTaGFyZWRKU0NvbnRleHQgZnJvbSByZW1vdGUgaW5zcGVjdGlvbiBh bmQgYXV0b21hdGljIGluc3BlY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZy5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmgKaW5kZXgg YzZjOTcxMjI4YTc1M2YxZDE1MmY4NWJkMjRjNWQzYWI0YjM0OWU4Zi4uMTYzZDBlYTI3ZDZlYjI5 YzhkMjNmMTljMDMzYTQ1YzQ2NWRkMzIzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmgK QEAgLTc5LDQgKzc5LDYgQEAgdHlwZWRlZiBlbnVtIHsKIC0gKGRvdWJsZSlfYXVkaW9Sb3V0aW5n QXJiaXRyYXRpb25VcGRhdGVUaW1lOwogCiAtICh2b2lkKV9kb0FmdGVyQWN0aXZpdHlTdGF0ZVVw ZGF0ZToodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXI7CisKKy0gKE5TTnVtYmVyICop X3N1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01B Q19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1Rlc3RpbmcubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3VGVzdGluZy5tbQppbmRleCAwYzc2NTIyOTVl YjNmOGVlNjY2MjJlMzE5ZDQxYzQ1MTQ1NzQ2NTYxLi40Mjg4MzdjN2Y4ZDYxZjEwOTViYTEzYzc5 ODZhM2ZkZTk4NTNjZmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3VGVzdGluZy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3VGVzdGluZy5tbQpAQCAtMjk2LDQgKzI5Niw5IEBAIC0gKHZvaWQp X2RvQWZ0ZXJBY3Rpdml0eVN0YXRlVXBkYXRlOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFu ZGxlcgogICAgIF9wYWdlLT5hZGRBY3Rpdml0eVN0YXRlVXBkYXRlQ29tcGxldGlvbkhhbmRsZXIo bWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKKy0gKE5TTnVtYmVyICopX3N1 c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcgoreworICAgIHJldHVybiBAKF9wYWdlLT5zdXNwZW5k TWVkaWFQbGF5YmFja0NvdW50ZXIoKSk7Cit9CisKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGRkMTdmMjE0MDE2NTI5OGUxNjVmZGJiZjJlZjc2MWI3 YmI1OGE3OGIuLmFmYjk1YmQwOTVhOWYzNTc3MjRkM2EzOGJmZDYxMDE4Yjg4YWRlYjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNjAzMiw2ICs2MDMyLDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BBbGxNZWRpYVBsYXliYWNrKCkKIAogdm9pZCBXZWJQ YWdlUHJveHk6OnN1c3BlbmRBbGxNZWRpYVBsYXliYWNrKCkKIHsKKyAgICBtX3N1c3BlbmRNZWRp YVBsYXliYWNrQ291bnRlcisrOwogICAgIGlmIChtX21lZGlhUGxheWJhY2tJc1N1c3BlbmRlZCkK ICAgICAgICAgcmV0dXJuOwogICAgIG1fbWVkaWFQbGF5YmFja0lzU3VzcGVuZGVkID0gdHJ1ZTsK QEAgLTYwNDQsNyArNjA0NSwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c3VzcGVuZEFsbE1lZGlh UGxheWJhY2soKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzdW1lQWxsTWVkaWFQbGF5YmFjaygp CiB7Ci0gICAgaWYgKCFtX21lZGlhUGxheWJhY2tJc1N1c3BlbmRlZCkKKyAgICBpZiAobV9zdXNw ZW5kTWVkaWFQbGF5YmFja0NvdW50ZXIgPiAwKQorICAgICAgICBtX3N1c3BlbmRNZWRpYVBsYXli YWNrQ291bnRlci0tOworCisgICAgaWYgKCFtX21lZGlhUGxheWJhY2tJc1N1c3BlbmRlZCB8fCBt X3N1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcikKICAgICAgICAgcmV0dXJuOwogICAgIG1fbWVk aWFQbGF5YmFja0lzU3VzcGVuZGVkID0gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKaW5kZXggZTc0NWNmY2JhMWIwNGNhMTM3MjE0NDAwNmIwZTUzNzM1ZDM3Mzhj Yy4uZDY1MDAyYWE1YzZlYTg2Njc0ZDMwY2VjNGY4ZmNlOTVmMTU0MDQ4MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTE4MjgsNiArMTgyOCw3IEBAIHB1YmxpYzoK IAogICAgIFNlY29uZHMgbWVkaWFDYXB0dXJlUmVwb3J0aW5nRGVsYXkoKSBjb25zdCB7IHJldHVy biBtX21lZGlhQ2FwdHVyZVJlcG9ydGluZ0RlbGF5OyB9CiAgICAgdm9pZCBzZXRNZWRpYUNhcHR1 cmVSZXBvcnRpbmdEZWxheShTZWNvbmRzIGNhcHR1cmVSZXBvcnRpbmdEZWxheSkgeyBtX21lZGlh Q2FwdHVyZVJlcG9ydGluZ0RlbGF5ID0gY2FwdHVyZVJlcG9ydGluZ0RlbGF5OyB9CisgICAgc2l6 ZV90IHN1c3BlbmRNZWRpYVBsYXliYWNrQ291bnRlcigpIHsgcmV0dXJuIG1fc3VzcGVuZE1lZGlh UGxheWJhY2tDb3VudGVyOyB9CiAKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGll bnQmLCBXZWJQcm9jZXNzUHJveHkmLCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJik7CkBA IC0yODk5LDYgKzI5MDAsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV91c2VyU2NyaXB0c05vdGlm aWVkIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzRXhlY3V0ZWRBcHBCb3VuZEJlaGF2aW9yQmVm b3JlTmF2aWdhdGlvbiB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2NhblVzZUNyZWRlbnRpYWxTdG9y YWdlIHsgdHJ1ZSB9OworCisgICAgc2l6ZV90IG1fc3VzcGVuZE1lZGlhUGxheWJhY2tDb3VudGVy IHsgMCB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzU2ODM1ZTMwNTI4ZWVlNzU4OTBmODZl MjBiN2ZlY2VkMDQxOWE3NS4uOGE1ZWVlOGVkODAwMGM5YjFhMmRiZGQ1OGM4MThhYWRiY2NkMmUw MCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDIwLTEwLTAyICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlA YXBwbGUuY29tPgorCisgICAgICAgIE11bHRpcGxlIGNhbGxzIHRvIHN1c3BlbmQgbWVkaWEgcGxh eWJhY2sgZm9yIHRoZSBzYW1lIHBhZ2UgbWF5IHJlc3VsdCBpbiByZXN1bWluZyBtZWRpYSBwbGF5 YmFjayB0b28gc29vbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE3MjI4CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzY5NzA5MzQ2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFn ZS4gRml4IHRoZSBleGlzdGluZyBTdXNwZW5kUmVzdW1lQWxsTWVkaWFQbGF5YmFjaworICAgICAg ICB0ZXN0IHdoaWNoIGhhZCBhIHNtYWxsIEphdmFTY3JpcHQgYnVnLCBhbmQgd2FzIG1pc3Npbmcg YSBjYWxsIHRvCisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGlkUmVqZWN0KSB3 aGljaCBhbGxvd2VkIHRoZSBidWcgdG8gZ28KKyAgICAgICAgdW5ub3RpY2VkLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TdG9wU3VzcGVuZFJlc3VtZUFsbE1l ZGlhLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMDktMzAgIFBo aWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFt ZXJdIEludGVybmFsIGF1ZGlvIHJlbmRlcmluZyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1N0b3BTdXNwZW5kUmVzdW1lQWxsTWVkaWEu bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1N0b3BTdXNwZW5kUmVz dW1lQWxsTWVkaWEubW0KaW5kZXggY2U3NjAyZGZlZTNlMDEyODYxZjdiMmE3NGVjNjIwZGQ1MjAw ZmE5Mi4uMmRkMmFjMmZmNTE3YzE2ZmU1M2JiMDQwZmJkMWNlZDVmMTQwZjQ2YyAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TdG9wU3VzcGVuZFJlc3Vt ZUFsbE1lZGlhLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev U3RvcFN1c3BlbmRSZXN1bWVBbGxNZWRpYS5tbQpAQCAtMzAsNiArMzAsNyBAQAogI2ltcG9ydCAi UGxhdGZvcm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3RXS1dlYlZpZXcuaCIKICNpbXBvcnQg PFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+CisjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3UHJp dmF0ZUZvclRlc3RpbmcuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAogbmFtZXNwYWNl IFRlc3RXZWJLaXRBUEkgewpAQCAtNzUsNyArNzYsNTkgQEAgVEVTVChXS1dlYlZpZXcsIFN1c3Bl bmRSZXN1bWVBbGxNZWRpYVBsYXliYWNrKQogCiAgICAgX19ibG9jayBib29sIGRpZFJlamVjdCA9 IGZhbHNlOwogICAgIFt3ZWJWaWV3IHBlcmZvcm1BZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJyZWpl Y3RlZCIgYWN0aW9uOl57IGRpZFJlamVjdCA9IHRydWU7IH1dOwotICAgIFt3ZWJWaWV3IGV2YWx1 YXRlSmF2YVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3ZpZGVvJykucGxheSgpLmNh dGNoKCgpID0geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0 TWVzc2FnZSgncmVqZWN0ZWQnKTsgfSkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisgICAgW3dl YlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcigndmlkZW8n KS5wbGF5KCkuY2F0Y2goKCkgPT4geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0 SGFuZGxlci5wb3N0TWVzc2FnZSgncmVqZWN0ZWQnKTsgfSkiIGNvbXBsZXRpb25IYW5kbGVyOm5p bF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRSZWplY3QpOworCisgICAgZGlk QmVnaW5QbGF5aW5nID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5n TWVzc2FnZTpAInBsYXlpbmciIGFjdGlvbjpeeyBkaWRCZWdpblBsYXlpbmcgPSB0cnVlOyB9XTsK KyAgICBbd2ViVmlldyBfcmVzdW1lQWxsTWVkaWFQbGF5YmFja107CisgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZkaWRCZWdpblBsYXlpbmcpOworfQorCitURVNUKFdLV2ViVmlldywgU3Vz cGVuZFJlc3VtZUFsbE1lZGlhUGxheWJhY2tNdWx0aXBsZVRpbWVzKQoreworICAgIGF1dG8gY29u ZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0 XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAxMDAsIDEwMCkgY29uZmlndXJhdGlvbjpjb25m aWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10pOworCisgICAgW3dlYlZpZXcgc3luY2hy b25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPHZpZGVvIHNyYz1cInZpZGVvLXdpdGgtYXVkaW8ubXA0 XCIgd2Via2l0LXBsYXlzaW5saW5lPjwvdmlkZW8+Il07CisKKyAgICBbd2ViVmlldyBvYmplY3RC eUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZnVuY3Rpb24gZXZlbnRUb01lc3NhZ2UoZXZlbnQpe3dp bmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKGV2ZW50 LnR5cGUpO30gdmFyIHZpZGVvID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcigndmlkZW8nKTsgdmlk ZW8uYWRkRXZlbnRMaXN0ZW5lcigncGxheWluZycsIGV2ZW50VG9NZXNzYWdlKTsgdmlkZW8uYWRk RXZlbnRMaXN0ZW5lcigncGF1c2UnLCBldmVudFRvTWVzc2FnZSk7Il07CisKKyAgICBfX2Jsb2Nr IGJvb2wgZGlkQmVnaW5QbGF5aW5nID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVy UmVjZWl2aW5nTWVzc2FnZTpAInBsYXlpbmciIGFjdGlvbjpeeyBkaWRCZWdpblBsYXlpbmcgPSB0 cnVlOyB9XTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVy eVNlbGVjdG9yKCd2aWRlbycpLnBsYXkoKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEJlZ2luUGxheWluZyk7CisKKyAgICBfX2Jsb2Nr IGJvb2wgZGlkUGF1c2UgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZp bmdNZXNzYWdlOkAicGF1c2UiIGFjdGlvbjpeeyBkaWRQYXVzZSA9IHRydWU7IH1dOworICAgIFt3 ZWJWaWV3IF9zdXNwZW5kQWxsTWVkaWFQbGF5YmFja107CisgICAgVGVzdFdlYktpdEFQSTo6VXRp bDo6cnVuKCZkaWRQYXVzZSk7CisKKyAgICBfX2Jsb2NrIGJvb2wgZGlkUmVqZWN0ID0gZmFsc2U7 CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nTWVzc2FnZTpAInJlamVjdGVkIiBh Y3Rpb246XnsgZGlkUmVqZWN0ID0gdHJ1ZTsgfV07CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcigndmlkZW8nKS5wbGF5KCkuY2F0Y2goKCkg PT4geyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2Fn ZSgncmVqZWN0ZWQnKTsgfSkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZkaWRSZWplY3QpOworCisgICAgLy8gU3VzcGVuZCBhZ2FpbiB0byBp bmNyZW1lbnQgdGhlIGNvdW50ZXIuCisgICAgW3dlYlZpZXcgX3N1c3BlbmRBbGxNZWRpYVBsYXli YWNrXTsKKyAgICBkbyB7CisgICAgICAgIGlmIChbd2ViVmlldyBfc3VzcGVuZE1lZGlhUGxheWJh Y2tDb3VudGVyXS5pbnRWYWx1ZSA+PSAyKQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnNwaW5SdW5Mb29wKDEpOworICAgIH0gd2hpbGUgKHRydWUpOwor CisgICAgW3dlYlZpZXcgX3Jlc3VtZUFsbE1lZGlhUGxheWJhY2tdOworICAgIGRvIHsKKyAgICAg ICAgaWYgKFt3ZWJWaWV3IF9zdXNwZW5kTWVkaWFQbGF5YmFja0NvdW50ZXJdLmludFZhbHVlIDw9 IDEpCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3Bp blJ1bkxvb3AoMSk7CisgICAgfSB3aGlsZSAodHJ1ZSk7CisKKyAgICAvLyBNYWtlIHN1cmUgdGhl IG1lZGlhIGlzIHN0aWxsIHN1c3BlbmRlZC4KKyAgICBkaWRSZWplY3QgPSBmYWxzZTsKKyAgICBb d2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdNZXNzYWdlOkAicmVqZWN0ZWQiIGFjdGlvbjpe eyBkaWRSZWplY3QgPSB0cnVlOyB9XTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6 QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCd2aWRlbycpLnBsYXkoKS5jYXRjaCgoKSA9PiB7IHdp bmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdyZWpl Y3RlZCcpOyB9KSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJmRpZFJlamVjdCk7CiAKICAgICBkaWRCZWdpblBsYXlpbmcgPSBmYWxzZTsKICAg ICBbd2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdNZXNzYWdlOkAicGxheWluZyIgYWN0aW9u Ol57IGRpZEJlZ2luUGxheWluZyA9IHRydWU7IH1dOwo=