211272 2020-04-30 19:15:36 -0700 ContextMenu: entire webpage pops and disappears to generate preview of embedded image 2020-05-07 10:17:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino megan_gardner mjs thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1647712 0 dino 2020-04-30 19:15:36 -0700 ContextMenu: entire webpage pops and disappears to generate preview of embedded image 1647715 1 dino 2020-04-30 19:22:17 -0700 rdar://62482013 1647716 2 398143 dino 2020-04-30 19:23:18 -0700 Created attachment 398143 Patch 1647783 3 398143 mjs 2020-05-01 00:44:56 -0700 Comment on attachment 398143 Patch Is it possible to make a test case for this? Since it regressed once, it would be nice if we could avoid regressing again. (I'm going to guess the sad answer is no, but it would be good to at least explain why a test can't be made). r=me 1647862 4 wenson_hsieh 2020-05-01 09:08:13 -0700 Without these early returns, is there anything that prevents the preview container from being unparented while it is being used as targeted context menu preview? It seems like we ought to either fix the `_actionSheetAssistant` check to only early return if the action sheet assistant is in the process of presenting a context menu, or use a different container view for the action sheet assistant’s preview. 1647938 5 398143 megan_gardner 2020-05-01 11:27:29 -0700 Comment on attachment 398143 Patch these returns are here for a reason, we need to have a solution that does not break the new menus that were added. 1648071 6 dino 2020-05-01 14:49:47 -0700 (In reply to Megan Gardner from comment #5) > Comment on attachment 398143 [details] > Patch > > these returns are here for a reason, we need to have a solution that does > not break the new menus that were added. Then I should roll out your patches because they caused this regression :) It was wrong to test for the existence of _actionSheetAssistant, since it always exists - it's lifetime is (effectively) tied to the WKContentView. Your change in r260146 should have been rejected. As Maciej pointed out, it sucks that there were no tests for this. It's also wrong to put logic in the UIContextMenu delegate methods that is affecting behaviour in the action sheet assistant and file upload. The purpose of that code is to react to what the UIContextMenu did, not what else might have happened in the meantime. It seems the best approach would be to come up with a better solution for the case where multiple things can trigger a UIContextMenu - my suggestion would be that ActionSheetAssistant should go away or be merged with the existing UIContextMenu code. That way we could have one place that knows about what menus are active. That's a pretty big change though. So in the meantime I think you'll need to either: - have the action sheet menu and file upload set a flag, only when necessary, that allows our UIContextMenu delegate's animation completion block to *not* clear the view acting as the container. However, that means they'll have to clear the view themselves when necessary to avoid breaking the next context menu. - use a different container view for action sheets and file uploads 1648073 7 dino 2020-05-01 14:51:31 -0700 (In reply to Maciej Stachowiak from comment #3) > Comment on attachment 398143 [details] > Patch > > Is it possible to make a test case for this? Since it regressed once, it > would be nice if we could avoid regressing again. (I'm going to guess the > sad answer is no, but it would be good to at least explain why a test can't > be made). > > r=me I believe we could write an API test that shows a menu, picks the "open" action which would trigger the navigation, navigates back to the original page and attempts to show a menu again. At the moment we don't have the testing infrastructure to select things from the menu, but we definitely should fix this. 1648077 8 thorton 2020-05-01 14:54:08 -0700 (In reply to Dean Jackson from comment #6) > (In reply to Megan Gardner from comment #5) > > Comment on attachment 398143 [details] > > Patch > > > > these returns are here for a reason, we need to have a solution that does > > not break the new menus that were added. > > Then I should roll out your patches because they caused this regression :) > > It was wrong to test for the existence of _actionSheetAssistant, since it > always exists - it's lifetime is (effectively) tied to the WKContentView. > Your change in r260146 should have been rejected. As Maciej pointed out, it > sucks that there were no tests for this. Agreed on both points. But now it's likely easier to fix than revert. > It's also wrong to put logic in the UIContextMenu delegate methods that is > affecting behaviour in the action sheet assistant and file upload. The > purpose of that code is to react to what the UIContextMenu did, not what > else might have happened in the meantime. > > It seems the best approach would be to come up with a better solution for > the case where multiple things can trigger a UIContextMenu - my suggestion > would be that ActionSheetAssistant should go away or be merged with the > existing UIContextMenu code. That way we could have one place that knows > about what menus are active. This is a good long-term strategy. Both WKActionSheetAssistant and the context menu code are pretty 🍝 > That's a pretty big change though. So in the meantime I think you'll need to > either: > > - have the action sheet menu and file upload set a flag, only when > necessary, that allows our UIContextMenu delegate's animation completion > block to *not* clear the view acting as the container. However, that means > they'll have to clear the view themselves when necessary to avoid breaking > the next context menu. These two small changes seem like the easiest path forward > - use a different container view for action sheets and file uploads 1648081 9 dino 2020-05-01 14:59:12 -0700 (In reply to Tim Horton from comment #8) > (In reply to Dean Jackson from comment #6) > > (In reply to Megan Gardner from comment #5) > > > Comment on attachment 398143 [details] > > > Patch > > > > > > these returns are here for a reason, we need to have a solution that does > > > not break the new menus that were added. > > > > Then I should roll out your patches because they caused this regression :) > > > > It was wrong to test for the existence of _actionSheetAssistant, since it > > always exists - it's lifetime is (effectively) tied to the WKContentView. > > Your change in r260146 should have been rejected. As Maciej pointed out, it > > sucks that there were no tests for this. > > Agreed on both points. But now it's likely easier to fix than revert. Yeah, that's why I tried to fix, but I didn't understand why multiple things are now using that container. > > - have the action sheet menu and file upload set a flag, only when > > necessary, that allows our UIContextMenu delegate's animation completion > > block to *not* clear the view acting as the container. However, that means > > they'll have to clear the view themselves when necessary to avoid breaking > > the next context menu. > > These two small changes seem like the easiest path forward As I said, I don't understand why multiple things are using the same container in different ways. The "thing known to rhyme with Sticky Forb" recreates the container each time as it is invoked. But this new code is expected it to remain. 1648086 10 thorton 2020-05-01 15:03:24 -0700 (In reply to Dean Jackson from comment #9) > (In reply to Tim Horton from comment #8) > > (In reply to Dean Jackson from comment #6) > > > (In reply to Megan Gardner from comment #5) > > > > Comment on attachment 398143 [details] > > > > Patch > > > > > > > > these returns are here for a reason, we need to have a solution that does > > > > not break the new menus that were added. > > > > > > Then I should roll out your patches because they caused this regression :) > > > > > > It was wrong to test for the existence of _actionSheetAssistant, since it > > > always exists - it's lifetime is (effectively) tied to the WKContentView. > > > Your change in r260146 should have been rejected. As Maciej pointed out, it > > > sucks that there were no tests for this. > > > > Agreed on both points. But now it's likely easier to fix than revert. > > Yeah, that's why I tried to fix, but I didn't understand why multiple things > are now using that container. It seemed OK at the time. Might have been a mistake. They are the same kinds of things. > > > - have the action sheet menu and file upload set a flag, only when > > > necessary, that allows our UIContextMenu delegate's animation completion > > > block to *not* clear the view acting as the container. However, that means > > > they'll have to clear the view themselves when necessary to avoid breaking > > > the next context menu. > > > > These two small changes seem like the easiest path forward > > As I said, I don't understand why multiple things are using the same > container in different ways. The "thing known to rhyme with Sticky Forb" > recreates the container each time as it is invoked. But this new code is > expected it to remain. Nobody's expecting it to remain. Everyone recreates the container when presenting a UIContextMenu. The thing we can't do is remove it when a new UIContextMenu has been presented before the previous one's dismissal completed, which currently means asking 3 different classes if they have done so. 1649767 11 megan_gardner 2020-05-06 13:16:09 -0700 *** Bug 211526 has been marked as a duplicate of this bug. *** 1649775 12 398650 megan_gardner 2020-05-06 13:44:04 -0700 Created attachment 398650 Patch 1649788 13 398650 thorton 2020-05-06 14:05:53 -0700 Comment on attachment 398650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398650&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:9419 > + if (![strongSelf _canRemoveContextMenuView]) > return; > [std::exchange(strongSelf->_contextMenuHintContainerView, nil) removeFromSuperview]; Why not just call _removeContextMenuViewIfPossible here, and then _canRemoveContextMenuView doesn't need to be separate? 1649792 14 398656 megan_gardner 2020-05-06 14:21:12 -0700 Created attachment 398656 Patch 1649798 15 398656 thorton 2020-05-06 14:28:51 -0700 Comment on attachment 398656 Patch so much better 1649803 16 398656 wenson_hsieh 2020-05-06 14:31:52 -0700 Comment on attachment 398656 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398656&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7716 > + if (_actionSheetAssistant && [_actionSheetAssistant hasContextMenuInteraction]) Nit - it should be okay to just check `[_actionSheetAssistant hasContextMenuInteraction]` here. 1650163 17 398749 megan_gardner 2020-05-07 09:56:20 -0700 Created attachment 398749 Patch for landing 1650173 18 ews-feeder 2020-05-07 10:17:30 -0700 Committed r261303: <https://trac.webkit.org/changeset/261303> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398749. 398143 2020-04-30 19:23:18 -0700 2020-05-06 13:44:03 -0700 Patch bug-211272-20200501122317.patch text/plain 2663 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFlZmFhMTMxNDljODJmODY0 YmQzOWI3NTI5ZTUyM2VlNDgxNWQ1MGYuLjJjYjIwOWNkZjA0NmMyYzAzODg3YWQwYjIzMjAyODNm MzQxZGUzNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMzAgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIENvbnRleHRNZW51OiAgZW50aXJlIHdl YnBhZ2UgcG9wcyBhbmQgZGlzYXBwZWFycyB0byBnZW5lcmF0ZSBwcmV2aWV3IG9mIGVtYmVkZGVk IGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTEyNzIKKyAgICAgICAgcmRhcjovLzYyNDgyMDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ29tbWl0cyByMjYwMTE2IGFuZCByMjYwMTQ2IGludHJv ZHVjZWQgc29tZSBlYXJseSByZXR1cm5zIGluIHRoZSBjb21wbGV0aW9uIGJsb2NrIGZvcgorICAg ICAgICBhIGNvbnRleHQgbWVudS4gT25lIG9mIHRoZW0gd2FzIGNoZWNraW5nIGZvciB0aGUgZXhp c3RlbmNlIG9mIHRoZSBhY3Rpb25TaGVldENvbnRyb2xsZXIsCisgICAgICAgIHdoaWNoIGlzIHRp ZWQgdG8gdGhlIGxpZmV0aW1lIG9mIHRoZSBXS0NvbnRlbnRWaWV3LCBlbnN1cmluZyB0aGF0IHRo ZSBjb21wbGV0aW9uIGJsb2NrCisgICAgICAgIHdvdWxkIGFsd2F5cyBleGl0IGJlZm9yZSBkb2lu ZyBhbnl0aGluZy4gVGhpcyBjYXVzZXMgdGhlIHNwZWNpYWwgY29udGFpbmVyIHZpZXcgd2UgdXNl CisgICAgICAgIGZvciBoaWdobGlnaHRzIHRvIG5ldmVyIGJlIHJlc2V0LCBhbmQgdGhlbiBzdWJz ZXF1ZW50IGhpZ2hsaWdodHMgYXJlIGluY29ycmVjdCBzaW5jZSB0aGUKKyAgICAgICAgb2xkIHZp ZXcgaGFzIGJlZW4gZGV0YWNoZWQuCisKKyAgICAgICAgSSdtIHJlbW92aW5nIHRoYXQgbG9naWMg ZnJvbSB0aGUgYmxvY2suIEl0IHNob3VsZCBiZSBmaW5lIHRvIGNyZWF0ZSB0aGUgbmV3IHZpZXcK KyAgICAgICAgZWFjaCB0aW1lIGZvciBhY3Rpb24gc2hlZXRzIGFuZCBmaWxlIHVwbG9hZHMsIHNp bmNlIHdlIGRvIHRoYXQgZm9yIGNvbnRleHQgbWVudXMuCisgICAgICAgIE9yLCBpZiB0aGV5IHJl YWxseSBuZWVkIHRvIGtlZXAgdGhlIHNhbWUgdmlldyBhbGl2ZSwgdGhleSBzaG91bGQgaW5kaWNh dGUgd2hlbiB0aGV5CisgICAgICAgIGFyZSBhY3RpdmUuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBjb250ZXh0TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFuaW1hdG9y Ol0pOiBFbnN1cmUKKyAgICAgICAgdGhhdCB0aGUgYW5pbWF0aW9uIGNvbXBsZXRpb24gYmxvY2sg c2V0cyB0aGUgaGludCBjb250YWluZXIgdmlldyB0byBuaWwuCisKIDIwMjAtMDQtMjkgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgV0tO YXZpZ2F0aW9uRGVsZWdhdGUgQVBJIHNob3VsZEFsbG93RGVwcmVjYXRlZFRMUwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KaW5kZXggYTQzY2NlZTUzMjJjY2YwZDU5ODJiZmY1MTNlMWIxZDhiZGU1ODMxMi4uMzVmM2Fh YjVmZDQyNjgzYTEwYWIyOWIxNzNhNmFhMTRmMWU3MzFkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC05 MzUxLDEyICs5MzUxLDYgQEAgc3RhdGljIFVJTWVudSAqbWVudUZyb21MZWdhY3lQcmV2aWV3T3JE ZWZhdWx0QWN0aW9ucyhVSVZpZXdDb250cm9sbGVyICpwcmV2aWV3VmkKICAgICAgICAgLy8gYW5k IHJlbW92aW5nIHRoZSBoaW50IGNvbnRhaW5lciB2aWV3IHdpbGwgY2F1c2UgdGhlIGFuaW1hdGlv biB0byBicmVhay4KICAgICAgICAgaWYgKHN0cm9uZ1NlbGYtPl9jb250ZXh0TWVudUVsZW1lbnRJ bmZvKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAvLyBXZSBhcmUgYWxzbyB1c2luZyB0 aGlzIGNvbnRhaW5lciBmb3IgdGhlIGZpbGUgdXBsb2FkIHBhbmVsLi4uCi0gICAgICAgIGlmIChz dHJvbmdTZWxmLT5fZmlsZVVwbG9hZFBhbmVsKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAvLyBhbmQgdGhlIGFjdGlvbiBzaGVldCBhc3Npc3RhbnQuCi0gICAgICAgIGlmIChzdHJvbmdT ZWxmLT5fYWN0aW9uU2hlZXRBc3Npc3RhbnQpCi0gICAgICAgICAgICByZXR1cm47CiAgICAgICAg IFtzdGQ6OmV4Y2hhbmdlKHN0cm9uZ1NlbGYtPl9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3 LCBuaWwpIHJlbW92ZUZyb21TdXBlcnZpZXddOwogICAgIH1dOwogfQo= 398650 2020-05-06 13:44:04 -0700 2020-05-07 09:56:17 -0700 Patch bug-211272-20200506134400.patch text/plain 7960 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMmQzMjFhNzM3Y2RkODFk OWQ3OGU1MWNkZjcyYjg0ZGQ2OWIxYTAuLjYxNDhlMDA5NDBlMjZlZThmNDNmNWIyNTdkYjAyNzQy NGUwNzA2ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMDUtMDYgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZXh0TWVudTog ZW50aXJlIHdlYnBhZ2UgcG9wcyBhbmQgZGlzYXBwZWFycyB0byBnZW5lcmF0ZSBwcmV2aWV3IG9m IGVtYmVkZGVkIGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTEyNzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyNDgyMDEzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBBY3Rpb25TaGVl dEFzc2lzdGFudCBpcyBhbHdheXMgYXJvdW5kLCBzbyB1c2luZyB0aGUgcHJlc2VuY2Ugb2Ygb25l CisgICAgICAgIHRvIGRldGVybWluZSBpZiB3ZSBuZWVkIHRvIHJlbW92ZSB0aGUgX2NvbnRleHRN ZW51SGludENvbnRhaW5lclZpZXcgaXMgaW5jb3JyZWN0CisgICAgICAgIGFuZCBjYXVzZXMgaXQg dG8gYmUgYXJvdW5kIG9uIHRoZSBuZXh0IGludm9jYXRpb24gb2YgdGhlIGNvbnRleHQgbWVudSwg YW5kIAorICAgICAgICBjYXVzaW5nIHRoZSBmYWlsdXJlIG9mIHRoZSBjcmVhdGlvbiBvZiBhIG5l dyBwcmV2aWV3LCB3aGljaCB0aGVuIHdpbGwgZGVmYXVsdCB0bworICAgICAgICBwb3BwaW5nIHRo ZSB3aG9sZSBwYWdlLiBXZSBuZWVkIHRvIGFzayB0aGUgQWN0aW9uU2hlZXRBc3Npc3RhbnQgaWYg aXQgaXMgYWN0aXZlbHkgc2hvd2luZworICAgICAgICBhbnl0aGluZywgYW5kIHRoZW4gY29ycmVj dGx5IGNsZWFuIHVwIHRoZSBfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldyBhZnRlciB0aGUg CisgICAgICAgIGVuZCBvZiB0aGUgaW50ZXJhY3Rpb25zIGZvciBGaWxlVXBsb2FkTWVudSBhbmQg QWN0aW9uU2hlZXRBc3Npc3RhbnQgYXJlIGRvbmUgd2l0aCB0aGVpcgorICAgICAgICBpbnRlcmFj dGlvbnMuIAorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tOgor ICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IHJlbW92ZUNvbnRleHRNZW51SW50ZXJh Y3Rpb25dKToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBoYXNDb250ZXh0TWVu dUludGVyYWN0aW9uXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyByZW1vdmVDb250ZXh0TWVudVZpZXdJ ZlBvc3NpYmxlRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgX2NhblJlbW92ZUNvbnRleHRNZW51Vmlld10pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlXSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlvbjp3aWxsRW5kRm9yQ29uZmlndXJhdGlvbjph bmltYXRvcjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBh bmVsLm1tOgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCByZW1vdmVDb250ZXh0TWVudUlu dGVyYWN0aW9uXSk6CisKIDIwMjAtMDUtMDEgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjYwOTIwLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3Rh bnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50 LmgKaW5kZXggNmRhZTQ1MGFjMjRhODNmNGQwMzQ3NzBlNWEzMDVjNzFlMjlkNGEzYS4uNzVkYzY5 Mjc3ODgzZGEyODc0NTVlNGJhNmZkMjgyYzdjZjY4MDZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCkBAIC02NiwxMiAr NjYsMTQgQEAgc3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOwogLSAoQ0dQ b2ludCljb250ZXh0TWVudVByZXNlbnRhdGlvbkxvY2F0aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3Rh bnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQ7CiAjaWYgVVNFKFVJQ09OVEVY VE1FTlUpCiAtIChVSVRhcmdldGVkUHJldmlldyAqKWNyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVI aW50Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Np c3RhbnQ7CistICh2b2lkKXJlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9zc2libGVGb3JBY3Rpb25T aGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudDsKICNlbmRp ZgogCiBAZW5kCiAKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04pICYmIFVTRShVSUNPTlRFWFRN RU5VKQogQGludGVyZmFjZSBXS0FjdGlvblNoZWV0QXNzaXN0YW50IDogTlNPYmplY3QgPFdLQWN0 aW9uU2hlZXREZWxlZ2F0ZSwgREREZXRlY3Rpb25Db250cm9sbGVySW50ZXJhY3Rpb25EZWxlZ2F0 ZSwgVUlDb250ZXh0TWVudUludGVyYWN0aW9uRGVsZWdhdGU+CistIChCT09MKWhhc0NvbnRleHRN ZW51SW50ZXJhY3Rpb247CiAjZWxzZQogQGludGVyZmFjZSBXS0FjdGlvblNoZWV0QXNzaXN0YW50 IDogTlNPYmplY3QgPFdLQWN0aW9uU2hlZXREZWxlZ2F0ZT4KICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQppbmRl eCAyOTY2YmQ4MzZjMTI4OWU3ZmFhOGY4YmEyZjY1Nzk3ZGEzOGQ0YzUwLi41NTU2YjM1MWZiNzQx NTczMDIxZmQyNGY0MWE1MzRlYmZjNjZkMDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQpAQCAtNjQxLDYgKzY0MSw4 IEBAIC0gKHZvaWQpcmVtb3ZlQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgIGlmIChfZGF0YURl dGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbikgewogICAgICAgICBbX3ZpZXcgcmVtb3ZlSW50 ZXJhY3Rpb246X2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb24uZ2V0KCldOwogICAg ICAgICBfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbiA9IG5pbDsKKyAgICAgICAg aWYgKFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihyZW1vdmVDb250ZXh0 TWVudVZpZXdJZlBvc3NpYmxlRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KV0pCisgICAgICAgICAg ICByZXR1cm4gW19kZWxlZ2F0ZSByZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlRm9yQWN0 aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZl07CiAgICAgfQogfQogCkBAIC02NTEsNiArNjUzLDExIEBA IC0gKHZvaWQpZW5zdXJlQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgICAgICBbX3ZpZXcgYWRk SW50ZXJhY3Rpb246X2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb24uZ2V0KCldOwog ICAgIH0KIH0KKworLSAoQk9PTCloYXNDb250ZXh0TWVudUludGVyYWN0aW9uCit7CisgICAgcmV0 dXJuICEhX2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb247Cit9CiAjZW5kaWYKIAog LSAodm9pZClzaG93RGF0YURldGVjdG9yc1NoZWV0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggNDYwN2FmNzA4 MTQ5MDc5MzFjZjhiN2VjYjcyMTQ1Y2VkYTIzMGVlMC4uZWFlNzQyMGM3NmM0ZmQ1ZTk0YzVhMTRi MjAxN2JmNGRkZGRiYjFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApAQCAtNTkzLDYgKzU5Myw3IEBAIEZPUl9F QUNIX1BSSVZBVEVfV0tDT05URU5UVklFV19BQ1RJT04oREVDTEFSRV9XS0NPTlRFTlRWSUVXX0FD VElPTl9GT1JfV0VCX1ZJRVcpCiAKICNpZiBVU0UoVUlDT05URVhUTUVOVSkKIC0gKFVJVGFyZ2V0 ZWRQcmV2aWV3ICopX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0lmUG9zc2li bGU7CistICh2b2lkKV9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlOwogI2VuZGlmCiAK IEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDEzZDE2YjlmMTQzNzYwODc2ZDI0ODc3MDhmMzAzMjU4 NzA2ZDQwZjQuLjMxMWU2ODk3MzZlNTJjZWFiOTE1YzZkNmZhZDRlZTA3N2Q5ZTcwZGQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtNjk5MSw2ICs2OTkxLDExIEBAIC0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICop Y3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tB CiAgICAgcmV0dXJuIFtzZWxmIF9jcmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdJ ZlBvc3NpYmxlXTsKIH0KIAorLSAodm9pZClyZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxl Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3Rh bnQKK3sKKyAgICBbc2VsZiBfcmVtb3ZlQ29udGV4dE1lbnVWaWV3SWZQb3NzaWJsZV07Cit9CisK ICNlbmRpZiAvLyBVU0UoVUlDT05URVhUTUVOVSkKIAogLSAoQk9PTClfc2hvdWxkVXNlQ29udGV4 dE1lbnVzCkBAIC03Njk4LDYgKzc3MDMsMjcgQEAgLSAoVUlUYXJnZXRlZFByZXZpZXcgKilfY3Jl YXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3SWZQb3NzaWJsZQogICAgIHJldHVybiBf Y29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJldmlldy5nZXQoKTsKIH0KIAorLSAoQk9P TClfY2FuUmVtb3ZlQ29udGV4dE1lbnVWaWV3Cit7CisgICAgLy8gSWYgYSBuZXcgX2NvbnRleHRN ZW51RWxlbWVudEluZm8gaXMgaW5zdGFsbGVkLCB3ZSd2ZSBzdGFydGVkIGFub3RoZXIgaW50ZXJh Y3Rpb24sCisgICAgLy8gYW5kIHJlbW92aW5nIHRoZSBoaW50IGNvbnRhaW5lciB2aWV3IHdpbGwg Y2F1c2UgdGhlIGFuaW1hdGlvbiB0byBicmVhay4KKyAgICBpZiAoX2NvbnRleHRNZW51RWxlbWVu dEluZm8pCisgICAgICAgIHJldHVybiBOTzsKKyAgICAvLyBXZSBhcmUgYWxzbyB1c2luZyB0aGlz IGNvbnRhaW5lciBmb3IgdGhlIGZpbGUgdXBsb2FkIHBhbmVsLi4uCisgICAgaWYgKF9maWxlVXBs b2FkUGFuZWwpCisgICAgICAgIHJldHVybiBOTzsKKyAgICAvLyBhbmQgdGhlIGFjdGlvbiBzaGVl dCBhc3Npc3RhbnQuCisgICAgaWYgKF9hY3Rpb25TaGVldEFzc2lzdGFudCAmJiBbX2FjdGlvblNo ZWV0QXNzaXN0YW50IGhhc0NvbnRleHRNZW51SW50ZXJhY3Rpb25dKQorICAgICAgICByZXR1cm4g Tk87CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAodm9pZClfcmVtb3ZlQ29udGV4dE1lbnVWaWV3 SWZQb3NzaWJsZQoreworICAgIGlmIChbc2VsZiBfY2FuUmVtb3ZlQ29udGV4dE1lbnVWaWV3XSkK KyAgICAgICAgW3N0ZDo6ZXhjaGFuZ2UoX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcsIG5p bCkgcmVtb3ZlRnJvbVN1cGVydmlld107Cit9CisKICNlbmRpZiAvLyBVU0UoVUlDT05URVhUTUVO VSkKIAogI2lmIEhBVkUoVUlfV0tfRE9DVU1FTlRfQ09OVEVYVCkKQEAgLTkzODgsMTUgKzk0MTQs NyBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFj dGlvbiAqKWludGVyYWN0aW9uIHdpbGxFbmRGbwogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3 ZWFrU2VsZi5nZXQoKTsKICAgICAgICAgaWYgKCFzdHJvbmdTZWxmKQogICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAvLyBJZiBhIG5ldyBfY29udGV4dE1lbnVFbGVtZW50SW5mbyBpcyBpbnN0 YWxsZWQsIHdlJ3ZlIHN0YXJ0ZWQgYW5vdGhlciBpbnRlcmFjdGlvbiwKLSAgICAgICAgLy8gYW5k IHJlbW92aW5nIHRoZSBoaW50IGNvbnRhaW5lciB2aWV3IHdpbGwgY2F1c2UgdGhlIGFuaW1hdGlv biB0byBicmVhay4KLSAgICAgICAgaWYgKHN0cm9uZ1NlbGYtPl9jb250ZXh0TWVudUVsZW1lbnRJ bmZvKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAvLyBXZSBhcmUgYWxzbyB1c2luZyB0 aGlzIGNvbnRhaW5lciBmb3IgdGhlIGZpbGUgdXBsb2FkIHBhbmVsLi4uCi0gICAgICAgIGlmIChz dHJvbmdTZWxmLT5fZmlsZVVwbG9hZFBhbmVsKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAvLyBhbmQgdGhlIGFjdGlvbiBzaGVldCBhc3Npc3RhbnQuCi0gICAgICAgIGlmIChzdHJvbmdT ZWxmLT5fYWN0aW9uU2hlZXRBc3Npc3RhbnQpCisgICAgICAgIGlmICghW3N0cm9uZ1NlbGYgX2Nh blJlbW92ZUNvbnRleHRNZW51Vmlld10pCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIFtz dGQ6OmV4Y2hhbmdlKHN0cm9uZ1NlbGYtPl9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3LCBu aWwpIHJlbW92ZUZyb21TdXBlcnZpZXddOwogICAgIH1dOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCmluZGV4IGNjYWM4 NDRhZmU1MjEyZDg1MmRiN2IzMzAwZDEwODY0YWU3YjJlNjkuLmZjYWEwNmNkNjAxYWU2YTk4Mzc5 M2ZlOThkZDIzYmUzYTRhMTAzMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KQEAgLTQ3NSw2ICs0NzUsNyBAQCAt ICh2b2lkKXJlbW92ZUNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAgICBpZiAoX2RvY3VtZW50Q29u dGV4dE1lbnVJbnRlcmFjdGlvbikgewogICAgICAgICBbX3ZpZXcgcmVtb3ZlSW50ZXJhY3Rpb246 X2RvY3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbi5nZXQoKV07CiAgICAgICAgIF9kb2N1bWVu dENvbnRleHRNZW51SW50ZXJhY3Rpb24gPSBuaWw7CisgICAgICAgIFtfdmlldyBfcmVtb3ZlQ29u dGV4dE1lbnVWaWV3SWZQb3NzaWJsZV07CiAgICAgfQogfQogCg== 398656 2020-05-06 14:21:12 -0700 2020-05-07 09:56:18 -0700 Patch bug-211272-20200506142108.patch text/plain 7851 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMmQzMjFhNzM3Y2RkODFk OWQ3OGU1MWNkZjcyYjg0ZGQ2OWIxYTAuLjYxNDhlMDA5NDBlMjZlZThmNDNmNWIyNTdkYjAyNzQy NGUwNzA2ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMDUtMDYgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZXh0TWVudTog ZW50aXJlIHdlYnBhZ2UgcG9wcyBhbmQgZGlzYXBwZWFycyB0byBnZW5lcmF0ZSBwcmV2aWV3IG9m IGVtYmVkZGVkIGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTEyNzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyNDgyMDEzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBBY3Rpb25TaGVl dEFzc2lzdGFudCBpcyBhbHdheXMgYXJvdW5kLCBzbyB1c2luZyB0aGUgcHJlc2VuY2Ugb2Ygb25l CisgICAgICAgIHRvIGRldGVybWluZSBpZiB3ZSBuZWVkIHRvIHJlbW92ZSB0aGUgX2NvbnRleHRN ZW51SGludENvbnRhaW5lclZpZXcgaXMgaW5jb3JyZWN0CisgICAgICAgIGFuZCBjYXVzZXMgaXQg dG8gYmUgYXJvdW5kIG9uIHRoZSBuZXh0IGludm9jYXRpb24gb2YgdGhlIGNvbnRleHQgbWVudSwg YW5kIAorICAgICAgICBjYXVzaW5nIHRoZSBmYWlsdXJlIG9mIHRoZSBjcmVhdGlvbiBvZiBhIG5l dyBwcmV2aWV3LCB3aGljaCB0aGVuIHdpbGwgZGVmYXVsdCB0bworICAgICAgICBwb3BwaW5nIHRo ZSB3aG9sZSBwYWdlLiBXZSBuZWVkIHRvIGFzayB0aGUgQWN0aW9uU2hlZXRBc3Npc3RhbnQgaWYg aXQgaXMgYWN0aXZlbHkgc2hvd2luZworICAgICAgICBhbnl0aGluZywgYW5kIHRoZW4gY29ycmVj dGx5IGNsZWFuIHVwIHRoZSBfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldyBhZnRlciB0aGUg CisgICAgICAgIGVuZCBvZiB0aGUgaW50ZXJhY3Rpb25zIGZvciBGaWxlVXBsb2FkTWVudSBhbmQg QWN0aW9uU2hlZXRBc3Npc3RhbnQgYXJlIGRvbmUgd2l0aCB0aGVpcgorICAgICAgICBpbnRlcmFj dGlvbnMuIAorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tOgor ICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IHJlbW92ZUNvbnRleHRNZW51SW50ZXJh Y3Rpb25dKToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBoYXNDb250ZXh0TWVu dUludGVyYWN0aW9uXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyByZW1vdmVDb250ZXh0TWVudVZpZXdJ ZlBvc3NpYmxlRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgX2NhblJlbW92ZUNvbnRleHRNZW51Vmlld10pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlXSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlvbjp3aWxsRW5kRm9yQ29uZmlndXJhdGlvbjph bmltYXRvcjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBh bmVsLm1tOgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCByZW1vdmVDb250ZXh0TWVudUlu dGVyYWN0aW9uXSk6CisKIDIwMjAtMDUtMDEgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjYwOTIwLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3Rh bnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50 LmgKaW5kZXggNmRhZTQ1MGFjMjRhODNmNGQwMzQ3NzBlNWEzMDVjNzFlMjlkNGEzYS4uNzVkYzY5 Mjc3ODgzZGEyODc0NTVlNGJhNmZkMjgyYzdjZjY4MDZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCkBAIC02NiwxMiAr NjYsMTQgQEAgc3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOwogLSAoQ0dQ b2ludCljb250ZXh0TWVudVByZXNlbnRhdGlvbkxvY2F0aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3Rh bnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQ7CiAjaWYgVVNFKFVJQ09OVEVY VE1FTlUpCiAtIChVSVRhcmdldGVkUHJldmlldyAqKWNyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVI aW50Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Np c3RhbnQ7CistICh2b2lkKXJlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9zc2libGVGb3JBY3Rpb25T aGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudDsKICNlbmRp ZgogCiBAZW5kCiAKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04pICYmIFVTRShVSUNPTlRFWFRN RU5VKQogQGludGVyZmFjZSBXS0FjdGlvblNoZWV0QXNzaXN0YW50IDogTlNPYmplY3QgPFdLQWN0 aW9uU2hlZXREZWxlZ2F0ZSwgREREZXRlY3Rpb25Db250cm9sbGVySW50ZXJhY3Rpb25EZWxlZ2F0 ZSwgVUlDb250ZXh0TWVudUludGVyYWN0aW9uRGVsZWdhdGU+CistIChCT09MKWhhc0NvbnRleHRN ZW51SW50ZXJhY3Rpb247CiAjZWxzZQogQGludGVyZmFjZSBXS0FjdGlvblNoZWV0QXNzaXN0YW50 IDogTlNPYmplY3QgPFdLQWN0aW9uU2hlZXREZWxlZ2F0ZT4KICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQppbmRl eCAyOTY2YmQ4MzZjMTI4OWU3ZmFhOGY4YmEyZjY1Nzk3ZGEzOGQ0YzUwLi41NTU2YjM1MWZiNzQx NTczMDIxZmQyNGY0MWE1MzRlYmZjNjZkMDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQpAQCAtNjQxLDYgKzY0MSw4 IEBAIC0gKHZvaWQpcmVtb3ZlQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgIGlmIChfZGF0YURl dGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbikgewogICAgICAgICBbX3ZpZXcgcmVtb3ZlSW50 ZXJhY3Rpb246X2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb24uZ2V0KCldOwogICAg ICAgICBfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbiA9IG5pbDsKKyAgICAgICAg aWYgKFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihyZW1vdmVDb250ZXh0 TWVudVZpZXdJZlBvc3NpYmxlRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KV0pCisgICAgICAgICAg ICByZXR1cm4gW19kZWxlZ2F0ZSByZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlRm9yQWN0 aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZl07CiAgICAgfQogfQogCkBAIC02NTEsNiArNjUzLDExIEBA IC0gKHZvaWQpZW5zdXJlQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgICAgICBbX3ZpZXcgYWRk SW50ZXJhY3Rpb246X2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb24uZ2V0KCldOwog ICAgIH0KIH0KKworLSAoQk9PTCloYXNDb250ZXh0TWVudUludGVyYWN0aW9uCit7CisgICAgcmV0 dXJuICEhX2RhdGFEZXRlY3RvckNvbnRleHRNZW51SW50ZXJhY3Rpb247Cit9CiAjZW5kaWYKIAog LSAodm9pZClzaG93RGF0YURldGVjdG9yc1NoZWV0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggNDYwN2FmNzA4 MTQ5MDc5MzFjZjhiN2VjYjcyMTQ1Y2VkYTIzMGVlMC4uZWFlNzQyMGM3NmM0ZmQ1ZTk0YzVhMTRi MjAxN2JmNGRkZGRiYjFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApAQCAtNTkzLDYgKzU5Myw3IEBAIEZPUl9F QUNIX1BSSVZBVEVfV0tDT05URU5UVklFV19BQ1RJT04oREVDTEFSRV9XS0NPTlRFTlRWSUVXX0FD VElPTl9GT1JfV0VCX1ZJRVcpCiAKICNpZiBVU0UoVUlDT05URVhUTUVOVSkKIC0gKFVJVGFyZ2V0 ZWRQcmV2aWV3ICopX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0lmUG9zc2li bGU7CistICh2b2lkKV9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlOwogI2VuZGlmCiAK IEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDEzZDE2YjlmMTQzNzYwODc2ZDI0ODc3MDhmMzAzMjU4 NzA2ZDQwZjQuLjBkZjViZTk5MjEyYTU4MTM1MDFhMjMzMTNhY2M2NDFlN2Y5YTVmN2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtNjk5MSw2ICs2OTkxLDExIEBAIC0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICop Y3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tB CiAgICAgcmV0dXJuIFtzZWxmIF9jcmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdJ ZlBvc3NpYmxlXTsKIH0KIAorLSAodm9pZClyZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxl Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3Rh bnQKK3sKKyAgICBbc2VsZiBfcmVtb3ZlQ29udGV4dE1lbnVWaWV3SWZQb3NzaWJsZV07Cit9CisK ICNlbmRpZiAvLyBVU0UoVUlDT05URVhUTUVOVSkKIAogLSAoQk9PTClfc2hvdWxkVXNlQ29udGV4 dE1lbnVzCkBAIC03Njk4LDYgKzc3MDMsMjEgQEAgLSAoVUlUYXJnZXRlZFByZXZpZXcgKilfY3Jl YXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3SWZQb3NzaWJsZQogICAgIHJldHVybiBf Y29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJldmlldy5nZXQoKTsKIH0KIAorLSAodm9p ZClfcmVtb3ZlQ29udGV4dE1lbnVWaWV3SWZQb3NzaWJsZQoreworICAgIC8vIElmIGEgbmV3IF9j b250ZXh0TWVudUVsZW1lbnRJbmZvIGlzIGluc3RhbGxlZCwgd2UndmUgc3RhcnRlZCBhbm90aGVy IGludGVyYWN0aW9uLAorICAgIC8vIGFuZCByZW1vdmluZyB0aGUgaGludCBjb250YWluZXIgdmll dyB3aWxsIGNhdXNlIHRoZSBhbmltYXRpb24gdG8gYnJlYWsuCisgICAgaWYgKF9jb250ZXh0TWVu dUVsZW1lbnRJbmZvKQorICAgICAgICByZXR1cm47CisgICAgLy8gV2UgYXJlIGFsc28gdXNpbmcg dGhpcyBjb250YWluZXIgZm9yIHRoZSBmaWxlIHVwbG9hZCBwYW5lbC4uLgorICAgIGlmIChfZmls ZVVwbG9hZFBhbmVsKQorICAgICAgICByZXR1cm47CisgICAgLy8gYW5kIHRoZSBhY3Rpb24gc2hl ZXQgYXNzaXN0YW50LgorICAgIGlmIChfYWN0aW9uU2hlZXRBc3Npc3RhbnQgJiYgW19hY3Rpb25T aGVldEFzc2lzdGFudCBoYXNDb250ZXh0TWVudUludGVyYWN0aW9uXSkKKyAgICAgICAgcmV0dXJu OworICAgIFtzdGQ6OmV4Y2hhbmdlKF9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3LCBuaWwp IHJlbW92ZUZyb21TdXBlcnZpZXddOworfQorCiAjZW5kaWYgLy8gVVNFKFVJQ09OVEVYVE1FTlUp CiAKICNpZiBIQVZFKFVJX1dLX0RPQ1VNRU5UX0NPTlRFWFQpCkBAIC05Mzg4LDE3ICs5NDA4LDcg QEAgLSAodm9pZCljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rp b24gKilpbnRlcmFjdGlvbiB3aWxsRW5kRm8KICAgICAgICAgYXV0byBzdHJvbmdTZWxmID0gd2Vh a1NlbGYuZ2V0KCk7CiAgICAgICAgIGlmICghc3Ryb25nU2VsZikKICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgLy8gSWYgYSBuZXcgX2NvbnRleHRNZW51RWxlbWVudEluZm8gaXMgaW5zdGFs bGVkLCB3ZSd2ZSBzdGFydGVkIGFub3RoZXIgaW50ZXJhY3Rpb24sCi0gICAgICAgIC8vIGFuZCBy ZW1vdmluZyB0aGUgaGludCBjb250YWluZXIgdmlldyB3aWxsIGNhdXNlIHRoZSBhbmltYXRpb24g dG8gYnJlYWsuCi0gICAgICAgIGlmIChzdHJvbmdTZWxmLT5fY29udGV4dE1lbnVFbGVtZW50SW5m bykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgLy8gV2UgYXJlIGFsc28gdXNpbmcgdGhp cyBjb250YWluZXIgZm9yIHRoZSBmaWxlIHVwbG9hZCBwYW5lbC4uLgotICAgICAgICBpZiAoc3Ry b25nU2VsZi0+X2ZpbGVVcGxvYWRQYW5lbCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg Ly8gYW5kIHRoZSBhY3Rpb24gc2hlZXQgYXNzaXN0YW50LgotICAgICAgICBpZiAoc3Ryb25nU2Vs Zi0+X2FjdGlvblNoZWV0QXNzaXN0YW50KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBb c3RkOjpleGNoYW5nZShzdHJvbmdTZWxmLT5fY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldywg bmlsKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKKyAgICAgICAgW3N0cm9uZ1NlbGYgX3JlbW92ZUNv bnRleHRNZW51Vmlld0lmUG9zc2libGVdOwogICAgIH1dOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KaW5kZXgg Y2NhYzg0NGFmZTUyMTJkODUyZGI3YjMzMDBkMTA4NjRhZTdiMmU2OS4uZmNhYTA2Y2Q2MDFhZTZh OTgzNzkzZmU5OGRkMjNiZTNhNGExMDMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQpAQCAtNDc1LDYgKzQ3NSw3 IEBAIC0gKHZvaWQpcmVtb3ZlQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgIGlmIChfZG9jdW1l bnRDb250ZXh0TWVudUludGVyYWN0aW9uKSB7CiAgICAgICAgIFtfdmlldyByZW1vdmVJbnRlcmFj dGlvbjpfZG9jdW1lbnRDb250ZXh0TWVudUludGVyYWN0aW9uLmdldCgpXTsKICAgICAgICAgX2Rv Y3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbiA9IG5pbDsKKyAgICAgICAgW192aWV3IF9yZW1v dmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlXTsKICAgICB9CiB9CiAK 398749 2020-05-07 09:56:20 -0700 2020-05-07 10:17:31 -0700 Patch for landing bug-211272-20200507095618.patch text/plain 7822 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMmQzMjFhNzM3Y2RkODFk OWQ3OGU1MWNkZjcyYjg0ZGQ2OWIxYTAuLjVlODcxMTZlYTM3YTA3OGRlN2I3MmY5ZTQxMWRkNjdi ODNiNWNlYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMDUtMDYgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZXh0TWVudTog ZW50aXJlIHdlYnBhZ2UgcG9wcyBhbmQgZGlzYXBwZWFycyB0byBnZW5lcmF0ZSBwcmV2aWV3IG9m IGVtYmVkZGVkIGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTEyNzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyNDgyMDEzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgVGhlIEFjdGlvblNoZWV0QXNz aXN0YW50IGlzIGFsd2F5cyBhcm91bmQsIHNvIHVzaW5nIHRoZSBwcmVzZW5jZSBvZiBvbmUKKyAg ICAgICAgdG8gZGV0ZXJtaW5lIGlmIHdlIG5lZWQgdG8gcmVtb3ZlIHRoZSBfY29udGV4dE1lbnVI aW50Q29udGFpbmVyVmlldyBpcyBpbmNvcnJlY3QKKyAgICAgICAgYW5kIGNhdXNlcyBpdCB0byBi ZSBhcm91bmQgb24gdGhlIG5leHQgaW52b2NhdGlvbiBvZiB0aGUgY29udGV4dCBtZW51LCBhbmQg CisgICAgICAgIGNhdXNpbmcgdGhlIGZhaWx1cmUgb2YgdGhlIGNyZWF0aW9uIG9mIGEgbmV3IHBy ZXZpZXcsIHdoaWNoIHRoZW4gd2lsbCBkZWZhdWx0IHRvCisgICAgICAgIHBvcHBpbmcgdGhlIHdo b2xlIHBhZ2UuIFdlIG5lZWQgdG8gYXNrIHRoZSBBY3Rpb25TaGVldEFzc2lzdGFudCBpZiBpdCBp cyBhY3RpdmVseSBzaG93aW5nCisgICAgICAgIGFueXRoaW5nLCBhbmQgdGhlbiBjb3JyZWN0bHkg Y2xlYW4gdXAgdGhlIF9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3IGFmdGVyIHRoZSAKKyAg ICAgICAgZW5kIG9mIHRoZSBpbnRlcmFjdGlvbnMgZm9yIEZpbGVVcGxvYWRNZW51IGFuZCBBY3Rp b25TaGVldEFzc2lzdGFudCBhcmUgZG9uZSB3aXRoIHRoZWlyCisgICAgICAgIGludGVyYWN0aW9u cy4gCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW06CisgICAg ICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgcmVtb3ZlQ29udGV4dE1lbnVJbnRlcmFjdGlv bl0pOgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGhhc0NvbnRleHRNZW51SW50 ZXJhY3Rpb25dKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHJlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9z c2libGVGb3JBY3Rpb25TaGVldEFzc2lzdGFudDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfY2FuUmVtb3ZlQ29udGV4dE1lbnVWaWV3XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg X3JlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9zc2libGVdKToKKyAgICAgICAgKC1bV0tDb250ZW50 VmlldyBjb250ZXh0TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFuaW1h dG9yOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwu bW06CisgICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIHJlbW92ZUNvbnRleHRNZW51SW50ZXJh Y3Rpb25dKToKKwogMjAyMC0wNS0wMSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjA5MjAuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaApp bmRleCA2ZGFlNDUwYWMyNGE4M2Y0ZDAzNDc3MGU1YTMwNWM3MWUyOWQ0YTNhLi43NWRjNjkyNzc4 ODNkYTI4NzQ1NWU0YmE2ZmQyODJjN2NmNjgwNmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmgKQEAgLTY2LDEyICs2Niwx NCBAQCBzdHJ1Y3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb247CiAtIChDR1BvaW50 KWNvbnRleHRNZW51UHJlc2VudGF0aW9uTG9jYXRpb25Gb3JBY3Rpb25TaGVldEFzc2lzdGFudDoo V0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudDsKICNpZiBVU0UoVUlDT05URVhUTUVO VSkKIC0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRG b3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFu dDsKKy0gKHZvaWQpcmVtb3ZlQ29udGV4dE1lbnVWaWV3SWZQb3NzaWJsZUZvckFjdGlvblNoZWV0 QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50OwogI2VuZGlmCiAK IEBlbmQKIAogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikgJiYgVVNFKFVJQ09OVEVYVE1FTlUp CiBAaW50ZXJmYWNlIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgOiBOU09iamVjdCA8V0tBY3Rpb25T aGVldERlbGVnYXRlLCBERERldGVjdGlvbkNvbnRyb2xsZXJJbnRlcmFjdGlvbkRlbGVnYXRlLCBV SUNvbnRleHRNZW51SW50ZXJhY3Rpb25EZWxlZ2F0ZT4KKy0gKEJPT0wpaGFzQ29udGV4dE1lbnVJ bnRlcmFjdGlvbjsKICNlbHNlCiBAaW50ZXJmYWNlIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgOiBO U09iamVjdCA8V0tBY3Rpb25TaGVldERlbGVnYXRlPgogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IDI5 NjZiZDgzNmMxMjg5ZTdmYWE4ZjhiYTJmNjU3OTdkYTM4ZDRjNTAuLjU1NTZiMzUxZmI3NDE1NzMw MjFmZDI0ZjQxYTUzNGViZmM2NmQwNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCkBAIC02NDEsNiArNjQxLDggQEAg LSAodm9pZClyZW1vdmVDb250ZXh0TWVudUludGVyYWN0aW9uCiAgICAgaWYgKF9kYXRhRGV0ZWN0 b3JDb250ZXh0TWVudUludGVyYWN0aW9uKSB7CiAgICAgICAgIFtfdmlldyByZW1vdmVJbnRlcmFj dGlvbjpfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbi5nZXQoKV07CiAgICAgICAg IF9kYXRhRGV0ZWN0b3JDb250ZXh0TWVudUludGVyYWN0aW9uID0gbmlsOworICAgICAgICBpZiAo W19kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHJlbW92ZUNvbnRleHRNZW51 Vmlld0lmUG9zc2libGVGb3JBY3Rpb25TaGVldEFzc2lzdGFudDopXSkKKyAgICAgICAgICAgIHJl dHVybiBbX2RlbGVnYXRlIHJlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9zc2libGVGb3JBY3Rpb25T aGVldEFzc2lzdGFudDpzZWxmXTsKICAgICB9CiB9CiAKQEAgLTY1MSw2ICs2NTMsMTEgQEAgLSAo dm9pZCllbnN1cmVDb250ZXh0TWVudUludGVyYWN0aW9uCiAgICAgICAgIFtfdmlldyBhZGRJbnRl cmFjdGlvbjpfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbi5nZXQoKV07CiAgICAg fQogfQorCistIChCT09MKWhhc0NvbnRleHRNZW51SW50ZXJhY3Rpb24KK3sKKyAgICByZXR1cm4g ISFfZGF0YURldGVjdG9yQ29udGV4dE1lbnVJbnRlcmFjdGlvbjsKK30KICNlbmRpZgogCiAtICh2 b2lkKXNob3dEYXRhRGV0ZWN0b3JzU2hlZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCA0NjA3YWY3MDgxNDkw NzkzMWNmOGI3ZWNiNzIxNDVjZWRhMjMwZWUwLi5lYWU3NDIwYzc2YzRmZDVlOTRjNWExNGIyMDE3 YmY0ZGRkZGJiMWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC01OTMsNiArNTkzLDcgQEAgRk9SX0VBQ0hf UFJJVkFURV9XS0NPTlRFTlRWSUVXX0FDVElPTihERUNMQVJFX1dLQ09OVEVOVFZJRVdfQUNUSU9O X0ZPUl9XRUJfVklFVykKIAogI2lmIFVTRShVSUNPTlRFWFRNRU5VKQogLSAoVUlUYXJnZXRlZFBy ZXZpZXcgKilfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3SWZQb3NzaWJsZTsK Ky0gKHZvaWQpX3JlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9zc2libGU7CiAjZW5kaWYKIAogQGVu ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KaW5kZXggMTNkMTZiOWYxNDM3NjA4NzZkMjQ4NzcwOGYzMDMyNTg3MDZk NDBmNC4uNDMwMTg4NWNmNTNkNWM3ZGQ3NjM1ZmE2NjhhNTg1MjgwZGNhOWQyOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCkBAIC02OTkxLDYgKzY5OTEsMTEgQEAgLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljcmVh dGVUYXJnZXRlZENvbnRleHRNZW51SGludEZvckFjdGlvblNoZWV0QXNzaXN0YW50OihXS0EKICAg ICByZXR1cm4gW3NlbGYgX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0lmUG9z c2libGVdOwogfQogCistICh2b2lkKXJlbW92ZUNvbnRleHRNZW51Vmlld0lmUG9zc2libGVGb3JB Y3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudAor eworICAgIFtzZWxmIF9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlXTsKK30KKwogI2Vu ZGlmIC8vIFVTRShVSUNPTlRFWFRNRU5VKQogCiAtIChCT09MKV9zaG91bGRVc2VDb250ZXh0TWVu dXMKQEAgLTc2OTgsNiArNzcwMywyMSBAQCAtIChVSVRhcmdldGVkUHJldmlldyAqKV9jcmVhdGVU YXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdJZlBvc3NpYmxlCiAgICAgcmV0dXJuIF9jb250 ZXh0TWVudUludGVyYWN0aW9uVGFyZ2V0ZWRQcmV2aWV3LmdldCgpOwogfQogCistICh2b2lkKV9y ZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlCit7CisgICAgLy8gSWYgYSBuZXcgX2NvbnRl eHRNZW51RWxlbWVudEluZm8gaXMgaW5zdGFsbGVkLCB3ZSd2ZSBzdGFydGVkIGFub3RoZXIgaW50 ZXJhY3Rpb24sCisgICAgLy8gYW5kIHJlbW92aW5nIHRoZSBoaW50IGNvbnRhaW5lciB2aWV3IHdp bGwgY2F1c2UgdGhlIGFuaW1hdGlvbiB0byBicmVhay4KKyAgICBpZiAoX2NvbnRleHRNZW51RWxl bWVudEluZm8pCisgICAgICAgIHJldHVybjsKKyAgICAvLyBXZSBhcmUgYWxzbyB1c2luZyB0aGlz IGNvbnRhaW5lciBmb3IgdGhlIGZpbGUgdXBsb2FkIHBhbmVsLi4uCisgICAgaWYgKF9maWxlVXBs b2FkUGFuZWwpCisgICAgICAgIHJldHVybjsKKyAgICAvLyBhbmQgdGhlIGFjdGlvbiBzaGVldCBh c3Npc3RhbnQuCisgICAgaWYgKFtfYWN0aW9uU2hlZXRBc3Npc3RhbnQgaGFzQ29udGV4dE1lbnVJ bnRlcmFjdGlvbl0pCisgICAgICAgIHJldHVybjsKKyAgICBbc3RkOjpleGNoYW5nZShfY29udGV4 dE1lbnVIaW50Q29udGFpbmVyVmlldywgbmlsKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKK30KKwog I2VuZGlmIC8vIFVTRShVSUNPTlRFWFRNRU5VKQogCiAjaWYgSEFWRShVSV9XS19ET0NVTUVOVF9D T05URVhUKQpAQCAtOTM4OCwxNyArOTQwOCw3IEBAIC0gKHZvaWQpY29udGV4dE1lbnVJbnRlcmFj dGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbEVuZEZvCiAg ICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwogICAgICAgICBpZiAoIXN0 cm9uZ1NlbGYpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIC8vIElmIGEgbmV3IF9jb250 ZXh0TWVudUVsZW1lbnRJbmZvIGlzIGluc3RhbGxlZCwgd2UndmUgc3RhcnRlZCBhbm90aGVyIGlu dGVyYWN0aW9uLAotICAgICAgICAvLyBhbmQgcmVtb3ZpbmcgdGhlIGhpbnQgY29udGFpbmVyIHZp ZXcgd2lsbCBjYXVzZSB0aGUgYW5pbWF0aW9uIHRvIGJyZWFrLgotICAgICAgICBpZiAoc3Ryb25n U2VsZi0+X2NvbnRleHRNZW51RWxlbWVudEluZm8pCi0gICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIC8vIFdlIGFyZSBhbHNvIHVzaW5nIHRoaXMgY29udGFpbmVyIGZvciB0aGUgZmlsZSB1cGxv YWQgcGFuZWwuLi4KLSAgICAgICAgaWYgKHN0cm9uZ1NlbGYtPl9maWxlVXBsb2FkUGFuZWwpCi0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIC8vIGFuZCB0aGUgYWN0aW9uIHNoZWV0IGFzc2lz dGFudC4KLSAgICAgICAgaWYgKHN0cm9uZ1NlbGYtPl9hY3Rpb25TaGVldEFzc2lzdGFudCkKLSAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgW3N0ZDo6ZXhjaGFuZ2Uoc3Ryb25nU2VsZi0+X2Nv bnRleHRNZW51SGludENvbnRhaW5lclZpZXcsIG5pbCkgcmVtb3ZlRnJvbVN1cGVydmlld107Cisg ICAgICAgIFtzdHJvbmdTZWxmIF9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlXTsKICAg ICB9XTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1z L1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1z L1dLRmlsZVVwbG9hZFBhbmVsLm1tCmluZGV4IGNjYWM4NDRhZmU1MjEyZDg1MmRiN2IzMzAwZDEw ODY0YWU3YjJlNjkuLmZjYWEwNmNkNjAxYWU2YTk4Mzc5M2ZlOThkZDIzYmUzYTRhMTAzMzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQ YW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBs b2FkUGFuZWwubW0KQEAgLTQ3NSw2ICs0NzUsNyBAQCAtICh2b2lkKXJlbW92ZUNvbnRleHRNZW51 SW50ZXJhY3Rpb24KICAgICBpZiAoX2RvY3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbikgewog ICAgICAgICBbX3ZpZXcgcmVtb3ZlSW50ZXJhY3Rpb246X2RvY3VtZW50Q29udGV4dE1lbnVJbnRl cmFjdGlvbi5nZXQoKV07CiAgICAgICAgIF9kb2N1bWVudENvbnRleHRNZW51SW50ZXJhY3Rpb24g PSBuaWw7CisgICAgICAgIFtfdmlldyBfcmVtb3ZlQ29udGV4dE1lbnVWaWV3SWZQb3NzaWJsZV07 CiAgICAgfQogfQogCg==