225696 2021-05-12 05:33:42 -0700 Resurrect WKWebView media controls API removed in https://bugs.webkit.org/show_bug.cgi?id=221929 2021-05-18 01:10:46 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221929 InRadar P2 Normal --- 1 youennf youennf achristensen eric.carlson katherine_cheney thorton webkit-bug-importer oldest_to_newest 1759230 0 youennf 2021-05-12 05:33:42 -0700 <rdar://77863194> 1759232 1 428370 youennf 2021-05-12 05:43:33 -0700 Created attachment 428370 Patch 1759239 2 428372 youennf 2021-05-12 07:09:30 -0700 Created attachment 428372 Patch 1759256 3 katherine_cheney 2021-05-12 08:30:06 -0700 We intentionally removed the deprecated versions of these in https://bugs.webkit.org/show_bug.cgi?id=223704 not sure we should add them back. 1759305 4 thorton 2021-05-12 11:01:29 -0700 Pretty sure the old names were swift-incompatible, right? You best check why that `#ifndef __swift__` was there, I think it was for good (and unfortunate) reason. 1759306 5 katherine_cheney 2021-05-12 11:07:40 -0700 (In reply to Tim Horton from comment #4) > Pretty sure the old names were swift-incompatible, right? You best check why > that `#ifndef __swift__` was there, I think it was for good (and > unfortunate) reason. Yes, if we add these back we should add #ifndef __swift__ like in https://bugs.webkit.org/attachment.cgi?id=423389&action=review. The deprecated methods added the nil value for the completion handler, but both the new and deprecated values have an overloaded interface of "func closeAllMediaPresentations()", etc. So it will cause a duplicate interface error. 1759310 6 428372 thorton 2021-05-12 11:13:12 -0700 Comment on attachment 428372 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428372&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.h:346 > +- (void)closeAllMediaPresentations:(void (^_Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("closeAllMediaPresentationsWithCompletionHandler:", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA)); Also, all of these deprecation macros should say the *actual* build that they were introduced in (and TBA for the removal side). 1759311 7 428372 thorton 2021-05-12 11:13:28 -0700 Comment on attachment 428372 Patch r- for now since this will break the module build 1760687 8 youennf 2021-05-17 00:41:49 -0700 (In reply to Tim Horton from comment #6) > Comment on attachment 428372 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=428372&action=review > > > Source/WebKit/UIProcess/API/Cocoa/WKWebView.h:346 > > +- (void)closeAllMediaPresentations:(void (^_Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("closeAllMediaPresentationsWithCompletionHandler:", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA)); > > Also, all of these deprecation macros should say the *actual* build that > they were introduced in (and TBA for the removal side). I followed what was done in other parts of the headers, like loadSimulatedRequest. I can change it to exact values though. 1760689 9 428814 youennf 2021-05-17 00:51:14 -0700 Created attachment 428814 Patch 1760698 10 thorton 2021-05-17 02:08:16 -0700 (In reply to youenn fablet from comment #8) > (In reply to Tim Horton from comment #6) > > Comment on attachment 428372 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=428372&action=review > > > > > Source/WebKit/UIProcess/API/Cocoa/WKWebView.h:346 > > > +- (void)closeAllMediaPresentations:(void (^_Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("closeAllMediaPresentationsWithCompletionHandler:", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA)); > > > > Also, all of these deprecation macros should say the *actual* build that > > they were introduced in (and TBA for the removal side). > > I followed what was done in other parts of the headers, like > loadSimulatedRequest. > I can change it to exact values though. The situation for loadSimulatedRequest is not equivalent, since it has not been included in a shipped SDK. 1760753 11 428814 katherine_cheney 2021-05-17 08:44:03 -0700 Comment on attachment 428814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428814&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:978 > + [self setAllMediaPlaybackSuspended:FALSE completionHandler:completionHandler]; Should this be 'setAllMediaPlaybackSuspended:NO'? I don't see :FALSE being used frequently. > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:983 > + [self setAllMediaPlaybackSuspended:TRUE completionHandler:completionHandler]; Ditto -- should this be :YES? 1760760 12 428814 youennf 2021-05-17 08:54:51 -0700 Comment on attachment 428814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428814&action=review >> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:978 >> + [self setAllMediaPlaybackSuspended:FALSE completionHandler:completionHandler]; > > Should this be 'setAllMediaPlaybackSuspended:NO'? I don't see :FALSE being used frequently. Seems better indeed. 1760793 13 428814 achristensen 2021-05-17 09:57:23 -0700 Comment on attachment 428814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428814&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.h:377 > +- (void)requestMediaPlaybackState:(void (^)(WKMediaPlaybackState))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("requestMediaPlaybackStateWithCompletionHandler:", macos(11.3, WK_MAC_TBA), ios(14.5, WK_IOS_TBA)); We shouldn't use WK_MAC_TBA or WK_IOS_TBA here. It should be this: macos(11.3, 11.3), ios(14.5, 14.5) I'm also not convinced we should do this at all 1760795 14 428814 achristensen 2021-05-17 10:03:54 -0700 Comment on attachment 428814 Patch Just kidding. They weren't deprecated in the SDK. What a mess. 1760821 15 428851 youennf 2021-05-17 11:44:41 -0700 Created attachment 428851 Patch for landing 1761080 16 ews-feeder 2021-05-18 01:10:44 -0700 Committed r277645 (237851@main): <https://commits.webkit.org/237851@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428851. 428370 2021-05-12 05:43:33 -0700 2021-05-12 07:09:26 -0700 Patch bug-225696-20210512144332.patch text/plain 5829 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJlM2NhMDZlZmI0NjY4ZTI4 NzYyNjk2ODE5OTc1N2YxYjU5MjBjYzAuLjJiOWMwZmE3NDVhM2MwYTBlNjhhNDMxNjZlMmEwMzc3 NGY4ODFmYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDUtMTIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFJlc3VycmVjdCBXS1dlYlZpZXcg bWVkaWEgY29udHJvbHMgQVBJIHJlbW92ZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMTkyOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI1Njk2CisgICAgICAgIDxyZGFyOi8vNzc4NjMxOTQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0IGNsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zLCByZXN1bWVBbGxNZWRpYVBsYXliYWNrLCBzdXNwZW5kQWxsTWVkaWFQ bGF5YmFjayBhbmQgcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZS4KKyAgICAgICAgTWFyayB0aGVt IGFzIGRlcHJlY2F0ZWQgaW4gZmF2b3Igb2YgdGhlIGxhdGVzdCBBUEkgdmVyc2lvbnMgYW5kIGlt cGxlbWVudCB0aGVtIGJhc2VkIG9uIHRoZSBsYXRlc3QgQVBJIHZlcnNpb25zLgorICAgICAgICBO byBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnM6XSk6CisgICAg ICAgICgtW1dLV2ViVmlldyByZXN1bWVBbGxNZWRpYVBsYXliYWNrOl0pOgorICAgICAgICAoLVtX S1dlYlZpZXcgc3VzcGVuZEFsbE1lZGlhUGxheWJhY2s6XSk6CisgICAgICAgICgtW1dLV2ViVmll dyByZXF1ZXN0TWVkaWFQbGF5YmFja1N0YXRlOl0pOgorCiAyMDIxLTA1LTEyICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgYSByZW1vdGUgSW50 ZXJuYWwgVW5pdCBpbiBHUFVQcm9jZXNzIGZvciBhdWRpbyBNZWRpYVN0cmVhbVRyYWNrIHJlbmRl cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oCmlu ZGV4IGY5OWFkYmU2MWQ0ZmRlYjA2N2NhYTI2YTIxMDViOWFiNDZkZGMxZDguLjMyZjk0MWIwOTNm ZWFjNmVkZjA2YmFiNzZiZmFjYmRmYWViZGQwMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgKQEAgLTM0Myw2ICszNDMsNyBAQCB0eXBlZGVmIE5T X0VOVU0oTlNJbnRlZ2VyLCBXS01lZGlhQ2FwdHVyZVN0YXRlKSB7CiAgQGRpc2N1c3Npb24gSW5j bHVkZXMgcGljdHVyZS1pbi1waWN0dXJlIGFuZCBmdWxsc2NyZWVuLgogICovCiAtICh2b2lkKWNs b3NlQWxsTWVkaWFQcmVzZW50YXRpb25zV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkICheX051 bGxhYmxlKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdL X01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworLSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2Vu dGF0aW9uczoodm9pZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJ X0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnNX aXRoQ29tcGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoV0tfTUFDX1RCQSwgV0tfTUFDX1RCQSksIGlv cyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CiAKIC8qISBAYWJzdHJhY3QgUGF1c2VzIG1lZGlh IHBsYXliYWNrIGluIFdLV2ViVmlldy4KICBAZGlzY3Vzc2lvbiBQYXVzZXMgbWVkaWEgcGxheWJh Y2suIE1lZGlhIGluIHRoZSBwYWdlIGNhbiBiZSByZXN0YXJ0ZWQgYnkgY2FsbGluZyBwbGF5KCkg b24gYSBtZWRpYSBlbGVtZW50IG9yIHJlc3VtZSgpIG9uIGFuIEF1ZGlvQ29udGV4dCBpbiBKYXZh U2NyaXB0LiBBIHVzZXIgY2FuIGFsc28gdXNlIG1lZGlhIGNvbnRyb2xzIHRvIHBsYXkgbWVkaWEg Y29udGVudCBhZnRlciBpdCBoYXMgYmVlbiBwYXVzZWQuCkBAIC0zNTQsNiArMzU1LDggQEAgdHlw ZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgV0tNZWRpYUNhcHR1cmVTdGF0ZSkgewogICBAZGlzY3Vz c2lvbiBJZiBzdXNwZW5kZWQgaXMgdHJ1ZSwgdGhpcyBwYXVzZXMgbWVkaWEgcGxheWJhY2sgYW5k IGJsb2NrcyBhbGwgYXR0ZW1wdHMgYnkgdGhlIHBhZ2Ugb3IgdGhlIHVzZXIgdG8gcmVzdW1lIHVu dGlsIHNldEFsbE1lZGlhUGxheWJhY2tTdXNwZW5kZWQgaXMgY2FsbGVkIGFnYWluIHdpdGggc3Vz cGVuZGVkIHNldCB0byBmYWxzZS4gTWVkaWEgcGxheWJhY2sgc2hvdWxkIGFsd2F5cyBiZSBzdXNw ZW5kZWQgYW5kIHJlc3VtZWQgaW4gcGFpcnMuCiAqLwogLSAodm9pZClzZXRBbGxNZWRpYVBsYXli YWNrU3VzcGVuZGVkOihCT09MKXN1c3BlbmRlZCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXl9O dWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpcmVzdW1lQWxsTWVkaWFQbGF5 YmFjazoodm9pZCAoXiBfTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9E RVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoInNldEFsbE1lZGlhUGxheWJhY2tTdXNwZW5kZWQ6 Y29tcGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoV0tfTUFDX1RCQSwgV0tfTUFDX1RCQSksIGlvcyhX S19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CistICh2b2lkKXN1c3BlbmRBbGxNZWRpYVBsYXliYWNr Oih2b2lkICheX051bGxhYmxlKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfREVQUkVD QVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJzZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVkOmNvbXBs ZXRpb25IYW5kbGVyOiIsIG1hY29zKFdLX01BQ19UQkEsIFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSwgV0tfSU9TX1RCQSkpOwogCiAvKiEgQGFic3RyYWN0IEdldCB0aGUgY3VycmVudCBtZWRp YSBwbGF5YmFjayBzdGF0ZSBvZiBhIFdLV2ViVmlldy4KICBAcGFyYW0gY29tcGxldGlvbkhhbmRs ZXIgQSBibG9jayB0byBpbnZva2Ugd2l0aCB0aGUgcmV0dXJuIHZhbHVlIG9mIHRoZSBmdW5jdGlv biBjYWxsLgpAQCAtMzYzLDcgKzM2Niw3IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIFdL TWVkaWFDYXB0dXJlU3RhdGUpIHsKICBXS01lZGlhUGxheWJhY2tTdGF0ZU5vbmUuCiAgKi8KIC0g KHZvaWQpcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZVdpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9p ZCAoXikoV0tNZWRpYVBsYXliYWNrU3RhdGUpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7Ci0KKy0gKHZvaWQpcmVx dWVzdE1lZGlhUGxheWJhY2tTdGF0ZToodm9pZCAoXikoV0tNZWRpYVBsYXliYWNrU3RhdGUpKWNv bXBsZXRpb25IYW5kbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoInJlcXVl c3RNZWRpYVBsYXliYWNrU3RhdGVXaXRoQ29tcGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoV0tfTUFD X1RCQSwgV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CiAKIC8qISBA YWJzdHJhY3QgVGhlIHN0YXRlIG9mIGNhbWVyYSBjYXB0dXJlIG9uIGEgd2ViIHBhZ2UuCiAgQGRp c2N1c3Npb24gQGxpbmsgV0tXZWJWaWV3IEAvbGluayBpcyBrZXktdmFsdWUgb2JzZXJ2aW5nIChL Vk8pIGNvbXBsaWFudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KaW5kZXggMGViNWIzMjI5ZjNhZWZkMTdiZjZiNTIyYzU0NDI2ZGJkZTEyOWU2Yi4u MGE3ZTI1YTg4OWI5MTBkN2JjNTA4MDg3OWVjMzc0ZGNmMjVhNWY1YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC05MzYsNiArOTM2LDEx IEBAIHN0YXRpYyBib29sIHZhbGlkYXRlQXJndW1lbnQoaWQgYXJndW1lbnQpCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCistICh2b2lkKWNsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zOih2b2lkIChe KSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxmIGNsb3NlQWxsTWVkaWFQcmVz ZW50YXRpb25zV2l0aENvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyXTsKK30KKwog LSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjoo dm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBUSFJPV19JRl9TVVNQRU5E RUQ7CkBAIC05NjQsNiArOTY5LDE2IEBAIHN0YXRpYyBib29sIHZhbGlkYXRlQXJndW1lbnQoaWQg YXJndW1lbnQpCiAgICAgX3BhZ2UtPnBhdXNlQWxsTWVkaWFQbGF5YmFjayhtYWtlQmxvY2tQdHIo Y29tcGxldGlvbkhhbmRsZXIpKTsKIH0KIAorLSAodm9pZClyZXN1bWVBbGxNZWRpYVBsYXliYWNr Oih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxmIHNldEFsbE1l ZGlhUGxheWJhY2tTdXNwZW5kZWQ6RkFMU0UgY29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkhh bmRsZXJdOworfQorCistICh2b2lkKXN1c3BlbmRBbGxNZWRpYVBsYXliYWNrOih2b2lkICheKSh2 b2lkKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxmIHNldEFsbE1lZGlhUGxheWJhY2tT dXNwZW5kZWQ6VFJVRSBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFuZGxlcl07Cit9CisK IC0gKHZvaWQpc2V0QWxsTWVkaWFQbGF5YmFja1N1c3BlbmRlZDooQk9PTClzdXNwZW5kZWQgY29t cGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAg VEhST1dfSUZfU1VTUEVOREVEOwpAQCAtOTk1LDYgKzEwMTAsMTEgQEAgc3RhdGljIFdLTWVkaWFQ bGF5YmFja1N0YXRlIHRvV0tNZWRpYVBsYXliYWNrU3RhdGUoV2ViS2l0OjpNZWRpYVBsYXliYWNr U3RhdGUgbWUKICAgICByZXR1cm4gV0tNZWRpYVBsYXliYWNrU3RhdGVOb25lOwogfQogCistICh2 b2lkKXJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGU6KHZvaWQgKF4pKFdLTWVkaWFQbGF5YmFja1N0 YXRlKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxmIHJlcXVlc3RNZWRpYVBsYXliYWNr U3RhdGVXaXRoQ29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkhhbmRsZXJdOworfQorCiAtICh2 b2lkKXJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGVXaXRoQ29tcGxldGlvbkhhbmRsZXI6KHZvaWQg KF4pKFdLTWVkaWFQbGF5YmFja1N0YXRlKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIFRIUk9X X0lGX1NVU1BFTkRFRDsK 428372 2021-05-12 07:09:30 -0700 2021-05-17 00:51:10 -0700 Patch bug-225696-20210512160929.patch text/plain 6685 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJlM2NhMDZlZmI0NjY4ZTI4 NzYyNjk2ODE5OTc1N2YxYjU5MjBjYzAuLmY4OWU4MWVjNTZiNmZkMjk5MTk4ZTJiOGMzNjk4NWYw NDlmMjNlZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMDUtMTIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFJlc3VycmVjdCBXS1dlYlZpZXcg bWVkaWEgY29udHJvbHMgQVBJIHJlbW92ZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMTkyOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI1Njk2CisgICAgICAgIDxyZGFyOi8vNzc4NjMxOTQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0IGNsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zLCBwYXVzZUFsbE1lZGlhUGxheWJhY2ssIHJlc3VtZUFsbE1lZGlhUGxh eWJhY2ssIHN1c3BlbmRBbGxNZWRpYVBsYXliYWNrIGFuZCByZXF1ZXN0TWVkaWFQbGF5YmFja1N0 YXRlLgorICAgICAgICBNYXJrIHRoZW0gYXMgZGVwcmVjYXRlZCBpbiBmYXZvciBvZiB0aGUgbGF0 ZXN0IEFQSSB2ZXJzaW9ucyBhbmQgaW1wbGVtZW50IHRoZW0gYmFzZWQgb24gdGhlIGxhdGVzdCBB UEkgdmVyc2lvbnMuCisgICAgICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBjbG9zZUFsbE1lZGlh UHJlc2VudGF0aW9uczpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHBhdXNlQWxsTWVkaWFQbGF5 YmFjazpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHJlc3VtZUFsbE1lZGlhUGxheWJhY2s6XSk6 CisgICAgICAgICgtW1dLV2ViVmlldyBzdXNwZW5kQWxsTWVkaWFQbGF5YmFjazpdKToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IHJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGU6XSk6CisKIDIwMjEtMDUt MTIgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVu dCBhIHJlbW90ZSBJbnRlcm5hbCBVbml0IGluIEdQVVByb2Nlc3MgZm9yIGF1ZGlvIE1lZGlhU3Ry ZWFtVHJhY2sgcmVuZGVyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3LmgKaW5kZXggZjk5YWRiZTYxZDRmZGViMDY3Y2FhMjZhMjEwNWI5YWI0NmRkYzFk OC4uODk3YTJkZDZhYzA2ZTI5MWExMTY1Y2UxM2Y0NzM4NGM1MzYxOGQ4MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaApAQCAtMzQzLDE3ICszNDMs MjEgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgV0tNZWRpYUNhcHR1cmVTdGF0ZSkgewog IEBkaXNjdXNzaW9uIEluY2x1ZGVzIHBpY3R1cmUtaW4tcGljdHVyZSBhbmQgZnVsbHNjcmVlbi4K ICAqLwogLSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFu ZGxlcjoodm9pZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FW QUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpY2xv c2VBbGxNZWRpYVByZXNlbnRhdGlvbnM6KHZvaWQgKF5fTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRp b25IYW5kbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoImNsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zV2l0aENvbXBsZXRpb25IYW5kbGVyOiIsIG1hY29zKFdLX01BQ19UQkEs IFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSwgV0tfSU9TX1RCQSkpOwogCiAvKiEgQGFic3Ry YWN0IFBhdXNlcyBtZWRpYSBwbGF5YmFjayBpbiBXS1dlYlZpZXcuCiAgQGRpc2N1c3Npb24gUGF1 c2VzIG1lZGlhIHBsYXliYWNrLiBNZWRpYSBpbiB0aGUgcGFnZSBjYW4gYmUgcmVzdGFydGVkIGJ5 IGNhbGxpbmcgcGxheSgpIG9uIGEgbWVkaWEgZWxlbWVudCBvciByZXN1bWUoKSBvbiBhbiBBdWRp b0NvbnRleHQgaW4gSmF2YVNjcmlwdC4gQSB1c2VyIGNhbiBhbHNvIHVzZSBtZWRpYSBjb250cm9s cyB0byBwbGF5IG1lZGlhIGNvbnRlbnQgYWZ0ZXIgaXQgaGFzIGJlZW4gcGF1c2VkLgogICovCiAt ICh2b2lkKXBhdXNlQWxsTWVkaWFQbGF5YmFja1dpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo Xl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNv cyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpcGF1c2VBbGxNZWRpYVBs YXliYWNrOih2b2lkICheX051bGxhYmxlKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElf REVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJwYXVzZUFsbE1lZGlhUGxheWJhY2tXaXRoQ29t cGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoV0tfTUFDX1RCQSwgV0tfTUFDX1RCQSksIGlvcyhXS19J T1NfVEJBLCBXS19JT1NfVEJBKSk7CiAKIC8qISBAYWJzdHJhY3QgU3VzcGVuZHMgb3IgcmVzdW1l cyBhbGwgbWVkaWEgcGxheWJhY2sgaW4gV0tXZWJWaWV3LgogICBAcGFyYW0gc3VzcGVuZGVkIFdo ZXRoZXIgbWVkaWEgcGxheWJhY2sgc2hvdWxkIGJlIHN1c3BlbmRlZCBvciByZXN1bWVkLgogICBA ZGlzY3Vzc2lvbiBJZiBzdXNwZW5kZWQgaXMgdHJ1ZSwgdGhpcyBwYXVzZXMgbWVkaWEgcGxheWJh Y2sgYW5kIGJsb2NrcyBhbGwgYXR0ZW1wdHMgYnkgdGhlIHBhZ2Ugb3IgdGhlIHVzZXIgdG8gcmVz dW1lIHVudGlsIHNldEFsbE1lZGlhUGxheWJhY2tTdXNwZW5kZWQgaXMgY2FsbGVkIGFnYWluIHdp dGggc3VzcGVuZGVkIHNldCB0byBmYWxzZS4gTWVkaWEgcGxheWJhY2sgc2hvdWxkIGFsd2F5cyBi ZSBzdXNwZW5kZWQgYW5kIHJlc3VtZWQgaW4gcGFpcnMuCiAqLwogLSAodm9pZClzZXRBbGxNZWRp YVBsYXliYWNrU3VzcGVuZGVkOihCT09MKXN1c3BlbmRlZCBjb21wbGV0aW9uSGFuZGxlcjoodm9p ZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRSht YWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpcmVzdW1lQWxsTWVk aWFQbGF5YmFjazoodm9pZCAoXiBfTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdL X0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoInNldEFsbE1lZGlhUGxheWJhY2tTdXNw ZW5kZWQ6Y29tcGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoV0tfTUFDX1RCQSwgV0tfTUFDX1RCQSks IGlvcyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CistICh2b2lkKXN1c3BlbmRBbGxNZWRpYVBs YXliYWNrOih2b2lkICheX051bGxhYmxlKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElf REVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJzZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVk OmNvbXBsZXRpb25IYW5kbGVyOiIsIG1hY29zKFdLX01BQ19UQkEsIFdLX01BQ19UQkEpLCBpb3Mo V0tfSU9TX1RCQSwgV0tfSU9TX1RCQSkpOwogCiAvKiEgQGFic3RyYWN0IEdldCB0aGUgY3VycmVu dCBtZWRpYSBwbGF5YmFjayBzdGF0ZSBvZiBhIFdLV2ViVmlldy4KICBAcGFyYW0gY29tcGxldGlv bkhhbmRsZXIgQSBibG9jayB0byBpbnZva2Ugd2l0aCB0aGUgcmV0dXJuIHZhbHVlIG9mIHRoZSBm dW5jdGlvbiBjYWxsLgpAQCAtMzYzLDcgKzM2Nyw3IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVn ZXIsIFdLTWVkaWFDYXB0dXJlU3RhdGUpIHsKICBXS01lZGlhUGxheWJhY2tTdGF0ZU5vbmUuCiAg Ki8KIC0gKHZvaWQpcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZVdpdGhDb21wbGV0aW9uSGFuZGxl cjoodm9pZCAoXikoV0tNZWRpYVBsYXliYWNrU3RhdGUpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQ SV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7Ci0KKy0gKHZv aWQpcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZToodm9pZCAoXikoV0tNZWRpYVBsYXliYWNrU3Rh dGUpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQo InJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGVXaXRoQ29tcGxldGlvbkhhbmRsZXI6IiwgbWFjb3Mo V0tfTUFDX1RCQSwgV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBLCBXS19JT1NfVEJBKSk7CiAK IC8qISBAYWJzdHJhY3QgVGhlIHN0YXRlIG9mIGNhbWVyYSBjYXB0dXJlIG9uIGEgd2ViIHBhZ2Uu CiAgQGRpc2N1c3Npb24gQGxpbmsgV0tXZWJWaWV3IEAvbGluayBpcyBrZXktdmFsdWUgb2JzZXJ2 aW5nIChLVk8pIGNvbXBsaWFudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KaW5kZXggMGViNWIzMjI5ZjNhZWZkMTdiZjZiNTIyYzU0NDI2ZGJkZTEy OWU2Yi4uYzE5ZjM1NzhjODExNzQyOTI0MDRjYWY2ODQyNWI5NjJkMzQ3MDI4MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC05MzYsNiAr OTM2LDExIEBAIHN0YXRpYyBib29sIHZhbGlkYXRlQXJndW1lbnQoaWQgYXJndW1lbnQpCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCistICh2b2lkKWNsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zOih2 b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxmIGNsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zV2l0aENvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyXTsK K30KKwogLSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFu ZGxlcjoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBUSFJPV19JRl9T VVNQRU5ERUQ7CkBAIC05NTMsNiArOTU4LDExIEBAIHN0YXRpYyBib29sIHZhbGlkYXRlQXJndW1l bnQoaWQgYXJndW1lbnQpCiAjZW5kaWYKIH0KIAorLSAodm9pZClwYXVzZUFsbE1lZGlhUGxheWJh Y2s6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3NlbGYgcGF1c2VB bGxNZWRpYVBsYXliYWNrV2l0aENvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyXTsK K30KKwogLSAodm9pZClwYXVzZUFsbE1lZGlhUGxheWJhY2tXaXRoQ29tcGxldGlvbkhhbmRsZXI6 KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgVEhST1dfSUZfU1VTUEVO REVEOwpAQCAtOTY0LDYgKzk3NCwxNiBAQCBzdGF0aWMgYm9vbCB2YWxpZGF0ZUFyZ3VtZW50KGlk IGFyZ3VtZW50KQogICAgIF9wYWdlLT5wYXVzZUFsbE1lZGlhUGxheWJhY2sobWFrZUJsb2NrUHRy KGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKKy0gKHZvaWQpcmVzdW1lQWxsTWVkaWFQbGF5YmFj azoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiBzZXRBbGxN ZWRpYVBsYXliYWNrU3VzcGVuZGVkOkZBTFNFIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25I YW5kbGVyXTsKK30KKworLSAodm9pZClzdXNwZW5kQWxsTWVkaWFQbGF5YmFjazoodm9pZCAoXiko dm9pZCkpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiBzZXRBbGxNZWRpYVBsYXliYWNr U3VzcGVuZGVkOlRSVUUgY29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkhhbmRsZXJdOworfQor CiAtICh2b2lkKXNldEFsbE1lZGlhUGxheWJhY2tTdXNwZW5kZWQ6KEJPT0wpc3VzcGVuZGVkIGNv bXBsZXRpb25IYW5kbGVyOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgogewogICAg IFRIUk9XX0lGX1NVU1BFTkRFRDsKQEAgLTk5NSw2ICsxMDE1LDExIEBAIHN0YXRpYyBXS01lZGlh UGxheWJhY2tTdGF0ZSB0b1dLTWVkaWFQbGF5YmFja1N0YXRlKFdlYktpdDo6TWVkaWFQbGF5YmFj a1N0YXRlIG1lCiAgICAgcmV0dXJuIFdLTWVkaWFQbGF5YmFja1N0YXRlTm9uZTsKIH0KIAorLSAo dm9pZClyZXF1ZXN0TWVkaWFQbGF5YmFja1N0YXRlOih2b2lkICheKShXS01lZGlhUGxheWJhY2tT dGF0ZSkpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiByZXF1ZXN0TWVkaWFQbGF5YmFj a1N0YXRlV2l0aENvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyXTsKK30KKwogLSAo dm9pZClyZXF1ZXN0TWVkaWFQbGF5YmFja1N0YXRlV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lk ICheKShXS01lZGlhUGxheWJhY2tTdGF0ZSkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBUSFJP V19JRl9TVVNQRU5ERUQ7Cg== 428814 2021-05-17 00:51:14 -0700 2021-05-17 11:44:36 -0700 Patch bug-225696-20210517095113.patch text/plain 6863 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgwMWFmNzg1MGMwMDA1ZTMw OGJkOGU5NzkwYTAxYTAwZDBhNDc5YzkuLjA1MDgwNWYxZDI1ZDY1ZThmZWQ3ZTE4OGI3MDZhNDEz Zjk2MGRkOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xMTI3LDYgKzExMjcsMjYgQEAKICAgICAgICAgKFdlYktp dDo6VGV4dFRyYWNrUHJpdmF0ZVJlbW90ZTo6dXBkYXRlQ29uZmlndXJhdGlvbik6CiAgICAgICAg ICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvVGV4dFRyYWNrUHJpdmF0ZVJlbW90ZS5oOgogCisyMDIx LTA1LTEyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXN1 cnJlY3QgV0tXZWJWaWV3IG1lZGlhIGNvbnRyb2xzIEFQSSByZW1vdmVkIGluIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE5MjkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTY5NgorICAgICAgICA8cmRhcjovLzc3ODYz MTk0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl dmVydCBjbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucywgcGF1c2VBbGxNZWRpYVBsYXliYWNrLCBy ZXN1bWVBbGxNZWRpYVBsYXliYWNrLCBzdXNwZW5kQWxsTWVkaWFQbGF5YmFjayBhbmQgcmVxdWVz dE1lZGlhUGxheWJhY2tTdGF0ZS4KKyAgICAgICAgTWFyayB0aGVtIGFzIGRlcHJlY2F0ZWQgaW4g ZmF2b3Igb2YgdGhlIGxhdGVzdCBBUEkgdmVyc2lvbnMgYW5kIGltcGxlbWVudCB0aGVtIGJhc2Vk IG9uIHRoZSBsYXRlc3QgQVBJIHZlcnNpb25zLgorICAgICAgICBObyBjaGFuZ2Ugb2YgYmVoYXZp b3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp ZXcgY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnM6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBw YXVzZUFsbE1lZGlhUGxheWJhY2s6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyByZXN1bWVBbGxN ZWRpYVBsYXliYWNrOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgc3VzcGVuZEFsbE1lZGlhUGxh eWJhY2s6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyByZXF1ZXN0TWVkaWFQbGF5YmFja1N0YXRl Ol0pOgorCiAyMDIxLTA1LTEyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBJbXBsZW1lbnQgYSByZW1vdGUgSW50ZXJuYWwgVW5pdCBpbiBHUFVQcm9jZXNzIGZv ciBhdWRpbyBNZWRpYVN0cmVhbVRyYWNrIHJlbmRlcmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oCmluZGV4IGFhOWE2N2U3NmZhNDA4MTdlZGM4YTQy YTFjNTRjZTE3ZWM1MTU5Y2EuLjZlNDNiOGE1NTdiMWY3MmRiYjBmNDA5YzVhYzQ4YmJlMDRhMWVj YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgK QEAgLTM0MywxNyArMzQzLDI3IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIFdLTWVkaWFD YXB0dXJlU3RhdGUpIHsKICBAZGlzY3Vzc2lvbiBJbmNsdWRlcyBwaWN0dXJlLWluLXBpY3R1cmUg YW5kIGZ1bGxzY3JlZW4uCiAgKi8KIC0gKHZvaWQpY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnNX aXRoQ29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF5fTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRpb25I YW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJB KSk7CisjaWZuZGVmIF9fc3dpZnRfXworLSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9u czoodm9pZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0RFUFJF Q0FURURfV0lUSF9SRVBMQUNFTUVOVCgiY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnNXaXRoQ29t cGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoMTEuMywgV0tfTUFDX1RCQSksIGlvcygxNC41LCBXS19J T1NfVEJBKSk7CisjZW5kaWYKIAogLyohIEBhYnN0cmFjdCBQYXVzZXMgbWVkaWEgcGxheWJhY2sg aW4gV0tXZWJWaWV3LgogIEBkaXNjdXNzaW9uIFBhdXNlcyBtZWRpYSBwbGF5YmFjay4gTWVkaWEg aW4gdGhlIHBhZ2UgY2FuIGJlIHJlc3RhcnRlZCBieSBjYWxsaW5nIHBsYXkoKSBvbiBhIG1lZGlh IGVsZW1lbnQgb3IgcmVzdW1lKCkgb24gYW4gQXVkaW9Db250ZXh0IGluIEphdmFTY3JpcHQuIEEg dXNlciBjYW4gYWxzbyB1c2UgbWVkaWEgY29udHJvbHMgdG8gcGxheSBtZWRpYSBjb250ZW50IGFm dGVyIGl0IGhhcyBiZWVuIHBhdXNlZC4KICAqLwogLSAodm9pZClwYXVzZUFsbE1lZGlhUGxheWJh Y2tXaXRoQ29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF5fTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRp b25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1Nf VEJBKSk7CisjaWZuZGVmIF9fc3dpZnRfXworLSAodm9pZClwYXVzZUFsbE1lZGlhUGxheWJhY2s6 KHZvaWQgKF5fTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9ERVBSRUNB VEVEX1dJVEhfUkVQTEFDRU1FTlQoInBhdXNlQWxsTWVkaWFQbGF5YmFja1dpdGhDb21wbGV0aW9u SGFuZGxlcjoiLCBtYWNvcygxMS4zLCBXS19NQUNfVEJBKSwgaW9zKDE0LjUsIFdLX0lPU19UQkEp KTsKKyNlbmRpZgogCiAvKiEgQGFic3RyYWN0IFN1c3BlbmRzIG9yIHJlc3VtZXMgYWxsIG1lZGlh IHBsYXliYWNrIGluIFdLV2ViVmlldy4KICAgQHBhcmFtIHN1c3BlbmRlZCBXaGV0aGVyIG1lZGlh IHBsYXliYWNrIHNob3VsZCBiZSBzdXNwZW5kZWQgb3IgcmVzdW1lZC4KICAgQGRpc2N1c3Npb24g SWYgc3VzcGVuZGVkIGlzIHRydWUsIHRoaXMgcGF1c2VzIG1lZGlhIHBsYXliYWNrIGFuZCBibG9j a3MgYWxsIGF0dGVtcHRzIGJ5IHRoZSBwYWdlIG9yIHRoZSB1c2VyIHRvIHJlc3VtZSB1bnRpbCBz ZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVkIGlzIGNhbGxlZCBhZ2FpbiB3aXRoIHN1c3BlbmRl ZCBzZXQgdG8gZmFsc2UuIE1lZGlhIHBsYXliYWNrIHNob3VsZCBhbHdheXMgYmUgc3VzcGVuZGVk IGFuZCByZXN1bWVkIGluIHBhaXJzLgogKi8KIC0gKHZvaWQpc2V0QWxsTWVkaWFQbGF5YmFja1N1 c3BlbmRlZDooQk9PTClzdXNwZW5kZWQgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF5fTnVsbGFi bGUpKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFD X1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisjaWZuZGVmIF9fc3dpZnRfXworLSAodm9pZClyZXN1 bWVBbGxNZWRpYVBsYXliYWNrOih2b2lkICheIF9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhh bmRsZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgic2V0QWxsTWVkaWFQbGF5 YmFja1N1c3BlbmRlZDpjb21wbGV0aW9uSGFuZGxlcjoiLCBtYWNvcygxMS4zLCBXS19NQUNfVEJB KSwgaW9zKDE0LjUsIFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpc3VzcGVuZEFsbE1lZGlhUGxheWJh Y2s6KHZvaWQgKF5fTnVsbGFibGUpKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9ERVBS RUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoInNldEFsbE1lZGlhUGxheWJhY2tTdXNwZW5kZWQ6Y29t cGxldGlvbkhhbmRsZXI6IiwgbWFjb3MoMTEuMywgV0tfTUFDX1RCQSksIGlvcygxNC41LCBXS19J T1NfVEJBKSk7CisjZW5kaWYKIAogLyohIEBhYnN0cmFjdCBHZXQgdGhlIGN1cnJlbnQgbWVkaWEg cGxheWJhY2sgc3RhdGUgb2YgYSBXS1dlYlZpZXcuCiAgQHBhcmFtIGNvbXBsZXRpb25IYW5kbGVy IEEgYmxvY2sgdG8gaW52b2tlIHdpdGggdGhlIHJldHVybiB2YWx1ZSBvZiB0aGUgZnVuY3Rpb24g Y2FsbC4KQEAgLTM2Myw3ICszNzMsOSBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBXS01l ZGlhQ2FwdHVyZVN0YXRlKSB7CiAgV0tNZWRpYVBsYXliYWNrU3RhdGVOb25lLgogICovCiAtICh2 b2lkKXJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGVXaXRoQ29tcGxldGlvbkhhbmRsZXI6KHZvaWQg KF4pKFdLTWVkaWFQbGF5YmFja1N0YXRlKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxB QkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwotCisjaWZuZGVmIF9fc3dp ZnRfXworLSAodm9pZClyZXF1ZXN0TWVkaWFQbGF5YmFja1N0YXRlOih2b2lkICheKShXS01lZGlh UGxheWJhY2tTdGF0ZSkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9S RVBMQUNFTUVOVCgicmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZVdpdGhDb21wbGV0aW9uSGFuZGxl cjoiLCBtYWNvcygxMS4zLCBXS19NQUNfVEJBKSwgaW9zKDE0LjUsIFdLX0lPU19UQkEpKTsKKyNl bmRpZgogCiAvKiEgQGFic3RyYWN0IFRoZSBzdGF0ZSBvZiBjYW1lcmEgY2FwdHVyZSBvbiBhIHdl YiBwYWdlLgogIEBkaXNjdXNzaW9uIEBsaW5rIFdLV2ViVmlldyBAL2xpbmsgaXMga2V5LXZhbHVl IG9ic2VydmluZyAoS1ZPKSBjb21wbGlhbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDE3MTA2ZmMxYzkwYjc2ODM1YTIyYzk0ZGU2NjUy YjJhMzZiMDU4MmEuLmQ1ZGRhOWQzOTAyYTZhOGZmZjRjMzJlODBlMzVhN2JkNWU1ZWEwYjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAt OTM1LDYgKzkzNSwxMSBAQCBzdGF0aWMgYm9vbCB2YWxpZGF0ZUFyZ3VtZW50KGlkIGFyZ3VtZW50 KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAorLSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2VudGF0 aW9uczoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiBjbG9z ZUFsbE1lZGlhUHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFu ZGxlcl07Cit9CisKIC0gKHZvaWQpY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnNXaXRoQ29tcGxl dGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgVEhS T1dfSUZfU1VTUEVOREVEOwpAQCAtOTUyLDYgKzk1NywxMSBAQCBzdGF0aWMgYm9vbCB2YWxpZGF0 ZUFyZ3VtZW50KGlkIGFyZ3VtZW50KQogI2VuZGlmCiB9CiAKKy0gKHZvaWQpcGF1c2VBbGxNZWRp YVBsYXliYWNrOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxm IHBhdXNlQWxsTWVkaWFQbGF5YmFja1dpdGhDb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFu ZGxlcl07Cit9CisKIC0gKHZvaWQpcGF1c2VBbGxNZWRpYVBsYXliYWNrV2l0aENvbXBsZXRpb25I YW5kbGVyOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIFRIUk9XX0lG X1NVU1BFTkRFRDsKQEAgLTk2Myw2ICs5NzMsMTYgQEAgc3RhdGljIGJvb2wgdmFsaWRhdGVBcmd1 bWVudChpZCBhcmd1bWVudCkKICAgICBfcGFnZS0+cGF1c2VBbGxNZWRpYVBsYXliYWNrKG1ha2VC bG9ja1B0cihjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCistICh2b2lkKXJlc3VtZUFsbE1lZGlh UGxheWJhY2s6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3NlbGYg c2V0QWxsTWVkaWFQbGF5YmFja1N1c3BlbmRlZDpGQUxTRSBjb21wbGV0aW9uSGFuZGxlcjpjb21w bGV0aW9uSGFuZGxlcl07Cit9CisKKy0gKHZvaWQpc3VzcGVuZEFsbE1lZGlhUGxheWJhY2s6KHZv aWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3NlbGYgc2V0QWxsTWVkaWFQ bGF5YmFja1N1c3BlbmRlZDpUUlVFIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVy XTsKK30KKwogLSAodm9pZClzZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVkOihCT09MKXN1c3Bl bmRlZCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIK IHsKICAgICBUSFJPV19JRl9TVVNQRU5ERUQ7CkBAIC05OTQsNiArMTAxNCwxMSBAQCBzdGF0aWMg V0tNZWRpYVBsYXliYWNrU3RhdGUgdG9XS01lZGlhUGxheWJhY2tTdGF0ZShXZWJLaXQ6Ok1lZGlh UGxheWJhY2tTdGF0ZSBtZQogICAgIHJldHVybiBXS01lZGlhUGxheWJhY2tTdGF0ZU5vbmU7CiB9 CiAKKy0gKHZvaWQpcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZToodm9pZCAoXikoV0tNZWRpYVBs YXliYWNrU3RhdGUpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3NlbGYgcmVxdWVzdE1lZGlh UGxheWJhY2tTdGF0ZVdpdGhDb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFuZGxlcl07Cit9 CisKIC0gKHZvaWQpcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZVdpdGhDb21wbGV0aW9uSGFuZGxl cjoodm9pZCAoXikoV0tNZWRpYVBsYXliYWNrU3RhdGUpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAg ICAgVEhST1dfSUZfU1VTUEVOREVEOwo= 428851 2021-05-17 11:44:41 -0700 2021-05-18 01:10:45 -0700 Patch for landing bug-225696-20210517204439.patch text/plain 6702 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgwMWFmNzg1MGMwMDA1ZTMw OGJkOGU5NzkwYTAxYTAwZDBhNDc5YzkuLjI0OWI5OTRmYTg0OGY1YTc0ZWQyZjFjNmRmMTdiM2Iw YmExMTRkOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMDUtMTIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFJlc3VycmVjdCBXS1dlYlZpZXcg bWVkaWEgY29udHJvbHMgQVBJIHJlbW92ZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMTkyOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI1Njk2CisgICAgICAgIDxyZGFyOi8vNzc4NjMxOTQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBSZXZlcnQgY2xvc2VBbGxN ZWRpYVByZXNlbnRhdGlvbnMsIHBhdXNlQWxsTWVkaWFQbGF5YmFjaywgcmVzdW1lQWxsTWVkaWFQ bGF5YmFjaywgc3VzcGVuZEFsbE1lZGlhUGxheWJhY2sgYW5kIHJlcXVlc3RNZWRpYVBsYXliYWNr U3RhdGUuCisgICAgICAgIE1hcmsgdGhlbSBhcyBkZXByZWNhdGVkIGluIGZhdm9yIG9mIHRoZSBs YXRlc3QgQVBJIHZlcnNpb25zIGFuZCBpbXBsZW1lbnQgdGhlbSBiYXNlZCBvbiB0aGUgbGF0ZXN0 IEFQSSB2ZXJzaW9ucy4KKyAgICAgICAgTm8gY2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IGNsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgcGF1c2VBbGxNZWRpYVBs YXliYWNrOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgcmVzdW1lQWxsTWVkaWFQbGF5YmFjazpd KToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHN1c3BlbmRBbGxNZWRpYVBsYXliYWNrOl0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZTpdKToKKwogMjAyMS0w NS0xNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNl c3Npb25Db29yZGluYXRvciBzdXJ2aXZlcyBwYWdlIHJlbG9hZC9uYXZpZ2F0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgKaW5kZXggYWE5YTY3ZTc2 ZmE0MDgxN2VkYzhhNDJhMWM1NGNlMTdlYzUxNTljYS4uNmU0M2I4YTU1N2IxZjcyZGJiMGY0MDlj NWFjNDhiYmUwNGExZWNhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcuaApAQCAtMzQzLDE3ICszNDMsMjcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50 ZWdlciwgV0tNZWRpYUNhcHR1cmVTdGF0ZSkgewogIEBkaXNjdXNzaW9uIEluY2x1ZGVzIHBpY3R1 cmUtaW4tcGljdHVyZSBhbmQgZnVsbHNjcmVlbi4KICAqLwogLSAodm9pZCljbG9zZUFsbE1lZGlh UHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXl9OdWxsYWJsZSkodm9p ZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKKyNpZm5kZWYgX19zd2lmdF9fCistICh2b2lkKWNsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zOih2b2lkICheX051bGxhYmxlKSh2b2lkKSljb21wbGV0aW9uSGFuZGxl ciBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJjbG9zZUFsbE1lZGlhUHJlc2Vu dGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjoiLCBtYWNvcygxMS4zLCBXS19NQUNfVEJBKSwg aW9zKDE0LjUsIFdLX0lPU19UQkEpKTsKKyNlbmRpZgogCiAvKiEgQGFic3RyYWN0IFBhdXNlcyBt ZWRpYSBwbGF5YmFjayBpbiBXS1dlYlZpZXcuCiAgQGRpc2N1c3Npb24gUGF1c2VzIG1lZGlhIHBs YXliYWNrLiBNZWRpYSBpbiB0aGUgcGFnZSBjYW4gYmUgcmVzdGFydGVkIGJ5IGNhbGxpbmcgcGxh eSgpIG9uIGEgbWVkaWEgZWxlbWVudCBvciByZXN1bWUoKSBvbiBhbiBBdWRpb0NvbnRleHQgaW4g SmF2YVNjcmlwdC4gQSB1c2VyIGNhbiBhbHNvIHVzZSBtZWRpYSBjb250cm9scyB0byBwbGF5IG1l ZGlhIGNvbnRlbnQgYWZ0ZXIgaXQgaGFzIGJlZW4gcGF1c2VkLgogICovCiAtICh2b2lkKXBhdXNl QWxsTWVkaWFQbGF5YmFja1dpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXl9OdWxsYWJsZSko dm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKKyNpZm5kZWYgX19zd2lmdF9fCistICh2b2lkKXBhdXNlQWxs TWVkaWFQbGF5YmFjazoodm9pZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIg V0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgicGF1c2VBbGxNZWRpYVBsYXliYWNr V2l0aENvbXBsZXRpb25IYW5kbGVyOiIsIG1hY29zKDExLjMsIFdLX01BQ19UQkEpLCBpb3MoMTQu NSwgV0tfSU9TX1RCQSkpOworI2VuZGlmCiAKIC8qISBAYWJzdHJhY3QgU3VzcGVuZHMgb3IgcmVz dW1lcyBhbGwgbWVkaWEgcGxheWJhY2sgaW4gV0tXZWJWaWV3LgogICBAcGFyYW0gc3VzcGVuZGVk IFdoZXRoZXIgbWVkaWEgcGxheWJhY2sgc2hvdWxkIGJlIHN1c3BlbmRlZCBvciByZXN1bWVkLgog ICBAZGlzY3Vzc2lvbiBJZiBzdXNwZW5kZWQgaXMgdHJ1ZSwgdGhpcyBwYXVzZXMgbWVkaWEgcGxh eWJhY2sgYW5kIGJsb2NrcyBhbGwgYXR0ZW1wdHMgYnkgdGhlIHBhZ2Ugb3IgdGhlIHVzZXIgdG8g cmVzdW1lIHVudGlsIHNldEFsbE1lZGlhUGxheWJhY2tTdXNwZW5kZWQgaXMgY2FsbGVkIGFnYWlu IHdpdGggc3VzcGVuZGVkIHNldCB0byBmYWxzZS4gTWVkaWEgcGxheWJhY2sgc2hvdWxkIGFsd2F5 cyBiZSBzdXNwZW5kZWQgYW5kIHJlc3VtZWQgaW4gcGFpcnMuCiAqLwogLSAodm9pZClzZXRBbGxN ZWRpYVBsYXliYWNrU3VzcGVuZGVkOihCT09MKXN1c3BlbmRlZCBjb21wbGV0aW9uSGFuZGxlcjoo dm9pZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJM RShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKyNpZm5kZWYgX19zd2lmdF9f CistICh2b2lkKXJlc3VtZUFsbE1lZGlhUGxheWJhY2s6KHZvaWQgKF4gX051bGxhYmxlKSh2b2lk KSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJz ZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVkOmNvbXBsZXRpb25IYW5kbGVyOiIsIG1hY29zKDEx LjMsIFdLX01BQ19UQkEpLCBpb3MoMTQuNSwgV0tfSU9TX1RCQSkpOworLSAodm9pZClzdXNwZW5k QWxsTWVkaWFQbGF5YmFjazoodm9pZCAoXl9OdWxsYWJsZSkodm9pZCkpY29tcGxldGlvbkhhbmRs ZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgic2V0QWxsTWVkaWFQbGF5YmFj a1N1c3BlbmRlZDpjb21wbGV0aW9uSGFuZGxlcjoiLCBtYWNvcygxMS4zLCBXS19NQUNfVEJBKSwg aW9zKDE0LjUsIFdLX0lPU19UQkEpKTsKKyNlbmRpZgogCiAvKiEgQGFic3RyYWN0IEdldCB0aGUg Y3VycmVudCBtZWRpYSBwbGF5YmFjayBzdGF0ZSBvZiBhIFdLV2ViVmlldy4KICBAcGFyYW0gY29t cGxldGlvbkhhbmRsZXIgQSBibG9jayB0byBpbnZva2Ugd2l0aCB0aGUgcmV0dXJuIHZhbHVlIG9m IHRoZSBmdW5jdGlvbiBjYWxsLgpAQCAtMzYzLDcgKzM3Myw5IEBAIHR5cGVkZWYgTlNfRU5VTShO U0ludGVnZXIsIFdLTWVkaWFDYXB0dXJlU3RhdGUpIHsKICBXS01lZGlhUGxheWJhY2tTdGF0ZU5v bmUuCiAgKi8KIC0gKHZvaWQpcmVxdWVzdE1lZGlhUGxheWJhY2tTdGF0ZVdpdGhDb21wbGV0aW9u SGFuZGxlcjoodm9pZCAoXikoV0tNZWRpYVBsYXliYWNrU3RhdGUpKWNvbXBsZXRpb25IYW5kbGVy IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7Ci0K KyNpZm5kZWYgX19zd2lmdF9fCistICh2b2lkKXJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGU6KHZv aWQgKF4pKFdLTWVkaWFQbGF5YmFja1N0YXRlKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfREVQ UkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJyZXF1ZXN0TWVkaWFQbGF5YmFja1N0YXRlV2l0aENv bXBsZXRpb25IYW5kbGVyOiIsIG1hY29zKDExLjMsIFdLX01BQ19UQkEpLCBpb3MoMTQuNSwgV0tf SU9TX1RCQSkpOworI2VuZGlmCiAKIC8qISBAYWJzdHJhY3QgVGhlIHN0YXRlIG9mIGNhbWVyYSBj YXB0dXJlIG9uIGEgd2ViIHBhZ2UuCiAgQGRpc2N1c3Npb24gQGxpbmsgV0tXZWJWaWV3IEAvbGlu ayBpcyBrZXktdmFsdWUgb2JzZXJ2aW5nIChLVk8pIGNvbXBsaWFudApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMTcxMDZmYzFjOTBiNzY4 MzVhMjJjOTRkZTY2NTJiMmEzNmIwNTgyYS4uODkyYWE0ODU4ZjQ4YTc5YmIyYTNkOWUzZjRjNjVi ZjFkOGM5NDM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tCkBAIC05MzUsNiArOTM1LDExIEBAIHN0YXRpYyBib29sIHZhbGlkYXRlQXJndW1l bnQoaWQgYXJndW1lbnQpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCistICh2b2lkKWNsb3NlQWxs TWVkaWFQcmVzZW50YXRpb25zOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgorewor ICAgIFtzZWxmIGNsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zV2l0aENvbXBsZXRpb25IYW5kbGVy OmNvbXBsZXRpb25IYW5kbGVyXTsKK30KKwogLSAodm9pZCljbG9zZUFsbE1lZGlhUHJlc2VudGF0 aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRs ZXIKIHsKICAgICBUSFJPV19JRl9TVVNQRU5ERUQ7CkBAIC05NTIsNiArOTU3LDExIEBAIHN0YXRp YyBib29sIHZhbGlkYXRlQXJndW1lbnQoaWQgYXJndW1lbnQpCiAjZW5kaWYKIH0KIAorLSAodm9p ZClwYXVzZUFsbE1lZGlhUGxheWJhY2s6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVy Cit7CisgICAgW3NlbGYgcGF1c2VBbGxNZWRpYVBsYXliYWNrV2l0aENvbXBsZXRpb25IYW5kbGVy OmNvbXBsZXRpb25IYW5kbGVyXTsKK30KKwogLSAodm9pZClwYXVzZUFsbE1lZGlhUGxheWJhY2tX aXRoQ29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCiB7 CiAgICAgVEhST1dfSUZfU1VTUEVOREVEOwpAQCAtOTYzLDYgKzk3MywxNiBAQCBzdGF0aWMgYm9v bCB2YWxpZGF0ZUFyZ3VtZW50KGlkIGFyZ3VtZW50KQogICAgIF9wYWdlLT5wYXVzZUFsbE1lZGlh UGxheWJhY2sobWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKKy0gKHZvaWQp cmVzdW1lQWxsTWVkaWFQbGF5YmFjazoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIK K3sKKyAgICBbc2VsZiBzZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVkOk5PIGNvbXBsZXRpb25I YW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyXTsKK30KKworLSAodm9pZClzdXNwZW5kQWxsTWVkaWFQ bGF5YmFjazoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiBz ZXRBbGxNZWRpYVBsYXliYWNrU3VzcGVuZGVkOllFUyBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0 aW9uSGFuZGxlcl07Cit9CisKIC0gKHZvaWQpc2V0QWxsTWVkaWFQbGF5YmFja1N1c3BlbmRlZDoo Qk9PTClzdXNwZW5kZWQgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRp b25IYW5kbGVyCiB7CiAgICAgVEhST1dfSUZfU1VTUEVOREVEOwpAQCAtOTk0LDYgKzEwMTQsMTEg QEAgc3RhdGljIFdLTWVkaWFQbGF5YmFja1N0YXRlIHRvV0tNZWRpYVBsYXliYWNrU3RhdGUoV2Vi S2l0OjpNZWRpYVBsYXliYWNrU3RhdGUgbWUKICAgICByZXR1cm4gV0tNZWRpYVBsYXliYWNrU3Rh dGVOb25lOwogfQogCistICh2b2lkKXJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGU6KHZvaWQgKF4p KFdLTWVkaWFQbGF5YmFja1N0YXRlKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIFtzZWxmIHJl cXVlc3RNZWRpYVBsYXliYWNrU3RhdGVXaXRoQ29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkhh bmRsZXJdOworfQorCiAtICh2b2lkKXJlcXVlc3RNZWRpYVBsYXliYWNrU3RhdGVXaXRoQ29tcGxl dGlvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTWVkaWFQbGF5YmFja1N0YXRlKSljb21wbGV0aW9uSGFu ZGxlcgogewogICAgIFRIUk9XX0lGX1NVU1BFTkRFRDsK